From 41a5cb2a04adb7f55d227a9c556bba053faac937 Mon Sep 17 00:00:00 2001 From: Chris Lowder Date: Fri, 10 Mar 2023 19:27:53 +0000 Subject: [PATCH] Avoid `[ActiveSupport::OrderedOptions#dig]` The implementation has been updated upstream[^1] to expect symbolized keys. MRSK relies heavily on the fact that nested keys are strings, so we're removing existing uses of `#dig`. [^1]: https://github.com/rails/rails/commit/5c15b586aab85fc4fa1465499fc9a97a446f4d52 --- lib/mrsk/commands/traefik.rb | 4 ++-- lib/mrsk/configuration.rb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index ee22e64b..67ab448a 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -55,7 +55,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base private def cmd_option_args - if args = config.raw_config.dig(:traefik, "args") + if args = config.traefik["args"] optionize args else [] @@ -63,6 +63,6 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base end def host_port - config.raw_config.dig(:traefik, "host_port") || CONTAINER_PORT + config.traefik["host_port"] || CONTAINER_PORT end end diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb index 64c116a2..03413116 100644 --- a/lib/mrsk/configuration.rb +++ b/lib/mrsk/configuration.rb @@ -165,6 +165,9 @@ class Mrsk::Configuration }.compact end + def traefik + raw_config.traefik || {} + end private # Will raise ArgumentError if any required config keys are missing