Skip to content

Commit eee9d67

Browse files
authored
Merge pull request #1319 from ShPakvel/fix_bug_in_role_validate_servers
Fix bugs for role validate servers
2 parents 5bd9bc8 + bd8689c commit eee9d67

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

lib/kamal/commander.rb

-6
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ def accessory_names
7676
config.accessories&.collect(&:name) || []
7777
end
7878

79-
def accessories_on(host)
80-
config.accessories.select { |accessory| accessory.hosts.include?(host.to_s) }.map(&:name)
81-
end
82-
83-
8479
def app(role: nil, host: nil)
8580
Kamal::Commands::App.new(config, role: role, host: host)
8681
end
@@ -129,7 +124,6 @@ def alias(name)
129124
config.aliases[name]
130125
end
131126

132-
133127
def with_verbosity(level)
134128
old_level = self.verbosity
135129

lib/kamal/configuration/role.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Kamal::Configuration::Role
1010
def initialize(name, config:)
1111
@name, @config = name.inquiry, config
1212
validate! \
13-
specializations,
13+
role_config,
1414
example: validation_yml["servers"]["workers"],
1515
context: "servers/#{name}",
1616
with: Kamal::Configuration::Validator::Role
@@ -204,11 +204,11 @@ def default_labels
204204
end
205205

206206
def specializations
207-
if config.raw_config.servers.is_a?(Array) || config.raw_config.servers[name].is_a?(Array)
208-
{}
209-
else
210-
config.raw_config.servers[name]
211-
end
207+
@specializations ||= role_config.is_a?(Array) ? {} : role_config
208+
end
209+
210+
def role_config
211+
@role_config ||= config.raw_config.servers.is_a?(Array) ? {} : config.raw_config.servers[name]
212212
end
213213

214214
def custom_labels

lib/kamal/configuration/validator/role.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ def validate!
33
validate_type! config, Array, Hash
44

55
if config.is_a?(Array)
6-
validate_servers! "servers", config
6+
validate_servers!(config)
77
else
88
super
99
end

0 commit comments

Comments
 (0)