Merge pull request #33000 from vespa-engine/retrieve_versions_with_state

Allow multiple staging labels for a retrieved version
vespa-engine · Dec 5, 2024 · de61821 · de61821
2 parents c929476 + 69bf107
commit de61821
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretReader.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/AsmSecretReader.java
@@ -24,6 +24,7 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -124,16 +125,14 @@ private Secret retrieveSecret(Key key, SecretVersionId version) {
     }
 
     private static SecretVersionState toSecretVersionState(List<String> versionStages) {
-        if (versionStages.size() != 1) {
-            throw new IllegalArgumentException("Expected exactly one version stage, got: " + versionStages);
+        var stages = new HashSet<>(versionStages);
+        if (stages.contains(AWSCURRENT)) {
+            return SecretVersionState.CURRENT;
+        } else if (stages.contains(AWSPENDING)) {
+            return SecretVersionState.PENDING;
+        } else {
+            return SecretVersionState.DEPRECATED;
         }
-        var state = versionStages.get(0);
-        return switch (state) {
-            case "AWSCURRENT" -> SecretVersionState.CURRENT;
-            case "AWSPENDING" -> SecretVersionState.PENDING;
-            case "AWSPREVIOUS" -> SecretVersionState.PREVIOUS;
-            default -> throw new IllegalArgumentException("Unknown secret version state: " + state);
-        };
     }
 
     /**

diff --git a/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretReaderTester.java b/jdisc-cloud-aws/src/main/java/ai/vespa/secret/aws/testutil/AsmSecretReaderTester.java
@@ -56,7 +56,7 @@ public GetSecretValueResponse getSecretValue(GetSecretValueRequest request) {
                     .name(request.secretId())
                     .secretString(secret.value())
                     .versionId(secret.version())
-                    .versionStages(List.of(toAwsStage(secret.state())))
+                    .versionStages(toAwsStages(secret.state()))
                     .build();
         }
 

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
@@ -74,7 +74,7 @@ public ListSecretVersionIdsResponse listSecretVersionIds(ListSecretVersionIdsReq
                     .versions(secrets.getOrDefault(request.secretId(), List.of()).stream()
                                       .map(version -> SecretVersionsListEntry.builder()
                                               .versionId(version.version())
-                                              .versionStages(List.of(toAwsStage(version.state())))
+                                              .versionStages(toAwsStages(version.state()))
                                               .build())
                                       .toList())
                     .build();
@@ -85,12 +85,11 @@ public void close() {
             isClosed = true;
         }
 
-        protected String toAwsStage(SecretVersionState state) {
+        protected List<String> toAwsStages(SecretVersionState state) {
             return switch (state) {
-                case CURRENT -> "AWSCURRENT";
-                case PENDING -> "AWSPENDING";
-                case PREVIOUS -> "AWSPREVIOUS";
-                default -> throw new IllegalArgumentException("Unknown state: " + state);
+                case CURRENT -> List.of("AWSCURRENT");
+                case PENDING -> List.of("AWSPENDING");
+                case PREVIOUS, DEPRECATED -> List.of();
             };
         }