more rubocopping

This commit is contained in:
Norm MacLennan
2016-05-18 07:45:47 -04:00
parent ac5b935b89
commit 664ca88d41

View File

@@ -95,11 +95,8 @@ module Zanzibar
downloaded_secrets = {} downloaded_secrets = {}
remote_secrets.each do |key, secret| remote_secrets.each do |key, secret|
full_path = secret.key?('prefix') ? File.join(@settings['secret_dir'], secret['prefix']) : @settings['secret_dir'] full_path = secret.key?('prefix') ? File.join(@settings['secret_dir'], secret['prefix']) : @settings['secret_dir']
downloaded_secrets[key] = download_one_secret(secret['id'], downloaded_secrets[key] = download_one_secret(secret['id'], secret['label'], full_path,
secret['label'], args, secret_filename(secret))
full_path,
args,
secret['name'] || "#{secret['id']}_password")
debug { "Downloaded secret: #{key} to #{@settings['secret_dir']}..." } debug { "Downloaded secret: #{key} to #{@settings['secret_dir']}..." }
end end
@@ -134,6 +131,10 @@ module Zanzibar
domain: @settings['domain'], domain: @settings['domain'],
globals: args) globals: args)
end end
def secret_filename(secret)
secret['name'] || "#{secret['id']}_password"
end
end end
end end
end end