From eb82b4a753e42037730d68a3c4adac6de1beeca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Laszlo?= Date: Fri, 6 Dec 2024 17:40:08 +0100 Subject: [PATCH] Keep the 'default' prefix for secret items --- lib/kamal/secrets/adapters/gcp_secret_manager.rb | 5 ++--- test/secrets/gcp_secret_manager_adapter_test.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/kamal/secrets/adapters/gcp_secret_manager.rb b/lib/kamal/secrets/adapters/gcp_secret_manager.rb index ada16c38..f78efbcd 100644 --- a/lib/kamal/secrets/adapters/gcp_secret_manager.rb +++ b/lib/kamal/secrets/adapters/gcp_secret_manager.rb @@ -30,9 +30,8 @@ class Kamal::Secrets::Adapters::GcpSecretManager < Kamal::Secrets::Adapters::Bas user, service_account = parse_account(account) {}.tap do |results| - secrets_with_metadata(secrets).each do |secret, metadata| - project, secret_name, secret_version = metadata - item_name = project == "default" ? secret_name : "#{project}/#{secret_name}" + secrets_with_metadata(secrets).each do |secret, (project, secret_name, secret_version)| + item_name = "#{project}/#{secret_name}" results[item_name] = fetch_secret(project, secret_name, secret_version, user, service_account) raise RuntimeError, "Could not read #{item_name} from Google Secret Manager" unless $?.success? end diff --git a/test/secrets/gcp_secret_manager_adapter_test.rb b/test/secrets/gcp_secret_manager_adapter_test.rb index 5d852df7..341f42e9 100644 --- a/test/secrets/gcp_secret_manager_adapter_test.rb +++ b/test/secrets/gcp_secret_manager_adapter_test.rb @@ -8,7 +8,7 @@ class GcpSecretManagerAdapterTest < SecretAdapterTestCase json = JSON.parse(shellunescape(run_command("fetch", "mypassword"))) - expected_json = { "mypassword"=>"secret123" } + expected_json = { "default/mypassword"=>"secret123" } assert_equal expected_json, json end