spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse argumentize for build secrets

Browse Source
This commit is contained in:
David Heinemeier Hansson
2023-01-20 10:24:23 +01:00
parent 52fe8d358e
commit 454015b294
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mrsk/commands/builder/base.rb
View File

@@ -2,6 +2,7 @@ require "mrsk/commands/base"
class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
delegate :argumentize, :secretize, to: Mrsk::Configuration delegate :argumentize, :secretize, to: Mrsk::Configuration
delegate :secretize, to: Mrsk::Utils
def pull def pull
docker :pull, config.absolute_image docker :pull, config.absolute_image
@@ -12,7 +13,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base
end end
def build_secrets def build_secrets
secretize "--secret", secrets argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
end end
private private

4
lib/mrsk/configuration.rb
View File

@@ -22,10 +22,6 @@ class Mrsk::Configuration
attributes.flat_map { |k, v| [ argument, redacted ? Mrsk::Utils.redact("#{k}=#{v}") : "#{k}=#{v}" ] } attributes.flat_map { |k, v| [ argument, redacted ? Mrsk::Utils.redact("#{k}=#{v}") : "#{k}=#{v}" ] }
end end
def secretize(secret, keys)
keys.flat_map { |key| [ secret, "id=#{key}" ] }
end
private private
def load_config_file(file) def load_config_file(file)
if file.exist? if file.exist?