From 64a5a790a774c42d73c91fbd758631c7c4dc7ea8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 4 Feb 2023 15:26:43 +0100 Subject: [PATCH] Ensure secret can be used alone --- lib/mrsk/configuration/role.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/mrsk/configuration/role.rb b/lib/mrsk/configuration/role.rb index f8e15da5..f8d4461c 100644 --- a/lib/mrsk/configuration/role.rb +++ b/lib/mrsk/configuration/role.rb @@ -96,7 +96,11 @@ class Mrsk::Configuration::Role def merged_env_with_secrets merged_env.tap do |new_env| new_env["secret"] = Array(config.env["secret"]) + Array(specialized_env["secret"]) - new_env["clear"] = (Array(config.env["clear"] || config.env) + Array(specialized_env["clear"] || specialized_env)).uniq + + clear_app_env = config.env["secret"] ? Array(config.env["clear"]) : Array(config.env["clear"] || config.env) + clear_role_env = specialized_env["secret"] ? Array(specialized_env["clear"]) : Array(specialized_env["clear"] || specialized_env) + + new_env["clear"] = (clear_app_env + clear_role_env).uniq end end end