diff --git a/lib/kamal/configuration.rb b/lib/kamal/configuration.rb index a3b074d5..04c870a8 100644 --- a/lib/kamal/configuration.rb +++ b/lib/kamal/configuration.rb @@ -222,7 +222,7 @@ class Kamal::Configuration def valid? - ensure_destination_if_required && ensure_required_keys_present && ensure_valid_kamal_version && ensure_retain_containers_valid + ensure_destination_if_required && ensure_required_keys_present && ensure_valid_kamal_version && ensure_retain_containers_valid && ensure_valid_service_name end def to_h @@ -287,6 +287,12 @@ class Kamal::Configuration true end + def ensure_valid_service_name + raise ArgumentError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9-_]+$/ + + true + end + def ensure_valid_kamal_version if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION) raise ArgumentError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}" diff --git a/test/configuration_test.rb b/test/configuration_test.rb index fbc87a91..c538a82a 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -42,6 +42,16 @@ class ConfigurationTest < ActiveSupport::TestCase end end + test "service name valid" do + assert Kamal::Configuration.new(@deploy.tap { _1[:service] = "hey-app1_primary" }).valid? + end + + test "service name invalid" do + assert_raise(ArgumentError) do + Kamal::Configuration.new @deploy.tap { _1[:service] = "app.com" } + end + end + test "roles" do assert_equal %w[ web ], @config.roles.collect(&:name) assert_equal %w[ web workers ], @config_with_roles.roles.collect(&:name)