From e852543ce4adb50d20202745d050d054469a85d0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 7 Jan 2023 21:56:10 +0100 Subject: [PATCH] Move all config validation to main object --- lib/mrsk/commands/registry.rb | 8 -------- lib/mrsk/configuration.rb | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/mrsk/commands/registry.rb b/lib/mrsk/commands/registry.rb index 53824645..4471a6eb 100644 --- a/lib/mrsk/commands/registry.rb +++ b/lib/mrsk/commands/registry.rb @@ -1,13 +1,5 @@ class Mrsk::Commands::Registry < Mrsk::Commands::Base def login - ensure_credentials_present "docker login #{config.registry["server"]} -u #{config.registry["username"]} -p #{config.registry["password"]}" end - - private - def ensure_credentials_present - unless config.registry && config.registry["username"].present? && config.registry["password"].present? - raise ArgumentError, "You must configure registry/username and registry/password" - end - end end diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb index 24dc3d53..323b1296 100644 --- a/lib/mrsk/configuration.rb +++ b/lib/mrsk/configuration.rb @@ -62,6 +62,10 @@ class Mrsk::Configuration %i[ service image registry ].each do |key| raise ArgumentError, "Missing required configuration for #{key}" unless config[key].present? end + + %w[ username password ].each do |key| + raise ArgumentError, "Missing required configuration for registry/#{key}" unless config.registry[key].present? + end end def parameterize(param, hash)