From 89161b66a1f650863eb3d0fcc11336f0faae0981 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 15 Jan 2023 13:50:38 +0100
Subject: [PATCH] Use delegation for shorter access

---
 lib/mrsk/commands/app.rb      | 8 ++++++--
 lib/mrsk/commands/base.rb     | 2 ++
 lib/mrsk/commands/registry.rb | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb
index f74c7a0b..8ea2ab4e 100644
--- a/lib/mrsk/commands/app.rb
+++ b/lib/mrsk/commands/app.rb
@@ -8,7 +8,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       "-d",
       "--restart unless-stopped",
       "--name", config.service_with_version,
-      "-e", Mrsk::Utils.redact("RAILS_MASTER_KEY=#{config.master_key}"),
+      *rails_master_key_arg,
       *config.env_args,
       *role.label_args,
       config.absolute_image,
@@ -34,7 +34,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
   def exec(*command, interactive: false)
     docker :exec,
       ("-it" if interactive),
-      "-e", Mrsk::Utils.redact("RAILS_MASTER_KEY=#{config.master_key}"),
+      *rails_master_key_arg,
       *config.env_args,
       config.service_with_version,
       *command
@@ -60,4 +60,8 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
     def service_filter
       [ "--filter", "label=service=#{config.service}" ]
     end
+
+    def rails_master_key_arg
+      [ "-e", redact("RAILS_MASTER_KEY=#{config.master_key}") ]
+    end
 end
diff --git a/lib/mrsk/commands/base.rb b/lib/mrsk/commands/base.rb
index 36ad82ea..ef5527f9 100644
--- a/lib/mrsk/commands/base.rb
+++ b/lib/mrsk/commands/base.rb
@@ -2,6 +2,8 @@ require "sshkit"
 
 module Mrsk::Commands
   class Base
+    delegate :redact, to: Mrsk::Utils
+
     attr_accessor :config
 
     def initialize(config)
diff --git a/lib/mrsk/commands/registry.rb b/lib/mrsk/commands/registry.rb
index 86c9bb87..8d05b0cb 100644
--- a/lib/mrsk/commands/registry.rb
+++ b/lib/mrsk/commands/registry.rb
@@ -4,7 +4,7 @@ class Mrsk::Commands::Registry < Mrsk::Commands::Base
   delegate :registry, to: :config
 
   def login
-    docker :login, registry["server"], "-u", Mrsk::Utils.redact(registry["username"]), "-p", Mrsk::Utils.redact(registry["password"])
+    docker :login, registry["server"], "-u", redact(registry["username"]), "-p", redact(registry["password"])
   end
 
   def logout