From ba4977ab96e1a58f8b77eb8190e19849c27caf6e Mon Sep 17 00:00:00 2001
From: Imre Farkas <ifarkas@gitlab.com>
Date: Tue, 28 May 2019 10:14:43 +0000
Subject: CE port of Move EE specific lines in API::Variables

---
 lib/api/helpers/variables_helpers.rb | 13 +++++++++++++
 lib/api/variables.rb                 | 10 ++++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 lib/api/helpers/variables_helpers.rb

diff --git a/lib/api/helpers/variables_helpers.rb b/lib/api/helpers/variables_helpers.rb
new file mode 100644
index 00000000000..78a92d0f5a6
--- /dev/null
+++ b/lib/api/helpers/variables_helpers.rb
@@ -0,0 +1,13 @@
+# 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
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 6c61392ed63..af1d7936556 100644
--- a/lib/api/variables.rb
+++ b/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
-- 
cgit v1.2.1