From a8779f705527ffab10bc4c1a1bbf8802f3b8e97d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 20 Jan 2023 10:07:17 +0100 Subject: [PATCH] Simpler API No need for redactions, since values aren't shared. --- lib/mrsk/commands/builder/base.rb | 5 ++--- lib/mrsk/configuration.rb | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/mrsk/commands/builder/base.rb b/lib/mrsk/commands/builder/base.rb index 77477341..8309d7e5 100644 --- a/lib/mrsk/commands/builder/base.rb +++ b/lib/mrsk/commands/builder/base.rb @@ -1,8 +1,7 @@ require "mrsk/commands/base" class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base - delegate :argumentize, to: Mrsk::Configuration - delegate :simple_secretize, to: Mrsk::Configuration + delegate :argumentize, :secretize, to: Mrsk::Configuration def pull docker :pull, config.absolute_image @@ -13,7 +12,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base end def build_secrets - simple_secretize "--secret", secrets, redacted: true + secretize "--secret", secrets end private diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb index 1b8dd1f1..c626013f 100644 --- a/lib/mrsk/configuration.rb +++ b/lib/mrsk/configuration.rb @@ -22,8 +22,8 @@ class Mrsk::Configuration attributes.flat_map { |k, v| [ argument, redacted ? Mrsk::Utils.redact("#{k}=#{v}") : "#{k}=#{v}" ] } end - def simple_secretize(secret, attributes, redacted: false) - attributes.flat_map { |k, v| [ secret, redacted ? Mrsk::Utils.redact("id=#{k}") : "id=#{k}" ] } + def secretize(secret, attributes) + attributes.flat_map { |k, v| [ secret, "id=#{k}" ] } end private