Update support for dynamic environments

3 files changed, 12 insertions, 16 deletions

diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb
index 669735cc56c..7b1533d0d32 100644
--- a/lib/expand_variables.rb
+++ b/lib/expand_variables.rb
@@ -1,6 +1,6 @@
 module ExpandVariables
   class << self
-    def expand_variables(value, variables)
+    def expand(value, variables)
       # Convert hash array to variables
       if variables.is_a?(Array)
         variables = variables.reduce({}) do |hash, variable|
diff --git a/lib/gitlab/ci/config/node/environment.rb b/lib/gitlab/ci/config/node/environment.rb
index 629c17e6250..85302589ce6 100644
--- a/lib/gitlab/ci/config/node/environment.rb
+++ b/lib/gitlab/ci/config/node/environment.rb
@@ -8,7 +8,11 @@ module Gitlab
         class Environment < Entry
           include Validatable
 
+          ALLOWED_KEYS = %i[name url]
+
           validations do
+            validates :config, allowed_keys: ALLOWED_KEYS, if: :hash?
+
             validates :name, presence: true
 
             validates :url,
@@ -32,9 +36,9 @@ module Gitlab
           end
 
           def name
-            case
-            when string? then @config
-            when hash? then @config[:name]
+            case @config.type
+            when String then @config
+            when Hash then @config[:name]
             end
           end
 
@@ -43,9 +47,9 @@ module Gitlab
           end
 
           def value
-            case
-            when string? then { name: @config }
-            when hash? then @config
+            case @config.type
+            when String then { name: @config }
+            when Hash then @config
             end
           end
         end
diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb
index e90e80171a4..3ab34d23d37 100644
--- a/lib/gitlab/ci/config/node/job.rb
+++ b/lib/gitlab/ci/config/node/job.rb
@@ -29,14 +29,6 @@ module Gitlab
                 inclusion: { in: %w[on_success on_failure always manual],
                              message: 'should be on_success, on_failure, ' \
                                       'always or manual' }
-              validates :environment,
-                type: {
-                  with: String,
-                  message: Gitlab::Regex.environment_name_regex_message }
-              validates :environment,
-                format: {
-                  with: Gitlab::Regex.environment_name_regex,
-                  message: Gitlab::Regex.environment_name_regex_message }
 
               validates :dependencies, array_of_strings: true
             end
@@ -83,7 +75,7 @@ module Gitlab
 
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
-                  :artifacts, :commands
+                  :artifacts, :commands, :environment
 
           def compose!(deps = nil)
             super do