1 files changed, 9 insertions, 31 deletions
diff --git a/lib/gitlab/ci/config/entry/variables.rb b/lib/gitlab/ci/config/entry/variables.rb
index efb469ee32a..0284958d9d4 100644
--- a/lib/gitlab/ci/config/entry/variables.rb
+++ b/lib/gitlab/ci/config/entry/variables.rb
@@ -5,43 +5,21 @@ module Gitlab
     class Config
       module Entry
         ##
-        # Entry that represents environment variables.
+        # Entry that represents CI/CD variables.
+        # CurrentVariables will be renamed to this class when removing the FF `ci_variables_refactoring_to_variable`.
         #
-        class Variables < ::Gitlab::Config::Entry::Node
-          include ::Gitlab::Config::Entry::Validatable
-
-          ALLOWED_VALUE_DATA = %i[value description].freeze
-
-          validations do
-            validates :config, variables: { allowed_value_data: ALLOWED_VALUE_DATA }, if: :use_value_data?
-            validates :config, variables: true, unless: :use_value_data?
-          end
-
-          def value
-            @config.to_h { |key, value| [key.to_s, expand_value(value)[:value]] }
+        class Variables
+          def self.new(...)
+            if YamlProcessor::FeatureFlags.enabled?(:ci_variables_refactoring_to_variable)
+              CurrentVariables.new(...)
+            else
+              LegacyVariables.new(...)
+            end
           end
 
           def self.default(**)
             {}
           end
-
-          def value_with_data
-            @config.to_h { |key, value| [key.to_s, expand_value(value)] }
-          end
-
-          def use_value_data?
-            opt(:use_value_data)
-          end
-
-          private
-
-          def expand_value(value)
-            if value.is_a?(Hash)
-              { value: value[:value].to_s, description: value[:description] }
-            else
-              { value: value.to_s, description: nil }
-            end
-          end
         end
       end
     end