Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for listing secrets in ASM #33009

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Add support for listing secrets in ASM #33009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmTenantSecretReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand Down
22 changes: 14 additions & 8 deletions jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretTesterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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()
Expand Down
Loading