spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep the 'default' prefix for secret items

Browse Source
This commit is contained in:
André Laszlo
2024-12-06 17:40:08 +01:00
parent 19b4359b17
commit eb82b4a753
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/kamal/secrets/adapters/gcp_secret_manager.rb
View File

@@ -30,9 +30,8 @@ class Kamal::Secrets::Adapters::GcpSecretManager < Kamal::Secrets::Adapters::Bas
user, service_account = parse_account(account) user, service_account = parse_account(account)
{}.tap do |results| {}.tap do |results|
secrets_with_metadata(secrets).each do |secret, metadata| secrets_with_metadata(secrets).each do |secret, (project, secret_name, secret_version)|
project, secret_name, secret_version = metadata item_name = "#{project}/#{secret_name}"
item_name = project == "default" ? secret_name : "#{project}/#{secret_name}"
results[item_name] = fetch_secret(project, secret_name, secret_version, user, service_account) 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? raise RuntimeError, "Could not read #{item_name} from Google Secret Manager" unless $?.success?
end end

2
test/secrets/gcp_secret_manager_adapter_test.rb
View File

@@ -8,7 +8,7 @@ class GcpSecretManagerAdapterTest < SecretAdapterTestCase
json = JSON.parse(shellunescape(run_command("fetch", "mypassword"))) json = JSON.parse(shellunescape(run_command("fetch", "mypassword")))
expected_json = { "mypassword"=>"secret123" } expected_json = { "default/mypassword"=>"secret123" }
assert_equal expected_json, json assert_equal expected_json, json
end end