Light, fluffy, and always free - The AWS Local Emulator alternative
feat: add version stages handling in ASM put-secret-value (#527)
Daniel Abeledo571d6d7a0ddb
diff --git a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.javaindex 1ab9bec030..4b043af2b1 100644--- a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerJsonHandler.java@@ -11,11 +11,11 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import jakarta.ws.rs.core.Response;-import java.security.SecureRandom;import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.stream.StreamSupport;@ApplicationScopedpublic class SecretsManagerJsonHandler {@@ -146,8 +146,12 @@ public class SecretsManagerJsonHandler {String secretString = request.has("SecretString") ? request.path("SecretString").asText() : null;String secretBinary = request.has("SecretBinary") ? request.path("SecretBinary").asText() : null;+ List<String> versionStages = request.has("VersionStages") && request.path("VersionStages").isArray()+ ? StreamSupport.stream(request.path("VersionStages").spliterator(), false).map(JsonNode::asText).toList()+ : null;+Secret secret = service.describeSecret(secretId, region);- SecretVersion version = service.putSecretValue(secretId, secretString, secretBinary, region);+ SecretVersion version = service.putSecretValue(secretId, secretString, secretBinary, region, versionStages);ObjectNode response = objectMapper.createObjectNode();response.put("ARN", secret.getArn());@@ -172,7 +176,7 @@ public class SecretsManagerJsonHandler {String versionId = null;if (secretString != null || secretBinary != null) {- SecretVersion version = service.putSecretValue(secretId, secretString, secretBinary, region);+ SecretVersion version = service.putSecretValue(secretId, secretString, secretBinary, region, null);versionId = version.getVersionId();}diff --git a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerService.java b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerService.javaindex 803718f54f..5de7bbbff2 100644--- a/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerService.java+++ b/src/main/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerService.java@@ -124,7 +124,9 @@ public class SecretsManagerService {return version;}- public SecretVersion putSecretValue(String secretId, String secretString, String secretBinary, String region) {+ public SecretVersion putSecretValue(String secretId, String secretString,+ String secretBinary, String region,+ List<String> versionStages) {Secret secret = resolveSecret(secretId, region);if (secret.getDeletedDate() != null) {@@ -135,25 +137,47 @@ public class SecretsManagerService {Instant now = Instant.now();String newVersionId = UUID.randomUUID().toString();- SecretVersion oldCurrent = findVersionByStage(secret, AWSCURRENT);- if (oldCurrent != null) {- List<String> stages = new ArrayList<>(oldCurrent.getVersionStages());- stages.remove(AWSCURRENT);- if (!stages.contains(AWSPREVIOUS)) {- stages.add(AWSPREVIOUS);+ List<String> stages;+ if (versionStages != null) {+ if (versionStages.isEmpty() || versionStages.size() > 20) {+ throw new AwsException("ValidationException", "Invalid length for parameter VersionStages", 400);}- oldCurrent.setVersionStages(stages);+ if (versionStages.stream()+ .anyMatch(stage -> stage == null+ || stage.isEmpty()+ || stage.length() > 256)) {+ throw new AwsException("ValidationException", "Member must have length less than or equal to 256, Member must have length greater than or equal to 1", 400);+ }+ stages = versionStages;+ } else {+ stages = List.of(AWSCURRENT);+ }++ for (String stage : stages) {+ SecretVersion version = findVersionByStage(secret, stage);+ if (version == null) {+ continue;+ }+ List<String> newStages = new ArrayList<>(version.getVersionStages());+ if (stage.equals(AWSCURRENT)) {+ newStages.add(AWSPREVIOUS);+ }+ newStages.remove(stage);++ version.setVersionStages(newStages);}SecretVersion newVersion = new SecretVersion();newVersion.setVersionId(newVersionId);newVersion.setSecretString(secretString);newVersion.setSecretBinary(secretBinary);- newVersion.setVersionStages(new ArrayList<>(List.of(AWSCURRENT)));+ newVersion.setVersionStages(stages);newVersion.setCreatedDate(now);secret.getVersions().put(newVersionId, newVersion);- secret.setCurrentVersionId(newVersionId);+ if (stages.contains(AWSCURRENT)) {+ secret.setCurrentVersionId(newVersionId);+ }secret.setLastChangedDate(now);store.put(regionKey(region, secret.getName()), secret);diff --git a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.javaindex 10b2055416..27b74f2871 100644--- a/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/secretsmanager/SecretsManagerServiceTest.java@@ -4,11 +4,14 @@ import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.services.secretsmanager.model.Secret;import io.github.hectorvent.floci.services.secretsmanager.model.SecretVersion;+import org.apache.commons.lang3.RandomStringUtils;+import org.junit.jupiter.api.Assertions;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;import java.util.List;import java.util.Map;+import java.util.stream.IntStream;import static org.junit.jupiter.api.Assertions.*;@@ -60,7 +63,7 @@ class SecretsManagerServiceTest {@Testvoid putSecretValueRotatesVersion() {service.createSecret("my-secret", "v1", null, null, null, null, REGION);- service.putSecretValue("my-secret", "v2", null, REGION);+ service.putSecretValue("my-secret", "v2", null, REGION, null);SecretVersion current = service.getSecretValue("my-secret", null, "AWSCURRENT", REGION);assertEquals("v2", current.getSecretString());@@ -74,7 +77,70 @@ class SecretsManagerServiceTest {service.createSecret("my-secret", "v1", null, null, null, null, REGION);service.deleteSecret("my-secret", null, true, REGION);assertThrows(AwsException.class, () ->- service.putSecretValue("my-secret", "v2", null, REGION));+ service.putSecretValue("my-secret", "v2", null, REGION, null));+ }++ @Test+ void putSecretValuePendingStage() {+ service.createSecret("my-secret", "v1", null, null, null, null, REGION);+ service.putSecretValue("my-secret", "v2", null, REGION, List.of("AWSCURRENT"));+ service.putSecretValue("my-secret", "v3", null, REGION, List.of("AWSPENDING"));++ SecretVersion previous = service.getSecretValue("my-secret", null, "AWSPREVIOUS", REGION);+ assertEquals("v1", previous.getSecretString());++ SecretVersion current = service.getSecretValue("my-secret", null, "AWSCURRENT", REGION);+ assertEquals("v2", current.getSecretString());++ SecretVersion pending = service.getSecretValue("my-secret", null, "AWSPENDING", REGION);+ assertEquals("v3", pending.getSecretString());+ }++ @Test+ void putSecretValueMultiStage() {+ service.createSecret("my-secret", "v1", null, null, null, null, REGION);+ service.putSecretValue("my-secret", "v2", null, REGION, List.of("AWSCURRENT"));+ service.putSecretValue("my-secret", "v3", null, REGION, List.of("AWSCURRENT", "AWSPENDING"));++ SecretVersion previous = service.getSecretValue("my-secret", null, "AWSPREVIOUS", REGION);+ assertEquals("v2", previous.getSecretString());++ SecretVersion current = service.getSecretValue("my-secret", null, "AWSCURRENT", REGION);+ assertEquals("v3", current.getSecretString());++ SecretVersion pending = service.getSecretValue("my-secret", null, "AWSPENDING", REGION);+ assertEquals("v3", pending.getSecretString());+ }++ @Test+ void putSecretValueInvalidNumberOfStages() {+ service.createSecret("my-secret", "v1", null, null, null, null, REGION);++ // no stages+ Assertions.assertThrows(AwsException.class, () ->+ service.putSecretValue("my-secret", "v2", null, REGION, List.of())+ );+ // more than 20+ List<String> stages =+ IntStream.range(0, 21).mapToObj(i -> "stage" + i).toList();+ Assertions.assertThrows(AwsException.class, () ->+ service.putSecretValue("my-secret", "v2", null, REGION, stages)+ );+ }++ @Test+ void putSecretValueInvalidStageName() {+ service.createSecret("my-secret", "v1", null, null, null, null, REGION);+ // Stage name is 0-length+ Assertions.assertThrows(AwsException.class, () ->+ service.putSecretValue("my-secret", "v2", null, REGION, List.of(""))+ );+ // Stage name is larger than 256 characters+ String stageName = RandomStringUtils.randomAlphanumeric(257);+ Assertions.assertThrows(AwsException.class, () ->+ service.putSecretValue("my-secret", "v2", null, REGION, List.of(stageName))+ );+}@Test@@ -179,7 +245,7 @@ class SecretsManagerServiceTest {@Testvoid listSecretVersionIds() {service.createSecret("my-secret", "v1", null, null, null, null, REGION);- service.putSecretValue("my-secret", "v2", null, REGION);+ service.putSecretValue("my-secret", "v2", null, REGION, null);Map<String, List<String>> versions = service.listSecretVersionIds("my-secret", REGION);assertEquals(2, versions.size());@@ -195,7 +261,7 @@ class SecretsManagerServiceTest {SecretVersion v1 = service.getSecretValue("my-secret", null, "AWSCURRENT", REGION);String v1Id = v1.getVersionId();- service.putSecretValue("my-secret", "v2", null, REGION);+ service.putSecretValue("my-secret", "v2", null, REGION, null);SecretVersion fetched = service.getSecretValue("my-secret", v1Id, null, REGION);assertEquals("v1", fetched.getSecretString());