Use Ci config validation helpers only where needed

5 files changed, 31 insertions, 29 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 4bd2ac4f2db..c2b941a270a 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -2,7 +2,7 @@ module Ci
   class GitlabCiYamlProcessor
     class ValidationError < StandardError; end
 
-    include Gitlab::Ci::Config::ValidationHelpers
+    include Gitlab::Ci::Config::Node::ValidationHelpers
 
     DEFAULT_STAGES = %w(build test deploy)
     DEFAULT_STAGE = 'test'
diff --git a/lib/gitlab/ci/config/node/before_script.rb b/lib/gitlab/ci/config/node/before_script.rb
index 204e0970a9e..586eab12a08 100644
--- a/lib/gitlab/ci/config/node/before_script.rb
+++ b/lib/gitlab/ci/config/node/before_script.rb
@@ -3,6 +3,8 @@ module Gitlab
     class Config
       module Node
         class BeforeScript < Entry
+          include ValidationHelpers
+
           def keys
             {}
           end
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index c07e7cf652e..e95bc7bad4b 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -3,8 +3,6 @@ module Gitlab
     class Config
       module Node
         class Entry
-          include Config::ValidationHelpers
-
           attr_reader :value, :nodes, :parent
 
           def initialize(value, root = nil, parent = nil)
diff --git a/lib/gitlab/ci/config/node/validation_helpers.rb b/lib/gitlab/ci/config/node/validation_helpers.rb
new file mode 100644
index 00000000000..4ea26492b6a
--- /dev/null
+++ b/lib/gitlab/ci/config/node/validation_helpers.rb
@@ -0,0 +1,28 @@
+module Gitlab
+  module Ci
+    class Config
+      module Node
+        module ValidationHelpers
+          private
+
+          def validate_array_of_strings(values)
+            values.is_a?(Array) && values.all? { |value| validate_string(value) }
+          end
+
+          def validate_variables(variables)
+            variables.is_a?(Hash) &&
+              variables.all? { |key, value| validate_string(key) && validate_string(value) }
+          end
+
+          def validate_string(value)
+            value.is_a?(String) || value.is_a?(Symbol)
+          end
+
+          def validate_boolean(value)
+            value.in?([true, false])
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/config/validation_helpers.rb b/lib/gitlab/ci/config/validation_helpers.rb
deleted file mode 100644
index 9e4e9a83323..00000000000
--- a/lib/gitlab/ci/config/validation_helpers.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Gitlab
-  module Ci
-    class Config
-      module ValidationHelpers
-        private
-
-        def validate_array_of_strings(values)
-          values.is_a?(Array) && values.all? { |value| validate_string(value) }
-        end
-
-        def validate_variables(variables)
-          variables.is_a?(Hash) &&
-            variables.all? { |key, value| validate_string(key) && validate_string(value) }
-        end
-
-        def validate_string(value)
-          value.is_a?(String) || value.is_a?(Symbol)
-        end
-
-        def validate_boolean(value)
-          value.in?([true, false])
-        end
-      end
-    end
-  end
-end