Skip to content

Commit

Permalink
Address PR feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
dirceu committed Sep 18, 2019
1 parent 3c0d941 commit a4a0dae
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions lib/kubernetes-deploy/runner_task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,8 @@ def record_status_once(pod)
end

def verify_config!(task_template, args)
task_config_validator = RunnerTaskConfigValidator.new(@task_config, kubectl, kubeclient_builder)
task_config_validator.template = task_template
task_config_validator.args = args
task_config_validator = RunnerTaskConfigValidator.new(task_template, args, @task_config, kubectl,
kubeclient_builder)
unless task_config_validator.valid?
@logger.summary.add_action("Configuration invalid")
@logger.summary.add_paragraph([task_config_validator.errors].map { |err| "- #{err}" }.join("\n"))
Expand Down
12 changes: 6 additions & 6 deletions lib/kubernetes-deploy/runner_task_config_validator.rb
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# frozen_string_literal: true
module KubernetesDeploy
class RunnerTaskConfigValidator < TaskConfigValidator
attr_accessor :template, :args

def initialize(*args)
super
def initialize(template, args, *arguments)
super(*arguments)
@template = template
@args = args
@validations += %i(validate_template validate_args)
end

private

def validate_args
if args.blank?
if @args.blank?
@errors << "Args can't be nil"
end
end

def validate_template
if template.blank?
if @template.blank?
@errors << "Task template name can't be nil"
end
end
Expand Down

0 comments on commit a4a0dae

Please sign in to comment.