Merge branch 'if-10137-ee_specific_lines_variables_api' into 'master'

Move EE specific lines in API::Variables

See merge request gitlab-org/gitlab-ee!13290

ee/lib/ee/api/helpers/variables_helpers.rb

+# frozen_string_literal: true
+
+module EE
+  module API
+    module Helpers
+      module VariablesHelpers
+        extend ActiveSupport::Concern
+
+        prepended do
+          params :optional_params_ee do
+            optional :environment_scope, type: String, desc: 'The environment_scope of the variable'
+          end
+        end
+      end
+    end
+  end
+end

lib/api/helpers/variables_helpers.rb

+# frozen_string_literal: true
+
+module API
+  module Helpers
+    module VariablesHelpers
+      extend ActiveSupport::Concern
+      extend Grape::API::Helpers
+
+      params :optional_params_ee do
+      end
+    end
+  end
+end
+
+API::Helpers::VariablesHelpers.prepend(EE::API::Helpers::VariablesHelpers)

lib/api/variables.rb

@@ -7,6 +7,8 @@ module API
     before { authenticate! }
     before { authorize! :admin_build, user_project }
 
+    helpers Helpers::VariablesHelpers
+
     helpers do
       def filter_variable_parameters(params)
         # This method exists so that EE can more easily filter out certain
@@ -58,9 +60,7 @@ module API
         optional :masked, type: Boolean, desc: 'Whether the variable is masked'
         optional :variable_type, type: String, values: Ci::Variable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file. Defaults to env_var'
 
-        if Gitlab.ee?
-          optional :environment_scope, type: String, desc: 'The environment_scope of the variable'
-        end
+        use :optional_params_ee
       end
       post ':id/variables' do
         variable_params = declared_params(include_missing: false)
@@ -85,9 +85,7 @@ module API
         optional :masked, type: Boolean, desc: 'Whether the variable is masked'
         optional :variable_type, type: String, values: Ci::Variable.variable_types.keys, desc: 'The type of variable, must be one of env_var or file'
 
-        if Gitlab.ee?
-          optional :environment_scope, type: String, desc: 'The environment_scope of the variable'
-        end
+        use :optional_params_ee
       end
       # rubocop: disable CodeReuse/ActiveRecord
       put ':id/variables/:key' do