1 files changed, 20 insertions, 65 deletions

diff --git a/lib/gitlab/ci/config/entry/variable.rb b/lib/gitlab/ci/config/entry/variable.rb
index 16091758916..decb568ffc9 100644
--- a/lib/gitlab/ci/config/entry/variable.rb
+++ b/lib/gitlab/ci/config/entry/variable.rb
@@ -10,7 +10,6 @@ module Gitlab
         class Variable < ::Gitlab::Config::Entry::Simplifiable
           strategy :SimpleVariable, if: -> (config) { SimpleVariable.applies_to?(config) }
           strategy :ComplexVariable, if: -> (config) { ComplexVariable.applies_to?(config) }
-          strategy :ComplexArrayVariable, if: -> (config) { ComplexArrayVariable.applies_to?(config) }
 
           class SimpleVariable < ::Gitlab::Config::Entry::Node
             include ::Gitlab::Config::Entry::Validatable
@@ -41,20 +40,24 @@ module Gitlab
 
           class ComplexVariable < ::Gitlab::Config::Entry::Node
             include ::Gitlab::Config::Entry::Validatable
+            include ::Gitlab::Config::Entry::Attributable
 
             class << self
               def applies_to?(config)
-                config.is_a?(Hash) && !config[:value].is_a?(Array)
+                config.is_a?(Hash)
               end
             end
 
+            attributes :value, :description, :expand, :options, prefix: :config
+
             validations do
               validates :key, alphanumeric: true
-              validates :config_value, alphanumeric: true, allow_nil: false, if: :config_value_defined?
-              validates :config_description, alphanumeric: true, allow_nil: false, if: :config_description_defined?
-              validates :config_expand, boolean: true,
-                                        allow_nil: false,
-                                        if: -> { ci_raw_variables_in_yaml_config_enabled? && config_expand_defined? }
+              validates :config_value, alphanumeric: true, allow_nil: true
+              validates :config_description, alphanumeric: true, allow_nil: true
+              validates :config_expand, boolean: true, allow_nil: true, if: -> {
+                                                                              ci_raw_variables_in_yaml_config_enabled?
+                                                                            }
+              validates :config_options, array_of_strings: true, allow_nil: true
 
               validate do
                 allowed_value_data = Array(opt(:allowed_value_data))
@@ -66,91 +69,43 @@ module Gitlab
                 else
                   errors.add(:config, "must be a string")
                 end
+
+                if config_options.present? && config_options.exclude?(config_value)
+                  errors.add(:config, 'value must be present in options')
+                end
               end
             end
 
             def value
+              # Needed since the `Entry::Node` provides `value` (which is current hash)
               config_value.to_s
             end
 
             def value_with_data
               if ci_raw_variables_in_yaml_config_enabled?
                 {
-                  value: value,
-                  raw: (!config_expand if config_expand_defined?)
+                  value: config_value.to_s,
+                  raw: (!config_expand if has_config_expand?)
                 }.compact
               else
                 {
-                  value: value
+                  value: config_value.to_s
                 }.compact
               end
             end
 
             def value_with_prefill_data
               value_with_data.merge(
-                description: config_description
+                description: config_description,
+                options: config_options
               ).compact
             end
 
-            def config_value
-              @config[:value]
-            end
-
-            def config_description
-              @config[:description]
-            end
-
-            def config_expand
-              @config[:expand]
-            end
-
-            def config_value_defined?
-              config.key?(:value)
-            end
-
-            def config_description_defined?
-              config.key?(:description)
-            end
-
-            def config_expand_defined?
-              config.key?(:expand)
-            end
-
             def ci_raw_variables_in_yaml_config_enabled?
               YamlProcessor::FeatureFlags.enabled?(:ci_raw_variables_in_yaml_config)
             end
           end
 
-          class ComplexArrayVariable < ComplexVariable
-            include ::Gitlab::Config::Entry::Validatable
-
-            class << self
-              def applies_to?(config)
-                config.is_a?(Hash) && config[:value].is_a?(Array)
-              end
-            end
-
-            validations do
-              validates :config_value, array_of_strings: true, allow_nil: false, if: :config_value_defined?
-
-              validate do
-                next if opt(:allow_array_value)
-
-                errors.add(:config, 'value must be an alphanumeric string')
-              end
-            end
-
-            def value
-              config_value.first
-            end
-
-            def value_with_prefill_data
-              super.merge(
-                value_options: config_value
-              ).compact
-            end
-          end
-
           class UnknownStrategy < ::Gitlab::Config::Entry::Node
             def errors
               ["variable definition must be either a string or a hash"]