Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,50 @@ private void provisionSubscription(StackResource r, JsonNode props, ProvisionCon
if (props.has("RawMessageDelivery")) {
attributes.put("RawMessageDelivery", ctx.engine().resolve(props.path("RawMessageDelivery")));
}
if (props.hasNonNull("SubscriptionRoleArn")) {
attributes.put("SubscriptionRoleArn", ctx.engine().resolve(props.path("SubscriptionRoleArn")));
Comment thread
qodo-code-review[bot] marked this conversation as resolved.
Resolved
}
if (props.has("RedrivePolicy") && !props.path("RedrivePolicy").isNull()) {
attributes.put("RedrivePolicy", ctx.engine().resolveJsonAttribute(props.path("RedrivePolicy")));
}

Subscription sub = snsService.subscribe(topicArn, protocol, endpoint, ctx.region(), attributes);
r.setPhysicalId(sub.getSubscriptionArn());
r.getAttributes().put("Arn", sub.getSubscriptionArn());
String subscriptionArn;
if (ctx.isUpdate() && matchesPriorSubscription(topicArn, protocol, endpoint, ctx)) {
subscriptionArn = ctx.priorPhysicalId();
// Validate the firehose role before changing other attributes, including a removed role.
if (attributes.containsKey("SubscriptionRoleArn") || ctx.previouslyDeclared("SubscriptionRoleArn")) {
snsService.setSubscriptionAttribute(subscriptionArn, "SubscriptionRoleArn",
attributes.getOrDefault("SubscriptionRoleArn", ""), ctx.region());
}
Map<String, String> desired = new HashMap<>(attributes);
desired.remove("SubscriptionRoleArn");
for (String policy : List.of("FilterPolicy", "RedrivePolicy")) {
if (!desired.containsKey(policy) && ctx.previouslyDeclared(policy)) {
desired.put(policy, "");
}
}
if (!desired.containsKey("RawMessageDelivery") && ctx.previouslyDeclared("RawMessageDelivery")) {
desired.put("RawMessageDelivery", "false");
}
if (!desired.containsKey("FilterPolicyScope") && ctx.previouslyDeclared("FilterPolicyScope")) {
desired.put("FilterPolicyScope", "MessageAttributes");
}
desired.forEach((name, value) ->
snsService.setSubscriptionAttribute(subscriptionArn, name, value, ctx.region()));
} else {
Subscription sub = snsService.subscribe(topicArn, protocol, endpoint, ctx.region(), attributes);
subscriptionArn = sub.getSubscriptionArn();
}
r.setPhysicalId(subscriptionArn);
r.getAttributes().put("Arn", subscriptionArn);
}

private boolean matchesPriorSubscription(String topicArn, String protocol, String endpoint,
ProvisionContext ctx) {
Map<String, String> prior = snsService.getSubscriptionAttributes(ctx.priorPhysicalId(), ctx.region());
return Objects.equals(topicArn, prior.get("TopicArn"))
&& Objects.equals(protocol, prior.get("Protocol"))
&& Objects.equals(endpoint, prior.get("Endpoint"));
}

