Add support for dynamic environments

Environments that can have a URL with predefined CI variables.

3 files changed, 50 insertions, 2 deletions

diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb
new file mode 100644
index 00000000000..40bf9483eb5
--- /dev/null
+++ b/lib/expand_variables.rb
@@ -0,0 +1,15 @@
+String.instance_eval
+  def expand_variables(variables)
+    # Convert hash array to variables
+    if variables.is_a?(Array)
+      variables = variables.reduce({}) do |hash, variable|
+        hash[variable[:key]] = variable[:value]
+        hash
+      end
+    end
+
+    self.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
+      variables[$1 || $2]
+    end
+  end
+end
diff --git a/lib/gitlab/ci/config/node/environment.rb b/lib/gitlab/ci/config/node/environment.rb
new file mode 100644
index 00000000000..6f04180039e
--- /dev/null
+++ b/lib/gitlab/ci/config/node/environment.rb
@@ -0,0 +1,33 @@
+module Gitlab
+  module Ci
+    class Config
+      module Node
+        ##
+        # Entry that represents environment variables.
+        #
+        class Environment < Entry
+          include Validatable
+
+          validations do
+            include LegacyValidationHelpers
+
+            validate do
+              unless string_or_array_of_strings?(config)
+                errors.add(:config,
+                           'should be a string or an array of strings')
+              end
+            end
+
+            def string_or_array_of_strings?(field)
+              validate_string(field) || validate_array_of_strings(field)
+            end
+          end
+
+          def value
+            Array(@config)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index ffad5e17c78..d1a3e54ccd7 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -96,11 +96,11 @@ module Gitlab
     end
 
     def environment_name_regex
-      @environment_name_regex ||= /\A[a-zA-Z0-9_-]+\z/.freeze
+      git_reference_regex
     end
 
     def environment_name_regex_message
-      "can contain only letters, digits, '-' and '_'."
+      "be a valid git reference name"
     end
   end
 end