Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(ssm): normalize parameter resource ARNs (#5261)

Mario Toffiac145fa104c92
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java
index 4f3b20332d..cc80d5f9ba 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsmTest.java
@@ -33,6 +33,7 @@ import software.amazon.awssdk.services.ssm.model.ParameterType;
import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
import software.amazon.awssdk.services.ssm.model.PutParameterResponse;
import software.amazon.awssdk.services.ssm.model.RemoveTagsFromResourceRequest;
+import software.amazon.awssdk.services.ssm.model.ResourceTypeForTagging;
import software.amazon.awssdk.services.ssm.model.SendCommandRequest;
import software.amazon.awssdk.services.ssm.model.SendCommandResponse;
import software.amazon.awssdk.services.ssm.model.SsmException;
@@ -364,4 +365,37 @@ class SsmTest {
.build());
assertThat(invocation.status()).isEqualTo(CommandInvocationStatus.CANCELLED);
}
+
+ @Test
+ @Order(17)
+ void topLevelParameterArnHasParameterSlashAndAddressesTags() {
+ String name = "sdk-test-arn-" + System.nanoTime();
+ ssm.putParameter(PutParameterRequest.builder()
+ .name(name)
+ .value("v")
+ .type(ParameterType.STRING)
+ .build());
+ try {
+ String arn = ssm.getParameter(GetParameterRequest.builder().name(name).build()).parameter().arn();
+ assertThat(arn).endsWith(":parameter/" + name);
+
+ ssm.addTagsToResource(AddTagsToResourceRequest.builder()
+ .resourceType(ResourceTypeForTagging.PARAMETER)
+ .resourceId(arn)
+ .tags(tag -> tag.key("env").value("dev"))
+ .build());
+ ListTagsForResourceResponse tags = ssm.listTagsForResource(ListTagsForResourceRequest.builder()
+ .resourceType(ResourceTypeForTagging.PARAMETER)
+ .resourceId(arn)
+ .build());
+ assertThat(tags.tagList())
+ .singleElement()
+ .satisfies(tag -> {
+ assertThat(tag.key()).isEqualTo("env");
+ assertThat(tag.value()).isEqualTo("dev");
+ });
+ } finally {
+ ssm.deleteParameter(DeleteParameterRequest.builder().name(name).build());
+ }
+ }
}
diff --git a/docs/services/ssm.md b/docs/services/ssm.md
index 47fbcbdc84..aefca5ac3d 100644
--- a/docs/services/ssm.md
+++ b/docs/services/ssm.md
@@ -159,6 +159,14 @@ and a refusal fails the whole call with a `ValidationException`, as it does on A
aws ssm get-parameter --name /aws/reference/secretsmanager/my-app/api-key --with-decryption
```
+## Parameter ARNs
+
+A parameter's ARN is `arn:<partition>:ssm:<region>:<account>:parameter/<name without leading slash>`
+for both a top-level name such as `db-host` and a path such as `/app/db/host`, as on AWS.
+The CloudFormation `Arn` attribute of an `AWS::SSM::Parameter` is the same ARN, and
+`AddTagsToResource`, `ListTagsForResource` and `RemoveTagsFromResource` accept it as `ResourceId`.
+An ECS container secret's `valueFrom` accepts it too.
+
## Parameter Types
All AWS parameter types are accepted: `String`, `StringList`, `SecureString`.
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SsmCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SsmCfnProvisioner.java
index 1f7bb6d49d..39a42c3f26 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SsmCfnProvisioner.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/SsmCfnProvisioner.java
@@ -84,7 +84,8 @@ public class SsmCfnProvisioner implements CfnResourceProvisioner {
r.getAttributes().put("Name", name);
r.getAttributes().put("Type", type);
r.getAttributes().put("Value", value);
- r.getAttributes().put("Arn", parameterArn(name, ctx));
+ r.getAttributes().put("Arn", AwsArnUtils.Arn.of("ssm", ctx.region(), ctx.accountId(),
+ SsmService.parameterResource(name)).toString());
// Tag keys cannot contain a comma, so the sorted keys join losslessly.
if (tags.isEmpty()) {
r.getAttributes().remove(SSM_TEMPLATE_TAG_KEYS_ATTR);
@@ -161,12 +162,6 @@ public class SsmCfnProvisioner implements CfnResourceProvisioner {
return keys == null || keys.isEmpty() ? List.of() : Arrays.asList(keys.split(","));
}
- /** AWS's form is {@code parameter/<name>} whether or not the name starts with a slash. */
- private static String parameterArn(String name, ProvisionContext ctx) {
- String path = name.startsWith("/") ? name : "/" + name;
- return AwsArnUtils.Arn.of("ssm", ctx.region(), ctx.accountId(), "parameter" + path).toString();
- }
-
@Override
public void delete(String resourceType, String physicalId, String region) {
// ParameterNotFound is SSM's own code for a parameter that is already gone.
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
index 674f9389a2..fa3f7e11d1 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
@@ -2053,8 +2053,7 @@ public class EcsContainerManager {
selector.versionId(), selector.versionStage(), secretRegion);
value = secret == null ? null : secret.getSecretString();
} else {
- String parameterName = ssmParameterName(valueFrom);
- Parameter parameter = ssmService.getParameter(parameterName, secretRegion);
+ Parameter parameter = ssmService.getParameter(valueFrom, secretRegion);
value = parameter == null ? null : parameter.getValue();
}
} catch (AwsException e) {
@@ -2100,16 +2099,6 @@ public class EcsContainerManager {
return taskRegion;
}
- private String ssmParameterName(String valueFrom) {
- if (AwsArnUtils.isArnFor(valueFrom, "ssm")) {
- int parameterMarker = valueFrom.indexOf(":parameter");
- if (parameterMarker >= 0) {
- return valueFrom.substring(parameterMarker + ":parameter".length());
- }
- }
- return valueFrom;
- }
-
/**
* Resolves the host address at which a running task container is reachable from the
* Floci process — used to register the container as an ELBv2 target.
diff --git a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
index a9fa650b5c..c4d787d5c7 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ssm/SsmService.java
@@ -298,7 +298,7 @@ public class SsmService implements ResourceProvider {
// AWS never moves an Advanced parameter back to Standard behind an overwrite that omits the tier
// or asks for Intelligent-Tiering.
parameter.setTier(tier != null ? tier : existing != null ? tierOf(existing) : "Standard");
- parameter.setArn(regionResolver.buildArn("ssm", region, "parameter" + name));
+ parameter.setArn(regionResolver.buildArn("ssm", region, parameterResource(name)));
parameter.setLastModifiedDate(Instant.now());
if (existing != null && existing.getTags() != null) {
@@ -314,9 +314,14 @@ public class SsmService implements ResourceProvider {
return version;
}
- /** Reads on behalf of ECS task secrets, CodeBuild and CloudFormation ssm-secure, which decrypt. */
- public Parameter getParameter(String name, String region) {
- return getParameter(name, true, region);
+ /** AWS's form is {@code parameter/<name>} whether or not the name starts with a slash. */
+ public static String parameterResource(String name) {
+ return "parameter" + (name.startsWith("/") ? name : "/" + name);
+ }
+
+ /** Reads on behalf of ECS task secrets, CodeBuild and CloudFormation ssm-secure, which decrypt and may pass an ARN. */
+ public Parameter getParameter(String nameOrArn, String region) {
+ return getParameter(parameterName(nameOrArn, region), true, region);
}
public Parameter getParameter(String name, boolean withDecryption, String region) {
@@ -527,7 +532,7 @@ public class SsmService implements ResourceProvider {
}
return imageCatalog.findByPublicParameterName(name).map(image -> {
Parameter parameter = new Parameter(name, image.imageId, "String");
- parameter.setArn(AwsArnUtils.Arn.of("ssm", region, "", "parameter" + name).toString());
+ parameter.setArn(AwsArnUtils.Arn.of("ssm", region, "", parameterResource(name)).toString());
parameter.setLastModifiedDate(Instant.parse(image.creationDate));
return parameter;
});
@@ -898,8 +903,7 @@ public class SsmService implements ResourceProvider {
public void addTagsToResource(String resourceId, Map<String, String> tags, String region) {
validateTagKeys(tags);
- String normalizedId = normalizeResourceId(resourceId);
- String storageKey = regionKey(region, normalizedId);
+ String storageKey = regionKey(region, parameterName(resourceId, region));
Parameter param = parameterStore.get(storageKey)
.orElseThrow(() -> new AwsException("InvalidResourceId",
"Resource " + resourceId + " not found.", 400));
@@ -939,8 +943,7 @@ public class SsmService implements ResourceProvider {
}
public Map<String, String> listTagsForResource(String resourceId, String region) {
- String normalizedId = normalizeResourceId(resourceId);
- String storageKey = regionKey(region, normalizedId);
+ String storageKey = regionKey(region, parameterName(resourceId, region));
Parameter param = parameterStore.get(storageKey)
.orElseThrow(() -> new AwsException("InvalidResourceId",
"Resource " + resourceId + " not found.", 400));
@@ -948,8 +951,7 @@ public class SsmService implements ResourceProvider {
}
public void removeTagsFromResource(String resourceId, List<String> tagKeys, String region) {
- String normalizedId = normalizeResourceId(resourceId);
- String storageKey = regionKey(region, normalizedId);
+ String storageKey = regionKey(region, parameterName(resourceId, region));
Parameter param = parameterStore.get(storageKey)
.orElseThrow(() -> new AwsException("InvalidResourceId",
"Resource " + resourceId + " not found.", 400));
@@ -963,26 +965,31 @@ public class SsmService implements ResourceProvider {
LOG.debugv("Removed tags from parameter: {0}", resourceId);
}
- private static String normalizeResourceId(String resourceId) {
- if (resourceId != null && resourceId.startsWith("arn:")) {
+ /**
+ * The stored name a parameter name or ARN addresses. The ARN carries a leading slash the stored name may
+ * lack, so {@code parameter/foo} falls back to {@code foo} when only {@code foo} is stored. A version or
+ * label selector after the last colon is kept, but the fallback checks the name without it.
+ */
+ private String parameterName(String nameOrArn, String region) {
+ if (nameOrArn != null && nameOrArn.startsWith("arn:")) {
try {
- AwsArnUtils.Arn arn = AwsArnUtils.parse(resourceId);
- if ("ssm".equals(arn.service())) {
- String resource = arn.resource();
- if (resource.startsWith("parameter/")) {
- return resource.substring("parameter".length());
- }
- if (resource.startsWith("parameter")) {
- return resource.substring("parameter".length());
+ AwsArnUtils.Arn arn = AwsArnUtils.parse(nameOrArn);
+ if ("ssm".equals(arn.service()) && arn.resource().startsWith("parameter")) {
+ String name = arn.resource().substring("parameter".length());
+ int separator = name.lastIndexOf(':');
+ String baseName = separator > 0 ? name.substring(0, separator) : name;
+ if (baseName.startsWith("/") && parameterStore.get(regionKey(region, baseName)).isEmpty()
+ && parameterStore.get(regionKey(region, baseName.substring(1))).isPresent()) {
+ return name.substring(1);
}
+ return name;
}
} catch (IllegalArgumentException e) {
- // Not a valid ARN; fall through and use resourceId directly so callers
- // querying parameterStore produce the standard InvalidResourceId error.
- LOG.debugv("Failed to parse resourceId as ARN: {0}", resourceId);
+ // Not a valid ARN; use it as a name so the caller reports its usual not-found error.
+ LOG.debugv("Failed to parse resourceId as ARN: {0}", nameOrArn);
}
}
- return resourceId;
+ return nameOrArn;
}
// ──────────────────────── Documents and Share Permissions ────────────────
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationContinueUpdateRollbackIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationContinueUpdateRollbackIntegrationTest.java
index 93cb00cdb3..6fb56968dc 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationContinueUpdateRollbackIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationContinueUpdateRollbackIntegrationTest.java
@@ -16,6 +16,7 @@ import org.mockito.Mockito;
import java.util.List;
import java.util.Map;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;
@@ -564,14 +565,6 @@ class CloudFormationContinueUpdateRollbackIntegrationTest {
logs("DeleteLogGroup", "{\"logGroupName\":\"" + stack.outsideGroup() + "\"}");
}
- /** A Query request for {@code action}, naming the stack unless {@code stackName} is null. */
- private static RequestSpecification cfn(String action, String stackName) {
- RequestSpecification request = given()
- .contentType("application/x-www-form-urlencoded")
- .formParam("Action", action);
- return stackName == null ? request : request.formParam("StackName", stackName);
- }
-
private static Response logs(String target, String body) {
return given()
.config(RestAssured.config().encoderConfig(EncoderConfig.encoderConfig()
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationNoChangesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationNoChangesIntegrationTest.java
index 662078445f..662dce443c 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationNoChangesIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationNoChangesIntegrationTest.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;
@@ -65,7 +66,7 @@ class CloudFormationNoChangesIntegrationTest {
@AfterEach
void cleanUp() {
for (String stackName : stacksToDelete) {
- request("DeleteStack", stackName).when().post("/");
+ cfn("DeleteStack", stackName).when().post("/");
}
stacksToDelete.clear();
for (String parameter : parametersToDelete) {
@@ -342,7 +343,7 @@ class CloudFormationNoChangesIntegrationTest {
"InlineCode": {"Fn::Sub": "exports.handler = async () => '${Release}';"}}}}}"""
.formatted(name("sam-params-func"));
String stackName = name("no-change-sam-params");
- request("CreateStack", stackName).formParam("TemplateBody", template)
+ cfn("CreateStack", stackName).formParam("TemplateBody", template)
.formParam("Capabilities.member.1", "CAPABILITY_IAM")
.formParam("Parameters.member.1.ParameterKey", "Release")
.formParam("Parameters.member.1.ParameterValue", "second")
@@ -350,7 +351,7 @@ class CloudFormationNoChangesIntegrationTest {
stacksToDelete.add(stackName);
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
- request("UpdateStack", stackName).formParam("TemplateBody", template)
+ cfn("UpdateStack", stackName).formParam("TemplateBody", template)
.formParam("Capabilities.member.1", "CAPABILITY_IAM")
.formParam("Parameters.member.1.ParameterKey", "Release")
.formParam("Parameters.member.1.ParameterValue", "second")
@@ -432,12 +433,12 @@ class CloudFormationNoChangesIntegrationTest {
void tagsArePartOfWhatAnUpdateSubmits() {
String stackName = name("tags");
String template = TEMPLATE.formatted(name("tags-topic"));
- withTags(request("CreateStack", stackName).formParam("TemplateBody", template), "Env", "a", "Team", "x")
+ withTags(cfn("CreateStack", stackName).formParam("TemplateBody", template), "Env", "a", "Team", "x")
.when().post("/").then().statusCode(200);
stacksToDelete.add(stackName);
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
- withTags(request("UpdateStack", stackName).formParam("TemplateBody", template), "Team", "x", "Env", "a")
+ withTags(cfn("UpdateStack", stackName).formParam("TemplateBody", template), "Team", "x", "Env", "a")
.when().post("/").then()
.statusCode(400)
.body(containsString("<Message>No updates are to be performed.</Message>"));
@@ -455,16 +456,16 @@ class CloudFormationNoChangesIntegrationTest {
.body(containsString("<Status>CREATE_COMPLETE</Status>"))
.body(containsString("<ExecutionStatus>AVAILABLE</ExecutionStatus>"));
- withTags(request("UpdateStack", stackName).formParam("TemplateBody", template), "Env", "b")
+ withTags(cfn("UpdateStack", stackName).formParam("TemplateBody", template), "Env", "b")
.when().post("/").then().statusCode(200);
assertEquals("UPDATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
assertEquals(Map.of("Env", "b"), tags(stackName));
- request("UpdateStack", stackName).formParam("TemplateBody", template).formParam("Tags", "")
+ cfn("UpdateStack", stackName).formParam("TemplateBody", template).formParam("Tags", "")
.when().post("/").then().statusCode(200);
assertEquals("UPDATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
assertEquals(Map.of(), tags(stackName));
- request("UpdateStack", stackName).formParam("TemplateBody", template).formParam("Tags", "")
+ cfn("UpdateStack", stackName).formParam("TemplateBody", template).formParam("Tags", "")
.when().post("/").then()
.statusCode(400)
.body(containsString("<Message>No updates are to be performed.</Message>"));
@@ -534,21 +535,15 @@ class CloudFormationNoChangesIntegrationTest {
.when().post("/").then();
}
- private static RequestSpecification request(String action, String stackName) {
- return given().contentType("application/x-www-form-urlencoded")
- .formParam("Action", action)
- .formParam("StackName", stackName);
- }
-
private static RequestSpecification changeSet(String stackName, String changeSetName, String template) {
- return request("CreateChangeSet", stackName)
+ return cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", changeSetName)
.formParam("ChangeSetType", "UPDATE")
.formParam("TemplateBody", template);
}
private static ValidatableResponse describeChangeSet(String stackName, String changeSetName) {
- return request("DescribeChangeSet", stackName)
+ return cfn("DescribeChangeSet", stackName)
.formParam("ChangeSetName", changeSetName)
.when().post("/").then().statusCode(200);
}
@@ -563,7 +558,7 @@ class CloudFormationNoChangesIntegrationTest {
}
private static Map<String, String> tags(String stackName) {
- String xml = request("DescribeStacks", stackName).when().post("/")
+ String xml = cfn("DescribeStacks", stackName).when().post("/")
.then().statusCode(200).extract().asString();
return XmlParser.extractPairs(xml, "member", "Key", "Value");
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationParameterValuesIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationParameterValuesIntegrationTest.java
index da1e41e5a8..fb776802bd 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationParameterValuesIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationParameterValuesIntegrationTest.java
@@ -3,10 +3,10 @@ package io.github.hectorvent.floci.services.cloudformation;
import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.response.Response;
-import io.restassured.specification.RequestSpecification;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
@@ -37,7 +37,7 @@ class CloudFormationParameterValuesIntegrationTest {
void createStackRefusesAParameterWithNoValueAndNoDefault() {
String stackName = "cfn-param-missing-" + Long.toString(System.nanoTime(), 36);
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.when()
.post("/")
@@ -54,7 +54,7 @@ class CloudFormationParameterValuesIntegrationTest {
void everyParameterWithoutAValueIsNamed() {
String stackName = "cfn-param-several-" + Long.toString(System.nanoTime(), 36);
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{
"Parameters": {
@@ -85,7 +85,7 @@ class CloudFormationParameterValuesIntegrationTest {
void aMissingValueIsReportedBeforeADependencyCycle() {
String stackName = "cfn-param-cycle-" + Long.toString(System.nanoTime(), 36);
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{
"Parameters": {"Env": {"Type": "String"}},
@@ -110,7 +110,7 @@ class CloudFormationParameterValuesIntegrationTest {
String stackName = "cfn-param-empty-" + Long.toString(System.nanoTime(), 36);
String queueName = "param-empty-" + Long.toString(System.nanoTime(), 36);
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{
"Parameters": {
@@ -141,7 +141,7 @@ class CloudFormationParameterValuesIntegrationTest {
void createChangeSetRefusesAParameterWithNoValue() {
String stackName = "cfn-param-changeset-" + Long.toString(System.nanoTime(), 36);
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "deploy")
.formParam("ChangeSetType", "CREATE")
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
@@ -163,7 +163,7 @@ class CloudFormationParameterValuesIntegrationTest {
void samTemplateWithoutAValueIsRefusedBeforeTheTransform() {
String stackName = "cfn-param-sam-" + Long.toString(System.nanoTime(), 36);
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "deploy")
.formParam("ChangeSetType", "CREATE")
.formParam("TemplateBody", """
@@ -200,7 +200,7 @@ class CloudFormationParameterValuesIntegrationTest {
"Properties": {"QueueName": {"Fn::Sub": "%s-${Env}"}, "VisibilityTimeout": %d}}}
}
""";
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", template.formatted(queueName, 30))
.formParam("Parameters.member.1.ParameterKey", "Env")
.formParam("Parameters.member.1.ParameterValue", "dev")
@@ -211,21 +211,21 @@ class CloudFormationParameterValuesIntegrationTest {
try {
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", template.formatted(queueName, 60))
.when()
.post("/")
.then()
.statusCode(400)
.body("ErrorResponse.Error.Message", equalTo("Parameters: [Env] must have values"));
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("UsePreviousTemplate", "true")
.when()
.post("/")
.then()
.statusCode(400)
.body("ErrorResponse.Error.Message", equalTo("Parameters: [Env] must have values"));
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "omits-env")
.formParam("ChangeSetType", "UPDATE")
.formParam("TemplateBody", template.formatted(queueName, 60))
@@ -239,7 +239,7 @@ class CloudFormationParameterValuesIntegrationTest {
.body(containsString("<StackStatus>CREATE_COMPLETE</StackStatus>"))
.body(containsString("<ParameterValue>dev</ParameterValue>"));
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "keeps-env")
.formParam("ChangeSetType", "UPDATE")
.formParam("TemplateBody", template.formatted(queueName, 45))
@@ -250,7 +250,7 @@ class CloudFormationParameterValuesIntegrationTest {
.then()
.statusCode(200);
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", template.formatted(queueName, 60))
.formParam("Parameters.member.1.ParameterKey", "Env")
.formParam("Parameters.member.1.UsePreviousValue", "true")
@@ -279,7 +279,7 @@ class CloudFormationParameterValuesIntegrationTest {
String stackName = "cfn-param-previous-" + suffix;
String queueName = "param-previous-" + suffix;
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.formParam("Parameters.member.1.ParameterKey", "Env")
.formParam("Parameters.member.1.UsePreviousValue", "true")
@@ -289,7 +289,7 @@ class CloudFormationParameterValuesIntegrationTest {
.statusCode(400)
.body("ErrorResponse.Error.Message", equalTo("Parameters: [Env] must have values"));
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{"Resources": {"Queue": {"Type": "AWS::SQS::Queue", "Properties": {"QueueName": "%s"}}}}
""".formatted(queueName))
@@ -306,7 +306,7 @@ class CloudFormationParameterValuesIntegrationTest {
"Properties": {"QueueName": "%s", "Tags": [{"Key": "added", "Value": {"Ref": "Added"}}]}}}
}
""";
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", added.formatted("", queueName))
.formParam("Parameters.member.1.ParameterKey", "Added")
.formParam("Parameters.member.1.UsePreviousValue", "true")
@@ -316,7 +316,7 @@ class CloudFormationParameterValuesIntegrationTest {
.statusCode(400)
.body("ErrorResponse.Error.Message", equalTo("Parameters: [Added] must have values"));
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", added.formatted(", \"Default\": \"fallback\"", queueName))
.formParam("Parameters.member.1.ParameterKey", "Added")
.formParam("Parameters.member.1.UsePreviousValue", "true")
@@ -342,7 +342,7 @@ class CloudFormationParameterValuesIntegrationTest {
void aRequestItsStackRefusesGetsThatRefusal() {
String suffix = Long.toString(System.nanoTime(), 36);
String missing = "cfn-param-missing-stack-" + suffix;
- request("UpdateStack", missing)
+ cfn("UpdateStack", missing)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.formParam("Parameters.member.1.ParameterKey", "Env")
.formParam("Parameters.member.1.UsePreviousValue", "true")
@@ -353,7 +353,7 @@ class CloudFormationParameterValuesIntegrationTest {
.body("ErrorResponse.Error.Message", equalTo("Stack with id " + missing + " does not exist"));
String taken = "cfn-param-taken-" + suffix;
- request("CreateStack", taken)
+ cfn("CreateStack", taken)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.formParam("Parameters.member.1.ParameterKey", "Env")
.formParam("Parameters.member.1.ParameterValue", "")
@@ -363,7 +363,7 @@ class CloudFormationParameterValuesIntegrationTest {
.statusCode(200);
try {
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(taken).status());
- request("CreateStack", taken)
+ cfn("CreateStack", taken)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.when()
.post("/")
@@ -382,7 +382,7 @@ class CloudFormationParameterValuesIntegrationTest {
@Test
void aPlaceholderStackRefusesTheUpdateButNotTheAttachingCreate() {
String stackName = "cfn-param-placeholder-" + Long.toString(System.nanoTime(), 36);
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "first")
.formParam("ChangeSetType", "CREATE")
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
@@ -393,7 +393,7 @@ class CloudFormationParameterValuesIntegrationTest {
.then()
.statusCode(200);
try {
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
.when()
.post("/")
@@ -402,7 +402,7 @@ class CloudFormationParameterValuesIntegrationTest {
.body("ErrorResponse.Error.Message",
containsString("is in REVIEW_IN_PROGRESS state and can not be updated."));
- request("CreateChangeSet", stackName)
+ cfn("CreateChangeSet", stackName)
.formParam("ChangeSetName", "second")
.formParam("ChangeSetType", "CREATE")
.formParam("TemplateBody", BLANK_ENV_TEMPLATE)
@@ -428,7 +428,7 @@ class CloudFormationParameterValuesIntegrationTest {
String stackName = "cfn-param-nested-" + suffix;
String templateUrl = putChildTemplate(bucket);
try {
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", parentTemplate(templateUrl, "{}"))
.when()
.post("/")
@@ -437,7 +437,7 @@ class CloudFormationParameterValuesIntegrationTest {
CfnStackWaits.StackState state = CfnStackWaits.awaitStatus(stackName, "ROLLBACK_COMPLETE");
assertEquals("The following resource(s) failed to create: [Child]. Rollback requested by user.",
state.reason());
- request("DescribeStackEvents", stackName)
+ cfn("DescribeStackEvents", stackName)
.when()
.post("/")
.then()
@@ -462,7 +462,7 @@ class CloudFormationParameterValuesIntegrationTest {
String stackName = "cfn-param-nested-update-" + suffix;
String templateUrl = putChildTemplate(bucket);
try {
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", parentTemplate(templateUrl, "{\"Env\": \"dev\"}"))
.when()
.post("/")
@@ -470,14 +470,14 @@ class CloudFormationParameterValuesIntegrationTest {
.statusCode(200);
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
- request("UpdateStack", stackName)
+ cfn("UpdateStack", stackName)
.formParam("TemplateBody", parentTemplate(templateUrl, "{\"Size\": \"2\"}"))
.when()
.post("/")
.then()
.statusCode(200);
CfnStackWaits.awaitStatus(stackName, "UPDATE_ROLLBACK_COMPLETE");
- request("DescribeStackEvents", stackName)
+ cfn("DescribeStackEvents", stackName)
.when()
.post("/")
.then()
@@ -506,7 +506,7 @@ class CloudFormationParameterValuesIntegrationTest {
String stackName = "cfn-param-nested-if-" + suffix;
String templateUrl = putChildTemplate(bucket);
try {
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{
"Conditions": {"Always": {"Fn::Equals": ["a", "a"]}},
@@ -550,7 +550,7 @@ class CloudFormationParameterValuesIntegrationTest {
given().body("{\"Type\": \"String\", \"Default\": \"dev\"}")
.when().put("/" + bucket + "/env.json").then().statusCode(200);
try {
- request("CreateStack", stackName)
+ cfn("CreateStack", stackName)
.formParam("TemplateBody", """
{
"Parameters": {"Env": {"Fn::Transform": {"Name": "AWS::Include",
@@ -566,7 +566,7 @@ class CloudFormationParameterValuesIntegrationTest {
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
getQueueUrl(queueName + "-dev").then().statusCode(200);
- request("CreateStack", stackName + "-other")
+ cfn("CreateStack", stackName + "-other")
.formParam("TemplateBody", """
{
"Parameters": {"Other": {"Type": "String"}, "Env": {"Fn::Transform": {"Name": "AWS::Include",
@@ -622,19 +622,12 @@ class CloudFormationParameterValuesIntegrationTest {
""".formatted(templateUrl, parameters);
}
- private static RequestSpecification request(String action, String stackName) {
- return given()
- .contentType("application/x-www-form-urlencoded")
- .formParam("Action", action)
- .formParam("StackName", stackName);
- }
-
private static Response describeStacks(String stackName) {
- return request("DescribeStacks", stackName).when().post("/");
+ return cfn("DescribeStacks", stackName).when().post("/");
}
private static void deleteStack(String stackName) {
- request("DeleteStack", stackName).when().post("/").then().statusCode(200);
+ cfn("DeleteStack", stackName).when().post("/").then().statusCode(200);
}
private static Response getQueueUrl(String queueName) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmParameterIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmParameterIntegrationTest.java
index 19a574a68a..8edf0b4f72 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmParameterIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmParameterIntegrationTest.java
@@ -2,11 +2,16 @@ package io.github.hectorvent.floci.services.cloudformation;
import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.path.xml.XmlPath;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static io.restassured.RestAssured.given;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
@QuarkusTest
@@ -187,4 +192,71 @@ class CloudFormationSsmParameterIntegrationTest {
.body(containsString("<StackStatus>CREATE_FAILED</StackStatus>"))
.body(containsString("Unable to fetch parameters [/aws/reference/secretsmanager/cfn-ssm-ref-secret]"));
}
+
+ @Test
+ void createStack_parameterArnAttributeMatchesTheGetParameterArn() {
+ String suffix = Long.toString(System.nanoTime());
+ String stackName = "ssm-param-arn-" + suffix;
+ String plain = "cfn-arn-plain-" + suffix;
+ String nested = "/cfn-arn/nested-" + suffix;
+ String template = """
+ {
+ "Resources": {
+ "Plain": {
+ "Type": "AWS::SSM::Parameter",
+ "Properties": { "Name": "%s", "Type": "String", "Value": "v" }
+ },
+ "Nested": {
+ "Type": "AWS::SSM::Parameter",
+ "Properties": { "Name": "%s", "Type": "String", "Value": "v" }
+ }
+ },
+ "Outputs": {
+ "PlainArn": { "Value": { "Fn::GetAtt": ["Plain", "Arn"] } },
+ "NestedArn": { "Value": { "Fn::GetAtt": ["Nested", "Arn"] } }
+ }
+ }
+ """.formatted(plain, nested);
+
+ cfn("CreateStack", stackName).formParam("TemplateBody", template)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+ assertThat(CfnStackWaits.awaitTerminal(stackName).status(), equalTo("CREATE_COMPLETE"));
+
+ XmlPath outputs = cfn("DescribeStacks", stackName)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .extract().xmlPath();
+ assertArnMatchesGetParameter(output(outputs, "PlainArn"), plain);
+ assertArnMatchesGetParameter(output(outputs, "NestedArn"), nested);
+
+ cfn("DeleteStack", stackName)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+ CfnStackWaits.awaitStackDeleted(stackName);
+ }
+
+ private static String output(XmlPath describe, String key) {
+ return describe.getString("DescribeStacksResponse.DescribeStacksResult.Stacks.member"
+ + ".Outputs.member.find { it.OutputKey == '" + key + "' }.OutputValue");
+ }
+
+ private static void assertArnMatchesGetParameter(String arn, String name) {
+ assertThat(arn, allOf(containsString(":parameter/"), not(containsString("//"))));
+ given()
+ .header("X-Amz-Target", "AmazonSSM.GetParameter")
+ .contentType(SSM_CONTENT_TYPE)
+ .body("{ \"Name\": \"" + name + "\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("Parameter.ARN", equalTo(arn));
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmRollbackIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmRollbackIntegrationTest.java
index 0c5c35d4d7..c4dacd2640 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmRollbackIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationSsmRollbackIntegrationTest.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -560,11 +561,6 @@ class CloudFormationSsmRollbackIntegrationTest {
.orElse("");
}
- private static RequestSpecification cfn(String action, String stack) {
- return given().contentType("application/x-www-form-urlencoded")
- .formParam("Action", action).formParam("StackName", stack);
- }
-
private static Response ssm(String operation, Map<String, ?> body) throws JsonProcessingException {
return given().contentType("application/x-amz-json-1.1")
.header("X-Amz-Target", "AmazonSSM." + operation).body(MAPPER.writeValueAsString(body)).post("/");
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUpdateStackTagsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUpdateStackTagsIntegrationTest.java
index 9421443ef8..36fe778255 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUpdateStackTagsIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationUpdateStackTagsIntegrationTest.java
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
import java.util.Map;
import java.util.UUID;
-import static io.restassured.RestAssured.given;
+import static io.github.hectorvent.floci.testing.CfnRequests.cfn;
import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
@@ -21,18 +21,18 @@ class CloudFormationUpdateStackTagsIntegrationTest {
{"Resources":{"Queue":{"Type":"AWS::SQS::Queue","Properties":{"QueueName":"%s"}}}}
""".formatted(stackName);
try {
- withTags(request("CreateStack", stackName).formParam("TemplateBody", template),
+ withTags(cfn("CreateStack", stackName).formParam("TemplateBody", template),
"before", "original")
.when().post("/").then().statusCode(200);
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
- withTags(request("UpdateStack", stackName).formParam("TemplateBody", template),
+ withTags(cfn("UpdateStack", stackName).formParam("TemplateBody", template),
"after", "new")
.when().post("/").then().statusCode(200);
assertEquals("UPDATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
assertEquals(Map.of("Env", "after", "Team", "new"), tags(stackName));
- withTags(request("CreateChangeSet", stackName)
+ withTags(cfn("CreateChangeSet", stackName)
.formParam("TemplateBody", template)
.formParam("ChangeSetName", "tags-only")
.formParam("ChangeSetType", "UPDATE"), "final", "latest")
@@ -47,13 +47,13 @@ class CloudFormationUpdateStackTagsIntegrationTest {
"ZFail":{"Type":"AWS::CloudFormation::Stack","Properties":{}}
}}
""".formatted(stackName);
- withTags(request("UpdateStack", stackName).formParam("TemplateBody", failingTemplate),
+ withTags(cfn("UpdateStack", stackName).formParam("TemplateBody", failingTemplate),
"failed", "attempt")
.when().post("/").then().statusCode(200);
assertEquals("UPDATE_ROLLBACK_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
assertEquals(Map.of("Env", "final", "Team", "latest"), tags(stackName));
} finally {
- request("DeleteStack", stackName).when().post("/").then().statusCode(200);
+ cfn("DeleteStack", stackName).when().post("/").then().statusCode(200);
CfnStackWaits.awaitStackDeleted(stackName);
}
}
@@ -67,7 +67,7 @@ class CloudFormationUpdateStackTagsIntegrationTest {
"QueueName":"%s","VisibilityTimeout":{"Ref":"Timeout"}}}}}
""".formatted(stackName);
try {
- withTags(request("CreateStack", stackName).formParam("TemplateBody", template),
+ withTags(cfn("CreateStack", stackName).formParam("TemplateBody", template),
"before", "original")
.when().post("/").then().statusCode(200);
assertEquals("CREATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
@@ -118,19 +118,14 @@ class CloudFormationUpdateStackTagsIntegrationTest {
executeChangeSet(stackName, "clear-tags");
assertEquals(Map.of(), tags(stackName));
} finally {
- request("DeleteStack", stackName).when().post("/").then().statusCode(200);
+ cfn("DeleteStack", stackName).when().post("/").then().statusCode(200);
CfnStackWaits.awaitStackDeleted(stackName);
}
}
- private static RequestSpecification request(String action, String stackName) {
- return given().contentType("application/x-www-form-urlencoded")
- .formParam("Action", action).formParam("StackName", stackName);
- }
-
private static RequestSpecification updateRequest(String action, String stackName,
String template, String timeout) {
- return request(action, stackName).formParam("TemplateBody", template)
+ return cfn(action, stackName).formParam("TemplateBody", template)
.formParam("Parameters.member.1.ParameterKey", "Timeout")
.formParam("Parameters.member.1.ParameterValue", timeout);
}
@@ -145,13 +140,13 @@ class CloudFormationUpdateStackTagsIntegrationTest {
}
private static Map<String, String> tags(String stackName) {
- String xml = request("DescribeStacks", stackName).when().post("/")
+ String xml = cfn("DescribeStacks", stackName).when().post("/")
.then().statusCode(200).extract().asString();
return XmlParser.extractPairs(xml, "member", "Key", "Value");
}
private static void executeChangeSet(String stackName, String changeSetName) {
- request("ExecuteChangeSet", stackName).formParam("ChangeSetName", changeSetName)
+ cfn("ExecuteChangeSet", stackName).formParam("ChangeSetName", changeSetName)
.when().post("/").then().statusCode(200);
assertEquals("UPDATE_COMPLETE", CfnStackWaits.awaitTerminal(stackName).status());
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java
index 115a6b5f1e..f7ca412229 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerSecretsTest.java
@@ -107,22 +107,21 @@ class EcsContainerManagerSecretsTest {
}
@Test
- void ssmArnKeepsLeadingSlashInParameterName() {
+ void ssmArnIsPassedWholeForSsmToResolve() {
String ssmArn = "arn:aws:ssm:us-east-1:000000000000:parameter/foo/bar";
- when(ssmService.getParameter("/foo/bar", "us-east-1"))
+ when(ssmService.getParameter(ssmArn, "us-east-1"))
.thenReturn(new Parameter("/foo/bar", "path-value", "String"));
manager.startTask(task(), taskDef(containerDef("app", List.of(new Secret("PATH_VALUE", ssmArn)))),
List.of(), "us-east-1");
- verify(ssmService).getParameter("/foo/bar", "us-east-1");
+ verify(ssmService).getParameter(ssmArn, "us-east-1");
}
/**
* Both {@code valueFrom} guards required a literal {@code arn:aws:}. Outside the commercial
- * partition a Secrets Manager ARN fell through to the SSM branch and a parameter ARN was
- * passed along whole as a parameter name, so the task died at launch with ParameterNotFound
- * rather than reading its own configuration.
+ * partition a Secrets Manager ARN fell through to the SSM branch, so the task died at launch
+ * with ParameterNotFound rather than reading its own configuration.
*/
@org.junit.jupiter.params.ParameterizedTest
@org.junit.jupiter.params.provider.CsvSource({
@@ -132,7 +131,7 @@ class EcsContainerManagerSecretsTest {
void resolvesSecretsAndParametersInAnyPartition(String region, String partition) {
String ssmArn = "arn:" + partition + ":ssm:" + region + ":000000000000:parameter/app/token";
String secretArn = "arn:" + partition + ":secretsmanager:" + region + ":000000000000:secret:db-AbCdEf";
- when(ssmService.getParameter("/app/token", region))
+ when(ssmService.getParameter(ssmArn, region))
.thenReturn(new Parameter("/app/token", "ssm-value", "String"));
when(secretsManagerService.getSecretValue(secretArn, null, null, region))
.thenReturn(secretVersion("sm-value"));
@@ -156,7 +155,7 @@ class EcsContainerManagerSecretsTest {
void crossRegionArnResolvesAgainstArnRegionNotTaskRegion() {
String ssmArn = "arn:aws:ssm:eu-west-1:000000000000:parameter/app/token";
String secretArn = "arn:aws:secretsmanager:eu-west-1:000000000000:secret:db-AbCdEf";
- when(ssmService.getParameter("/app/token", "eu-west-1"))
+ when(ssmService.getParameter(ssmArn, "eu-west-1"))
.thenReturn(new Parameter("/app/token", "ssm-eu", "String"));
when(secretsManagerService.getSecretValue(secretArn, null, null, "eu-west-1"))
.thenReturn(secretVersion("sm-eu"));
@@ -167,7 +166,7 @@ class EcsContainerManagerSecretsTest {
new Secret("PASSWORD", secretArn)))),
List.of(), "us-east-1");
- verify(ssmService).getParameter("/app/token", "eu-west-1");
+ verify(ssmService).getParameter(ssmArn, "eu-west-1");
verify(secretsManagerService).getSecretValue(secretArn, null, null, "eu-west-1");
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmIntegrationTest.java
index 018e958bf2..81f008f418 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmIntegrationTest.java
@@ -1650,6 +1650,66 @@ class SsmIntegrationTest {
describeParametersError("{ \"MaxResults\": 51 }", "ValidationException");
}
+ @Test
+ void parameterArn_hasParameterSlashAndAddressesTagOperations() {
+ String suffix = Long.toString(System.nanoTime());
+ String plain = "arn-plain-" + suffix;
+ String nested = "/arn/nested-" + suffix;
+ putFilterFixture(plain, "String", "");
+ putFilterFixture(nested, "String", "");
+
+ String plainArn = parameterArn(plain, ":parameter/" + plain);
+ parameterArn(nested, ":parameter" + nested);
+
+ given()
+ .header("X-Amz-Target", "AmazonSSM.AddTagsToResource")
+ .contentType(SSM_CONTENT_TYPE)
+ .body("""
+ { "ResourceType": "Parameter", "ResourceId": "%s", "Tags": [{"Key": "env", "Value": "dev"}] }
+ """.formatted(plainArn))
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("X-Amz-Target", "AmazonSSM.ListTagsForResource")
+ .contentType(SSM_CONTENT_TYPE)
+ .body("""
+ { "ResourceType": "Parameter", "ResourceId": "%s" }
+ """.formatted(plainArn))
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("TagList", hasSize(1))
+ .body("TagList[0].Key", equalTo("env"))
+ .body("TagList[0].Value", equalTo("dev"));
+
+ given()
+ .header("X-Amz-Target", "AmazonSSM.DeleteParameters")
+ .contentType(SSM_CONTENT_TYPE)
+ .body("{ \"Names\": [\"" + plain + "\", \"" + nested + "\"] }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("DeletedParameters", hasSize(2));
+ }
+
+ private String parameterArn(String name, String expectedArnSuffix) {
+ return given()
+ .header("X-Amz-Target", "AmazonSSM.GetParameter")
+ .contentType(SSM_CONTENT_TYPE)
+ .body("{ \"Name\": \"" + name + "\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("Parameter.ARN", endsWith(expectedArnSuffix))
+ .extract().path("Parameter.ARN");
+ }
+
@Test
void describeParametersReturnsKeyIdAllowedPatternTierAndPolicies() {
String policy = "{\\\"Type\\\":\\\"Expiration\\\",\\\"Version\\\":\\\"1.0\\\","
diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServicePublicAmiParameterTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServicePublicAmiParameterTest.java
index 2fbef90b51..95293453cc 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServicePublicAmiParameterTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServicePublicAmiParameterTest.java
@@ -79,6 +79,13 @@ class SsmServicePublicAmiParameterTest {
assertEquals("ami-0abcdef1234567890", ssmService.getParameter(AMZN2_DEFAULT, REGION).getValue());
}
+ @Test
+ void resolvesAPublicParameterByItsArnForAnEcsSecret() {
+ String arn = ssmService.getParameter(AL2023_DEFAULT, REGION).getArn();
+
+ assertEquals("ami-0abcdef1234567891", ssmService.getParameter(arn, REGION).getValue());
+ }
+
@Test
void getParametersAnswersPublicNamesAlongsideStoredOnes() {
ssmService.putParameter("/app/ami", "ami-custom", "String", null, false, REGION);
diff --git a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
index a3050d20ac..1aba24c204 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ssm/SsmServiceTest.java
@@ -1507,6 +1507,77 @@ class SsmServiceTest {
assertEquals("mission", retrievedTags.get("GovProject"));
}
+ @Test
+ void putParameter_topLevelNameArnHasParameterSlash() {
+ ssmService.putParameter("arn-plain", "v", "String", null, false, "us-east-1");
+ assertEquals("arn:aws:ssm:us-east-1:000000000000:parameter/arn-plain",
+ ssmService.getParameter("arn-plain", "us-east-1").getArn());
+ }
+
+ @Test
+ void putParameter_hierarchicalNameArnHasNoDoubleSlash() {
+ ssmService.putParameter("/arn/nested", "v", "String", null, false, "us-east-1");
+ assertEquals("arn:aws:ssm:us-east-1:000000000000:parameter/arn/nested",
+ ssmService.getParameter("/arn/nested", "us-east-1").getArn());
+ }
+
+ @Test
+ void getParameter_forAnotherService_acceptsTheArnOfATopLevelOrPathParameter() {
+ ssmService.putParameter("arn-read", "top", "String", null, false, "us-east-1");
+ ssmService.putParameter("/arn/read", "path", "String", null, false, "us-gov-west-1");
+
+ assertEquals("top", ssmService.getParameter(
+ ssmService.getParameter("arn-read", "us-east-1").getArn(), "us-east-1").getValue());
+ assertEquals("path", ssmService.getParameter(
+ "arn:aws-us-gov:ssm:us-gov-west-1:000000000000:parameter/arn/read", "us-gov-west-1").getValue());
+ assertEquals("path", ssmService.getParameter(
+ "arn:aws-us-gov:ssm:us-gov-west-1:000000000000:parameter/arn/read:1", "us-gov-west-1").getValue());
+ }
+
+ @Test
+ void getParameter_forAnotherService_acceptsTheArnOfATopLevelParameterWithASelector() {
+ ssmService.putParameter("arn-selected", "v1", "String", null, false, "us-east-1");
+ ssmService.putParameter("arn-selected", "v2", "String", null, true, "us-east-1");
+ ssmService.labelParameterVersion("arn-selected", 1L, List.of("stable"), "us-east-1");
+ String arn = ssmService.getParameter("arn-selected", "us-east-1").getArn();
+
+ Parameter byVersion = ssmService.getParameter(arn + ":1", "us-east-1");
+ assertEquals("arn-selected", byVersion.getName());
+ assertEquals("v1", byVersion.getValue());
+ assertEquals("v1", ssmService.getParameter(arn + ":stable", "us-east-1").getValue());
+ }
+
+ @Test
+ void tagOperations_byArn_findATopLevelParameter() {
+ ssmService.putParameter("arn-tagged", "v", "String", null, false, "us-east-1");
+ String arn = ssmService.getParameter("arn-tagged", "us-east-1").getArn();
+
+ ssmService.addTagsToResource(arn, Map.of("env", "dev"), "us-east-1");
+ assertEquals(Map.of("env", "dev"), ssmService.listTagsForResource(arn, "us-east-1"));
+ assertEquals(Map.of("env", "dev"),
+ ssmService.listTagsForResource(arn.replace(":parameter/", ":parameter"), "us-east-1"));
+ ssmService.removeTagsFromResource(arn, List.of("env"), "us-east-1");
+ assertEquals(Map.of(), ssmService.listTagsForResource("arn-tagged", "us-east-1"));
+ }
+
+ @Test
+ void tagOperations_byArn_findAPathStoredWithoutLeadingSlash() {
+ ssmService.putParameter("arn/relative", "v", "String", null, false, "us-east-1");
+ String arn = ssmService.getParameter("arn/relative", "us-east-1").getArn();
+
+ ssmService.addTagsToResource(arn, Map.of("env", "dev"), "us-east-1");
+ assertEquals(Map.of("env", "dev"), ssmService.listTagsForResource(arn, "us-east-1"));
+ }
+
+ @Test
+ void tagOperations_byArn_findAHierarchicalParameter() {
+ ssmService.putParameter("/arn/tagged", "v", "String", null, false, "us-east-1");
+ String arn = ssmService.getParameter("/arn/tagged", "us-east-1").getArn();
+
+ ssmService.addTagsToResource(arn, Map.of("env", "dev"), "us-east-1");
+ assertEquals(Map.of("env", "dev"), ssmService.listTagsForResource("/arn/tagged", "us-east-1"));
+ }
+
@Test
void putParameterOverwriteClearsDescriptionWhenOmitted() {
String region = "eu-west-1";
diff --git a/src/test/java/io/github/hectorvent/floci/testing/CfnRequests.java b/src/test/java/io/github/hectorvent/floci/testing/CfnRequests.java
new file mode 100644
index 0000000000..b2d99e60d9
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/testing/CfnRequests.java
@@ -0,0 +1,16 @@
+package io.github.hectorvent.floci.testing;
+
+import io.restassured.specification.RequestSpecification;
+
+import static io.restassured.RestAssured.given;
+
+public final class CfnRequests {
+ private CfnRequests() {}
+
+ /** A CloudFormation Query request; a null {@code stackName} leaves {@code StackName} out. */
+ public static RequestSpecification cfn(String action, String stackName) {
+ RequestSpecification request = given().contentType("application/x-www-form-urlencoded")
+ .formParam("Action", action);
+ return stackName == null ? request : request.formParam("StackName", stackName);
+ }
+}