/**
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/io/floci/aws/services/sns/SnsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,7 @@ public SubscriptionCreation subscribeWithStatus(String topicArn, String protocol
for (Subscription existing : subscriptionsByTopic(topicArn, region)) {
if (protocol.equals(existing.getProtocol())
&& Objects.equals(endpoint, existing.getEndpoint())) {
requireMatchingSubscriptionAttributes(existing, attributes);
return new SubscriptionCreation(existing, false);
}
}
Expand Down Expand Up @@ -1486,6 +1487,28 @@ private static String endpointKey(String region, String arn) {
return "endpoint::" + region + "::" + arn;
}

private static void requireMatchingSubscriptionAttributes(Subscription existing, Map<String, String> requested) {
if (requested == null) {
return;
}
for (String attribute : List.of("RawMessageDelivery", "FilterPolicy")) {
if (!requested.containsKey(attribute)) {
continue;
}
String defaultValue = "RawMessageDelivery".equals(attribute) ? "false" : "{}";
String current = existing.getAttributes().getOrDefault(attribute, defaultValue);
String desired = requested.get(attribute);
if ("FilterPolicy".equals(attribute)) {
current = current == null || current.isEmpty() ? defaultValue : current;
desired = desired != null && desired.isEmpty() ? defaultValue : desired;
}
if (!Objects.equals(current, desired)) {
throw new AwsException("InvalidParameter",
"Invalid parameter: Attributes Reason: Subscription already exists with different attributes", 400);
}
}
}

public Map<String, String> getSubscriptionAttributes(String subscriptionArn, String region) {
String key = subKey(region, subscriptionArn);
Subscription sub = subscriptionStore.get(key)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
package io.floci.aws.services.cloudformation;

import io.floci.aws.testing.AwsTestClients;
import io.floci.aws.testing.CfnStackWaits;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
import software.amazon.awssdk.services.sns.SnsClient;

import java.util.UUID;

import static org.junit.jupiter.api.Assertions.assertEquals;

@QuarkusTest
class CloudFormationSnsFirehoseRoleIntegrationTest {

@Test
void resolvedFirehoseRoleIsForwardedAndUpdatedWithoutReplacingSubscription() {
String suffix = UUID.randomUUID().toString();
String stackName = "sns-firehose-role-" + suffix;
try (CloudFormationClient cfn = AwsTestClients.create(
CloudFormationClient.builder(), "test", Region.US_EAST_1);
SnsClient sns = AwsTestClients.create(SnsClient.builder(), "test", Region.US_EAST_1)) {
String topic = sns.createTopic(request -> request.name("sns-firehose-" + suffix)).topicArn();
boolean created = false;
try {
cfn.createStack(request -> request.stackName(stackName).templateBody(template(topic, "first")));
created = true;
CfnStackWaits.awaitStatus(cfn, stackName, "CREATE_COMPLETE");
String subscription = subscription(cfn, stackName);
assertEquals("arn:aws:iam::000000000000:role/first",
sns.getSubscriptionAttributes(request -> request.subscriptionArn(subscription))
.attributes().get("SubscriptionRoleArn"));

cfn.updateStack(request -> request.stackName(stackName).templateBody(template(topic, "second")));
CfnStackWaits.awaitStatus(cfn, stackName, "UPDATE_COMPLETE");
assertEquals(subscription, subscription(cfn, stackName));
assertEquals("arn:aws:iam::000000000000:role/second",
sns.getSubscriptionAttributes(request -> request.subscriptionArn(subscription))
.attributes().get("SubscriptionRoleArn"));
} finally {
try {
if (created) {
cfn.deleteStack(request -> request.stackName(stackName));
}
} finally {
sns.deleteTopic(request -> request.topicArn(topic));
}
}
}
}

@Test
void filterPolicyAndRawDeliveryUpdateAndRemovalKeepSubscriptionIdentity() {
String suffix = UUID.randomUUID().toString();
String stackName = "sns-subscription-attributes-" + suffix;
try (CloudFormationClient cfn = AwsTestClients.create(
CloudFormationClient.builder(), "test", Region.US_EAST_1);
SnsClient sns = AwsTestClients.create(SnsClient.builder(), "test", Region.US_EAST_1)) {
String topic = sns.createTopic(request -> request.name("sns-attributes-" + suffix)).topicArn();
boolean created = false;
try {
cfn.createStack(request -> request.stackName(stackName)
.templateBody(attributeTemplate(topic, ",\"FilterPolicy\":{\"kind\":[\"created\"]}")));
created = true;
CfnStackWaits.awaitStatus(cfn, stackName, "CREATE_COMPLETE");
String arn = subscription(cfn, stackName);
assertEquals("{\"kind\":[\"created\"]}", sns.getSubscriptionAttributes(
request -> request.subscriptionArn(arn)).attributes().get("FilterPolicy"));

cfn.updateStack(request -> request.stackName(stackName).templateBody(attributeTemplate(topic,
",\"FilterPolicy\":{\"kind\":[\"updated\"]},\"RawMessageDelivery\":true")));
CfnStackWaits.awaitStatus(cfn, stackName, "UPDATE_COMPLETE");
assertEquals(arn, subscription(cfn, stackName));
assertEquals("{\"kind\":[\"updated\"]}", sns.getSubscriptionAttributes(
request -> request.subscriptionArn(arn)).attributes().get("FilterPolicy"));
assertEquals("true", sns.getSubscriptionAttributes(
request -> request.subscriptionArn(arn)).attributes().get("RawMessageDelivery"));
assertEquals(1, sns.listSubscriptionsByTopic(request -> request.topicArn(topic)).subscriptions().size());

cfn.updateStack(request -> request.stackName(stackName).templateBody(attributeTemplate(topic, "")));
CfnStackWaits.awaitStatus(cfn, stackName, "UPDATE_COMPLETE");
assertEquals(arn, subscription(cfn, stackName));
assertEquals("", sns.getSubscriptionAttributes(
request -> request.subscriptionArn(arn)).attributes().get("FilterPolicy"));
assertEquals("false", sns.getSubscriptionAttributes(
request -> request.subscriptionArn(arn)).attributes().get("RawMessageDelivery"));
} finally {
try {
if (created) {
cfn.deleteStack(request -> request.stackName(stackName));
}
} finally {
sns.deleteTopic(request -> request.topicArn(topic));
}
}
}
}

private static String attributeTemplate(String topic, String attributes) {
return """
{"Resources":{"Subscription":{"Type":"AWS::SNS::Subscription","Properties":{
"TopicArn":"%s","Protocol":"sqs",
"Endpoint":{"Fn::Sub":"arn:${AWS::Partition}:sqs:${AWS::Region}:${AWS::AccountId}:test"}%s
}}}}
""".formatted(topic, attributes);
}

private static String subscription(CloudFormationClient cfn, String stackName) {
return cfn.describeStackResource(request -> request.stackName(stackName).logicalResourceId("Subscription"))
.stackResourceDetail().physicalResourceId();
}

private static String template(String topic, String roleName) {
return """
{"Resources":{"Subscription":{"Type":"AWS::SNS::Subscription","Properties":{
"TopicArn":"%s","Protocol":"firehose",
"Endpoint":{"Fn::Sub":"arn:${AWS::Partition}:firehose:${AWS::Region}:${AWS::AccountId}:deliverystream/test"},
"SubscriptionRoleArn":{"Fn::Sub":"arn:${AWS::Partition}:iam::${AWS::AccountId}:role/%s"}
}}}}
""".formatted(topic, roleName);
}
}
Loading
Loading