From 251dd571dfc3e6261ed075ecf725dd98ee176b69 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 6 Jun 2016 11:05:15 +0200
Subject: [PATCH] Extract CI config validation helpers to mixin

---
 lib/ci/gitlab_ci_yaml_processor.rb         | 18 ++-------------
 lib/gitlab/ci/config/validation_helpers.rb | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 lib/gitlab/ci/config/validation_helpers.rb

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 46a923161c8..e470ec56b79 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -2,6 +2,8 @@ module Ci
   class GitlabCiYamlProcessor
     class ValidationError < StandardError; end
 
+    include Gitlab::Ci::Config::ValidationHelpers
+
     DEFAULT_STAGES = %w(build test deploy)
     DEFAULT_STAGE = 'test'
     ALLOWED_YAML_KEYS = [:before_script, :after_script, :image, :services, :types, :stages, :variables, :cache]
@@ -276,22 +278,6 @@ module Ci
       end
     end
 
-    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
-
     def process?(only_params, except_params, ref, tag, trigger_request)
       if only_params.present?
         return false unless matching?(only_params, ref, tag, trigger_request)
diff --git a/lib/gitlab/ci/config/validation_helpers.rb b/lib/gitlab/ci/config/validation_helpers.rb
new file mode 100644
index 00000000000..9e4e9a83323
--- /dev/null
+++ b/lib/gitlab/ci/config/validation_helpers.rb
@@ -0,0 +1,26 @@
+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
-- 
GitLab