Merge pull request #33009 from vespa-engine/list-secrets

Add support for listing secrets in ASM
vespa-engine · Dec 6, 2024 · 4e535fe · 4e535fe
2 parents 825dcf2 + 23ee3b1
commit 4e535fe
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java
@@ -77,8 +77,11 @@ private String awsSecretId(String tenant, Key key) {
     }
 
     public static String getAwsSecretId(String system, String tenant, Key key) {
-        return "%s.%s.%s.%s/%s".formatted(AthenzUtil.PREFIX, system, tenant,
-                                          key.vaultName().value(), key.secretName().value());
+        return "%s/%s".formatted(awsVaultPrefix(system, tenant, key.vaultName()), key.secretName().value());
+    }
+
+    public static String awsVaultPrefix(String system, String tenant, VaultName vault) {
+        return "%s.%s.%s.%s".formatted(AthenzUtil.PREFIX, system, tenant, vault.value());
     }
 
     record Vault(VaultId vaultId, VaultName vaultName, ExternalId externalId) {}

diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretTesterBase.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretTesterBase.java
@@ -8,22 +8,19 @@
 import ai.vespa.secret.aws.AwsRolePath;
 import ai.vespa.secret.model.Key;
 import ai.vespa.secret.model.SecretVersionState;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
-import software.amazon.awssdk.services.secretsmanager.model.InternalServiceErrorException;
-import software.amazon.awssdk.services.secretsmanager.model.InvalidNextTokenException;
-import software.amazon.awssdk.services.secretsmanager.model.InvalidParameterException;
 import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsRequest;
 import software.amazon.awssdk.services.secretsmanager.model.ListSecretVersionIdsResponse;
-import software.amazon.awssdk.services.secretsmanager.model.ResourceNotFoundException;
+import software.amazon.awssdk.services.secretsmanager.model.ListSecretsRequest;
+import software.amazon.awssdk.services.secretsmanager.model.ListSecretsResponse;
+import software.amazon.awssdk.services.secretsmanager.model.SecretListEntry;
 import software.amazon.awssdk.services.secretsmanager.model.SecretVersionsListEntry;
-import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 /**
@@ -66,9 +63,18 @@ protected MockSecretsManagerClient(AwsRolePath awsRole) {
             clients.add(this);
         }
 
+        @Override
+        public ListSecretsResponse listSecrets(Consumer<ListSecretsRequest.Builder> listSecretsRequest) {
+            return ListSecretsResponse.builder()
+                    .secretList(secrets.keySet().stream()
+                                        .map(name -> SecretListEntry.builder().name(name).build())
+                                        .toList())
+                    .build();
+        }
+
         // Used by both reader and writer testers
         @Override
-        public ListSecretVersionIdsResponse listSecretVersionIds(ListSecretVersionIdsRequest request) throws InvalidNextTokenException, ResourceNotFoundException, InternalServiceErrorException, InvalidParameterException, AwsServiceException, SdkClientException, SecretsManagerException {
+        public ListSecretVersionIdsResponse listSecretVersionIds(ListSecretVersionIdsRequest request) {
             return ListSecretVersionIdsResponse.builder()
                     .name(request.secretId())
                     .versions(secrets.getOrDefault(request.secretId(), List.of()).stream()