kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Validate ci config entry value before processing nodes

Browse source
This commit is contained in:
Grzegorz Bizon 2016-06-14 11:28:20 +02:00
parent 59eeec3ff8
commit 30e946ce8a
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/gitlab/ci/config/node/configurable.rb
View file

@ -16,20 +16,18 @@ module Gitlab
module Configurable
extend ActiveSupport::Concern
def initialize(*)
super
unless @value.is_a?(Hash)
@errors << 'should be a configuration entry with hash value'
end
end
def allowed_nodes
self.class.allowed_nodes || {}
end
private
def prevalidate!
unless @value.is_a?(Hash)
@errors << 'should be a configuration entry with hash value'
end
end
def create_node(key, factory)
factory.with(value: @value[key])
factory.nullify! unless @value.has_key?(key)

5
lib/gitlab/ci/config/node/entry.rb
View file

@ -14,6 +14,8 @@ module Gitlab
@value = value
@nodes = {}
@errors = []
prevalidate!
end
def process!
@ -56,6 +58,9 @@ module Gitlab
private
def prevalidate!
end
def compose!
allowed_nodes.each do |key, essence|
@nodes[key] = create_node(key, essence)