Skip to content

armgit / floci

Public Imported from GitHub
0

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

feat(ses): extend tag endpoints to v2 EmailIdentity ARNs (#760)

Kenshin Okinakabcc36c08e0ba
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java
index bc94950e6b..e068d88607 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java
@@ -10,10 +10,14 @@ import org.junit.jupiter.api.TestMethodOrder;
import software.amazon.awssdk.services.sesv2.SesV2Client;
import software.amazon.awssdk.services.sesv2.model.CreateConfigurationSetRequest;
+import software.amazon.awssdk.services.sesv2.model.CreateEmailIdentityRequest;
import software.amazon.awssdk.services.sesv2.model.CreateEmailTemplateRequest;
import software.amazon.awssdk.services.sesv2.model.DeleteConfigurationSetRequest;
+import software.amazon.awssdk.services.sesv2.model.DeleteEmailIdentityRequest;
import software.amazon.awssdk.services.sesv2.model.DeleteEmailTemplateRequest;
import software.amazon.awssdk.services.sesv2.model.EmailTemplateContent;
+import software.amazon.awssdk.services.sesv2.model.GetEmailIdentityRequest;
+import software.amazon.awssdk.services.sesv2.model.GetEmailIdentityResponse;
import software.amazon.awssdk.services.sesv2.model.GetEmailTemplateRequest;
import software.amazon.awssdk.services.sesv2.model.GetEmailTemplateResponse;
import software.amazon.awssdk.services.sesv2.model.ListTagsForResourceRequest;
@@ -37,6 +41,8 @@ class SesTagResourceTest {
private static String configSetArn;
private static String templateName;
private static String templateArn;
+ private static String identityValue;
+ private static String identityArn;
@BeforeAll
static void setup() {
@@ -46,6 +52,8 @@ class SesTagResourceTest {
configSetArn = "arn:aws:ses:us-east-1:000000000000:configuration-set/" + configSetName;
templateName = "sdk-tag-tpl-" + suffix;
templateArn = "arn:aws:ses:us-east-1:000000000000:template/" + templateName;
+ identityValue = "sdk-tag-id-" + suffix + "@example.com";
+ identityArn = "arn:aws:ses:us-east-1:000000000000:identity/" + identityValue;
sesV2.createConfigurationSet(CreateConfigurationSetRequest.builder()
.configurationSetName(configSetName)
@@ -63,6 +71,10 @@ class SesTagResourceTest {
sesV2.deleteEmailTemplate(DeleteEmailTemplateRequest.builder()
.templateName(templateName).build());
} catch (Exception ignored) {}
+ try {
+ sesV2.deleteEmailIdentity(DeleteEmailIdentityRequest.builder()
+ .emailIdentity(identityValue).build());
+ } catch (Exception ignored) {}
sesV2.close();
}
}
@@ -189,4 +201,48 @@ class SesTagResourceTest {
assertThat(afterUntag.tags()).hasSize(1);
assertThat(afterUntag.tags().get(0).key()).isEqualTo("owner");
}
+
+ @Test
+ @Order(20)
+ void emailIdentity_createWithTags_visibleViaListTagsAndGet() {
+ sesV2.createEmailIdentity(CreateEmailIdentityRequest.builder()
+ .emailIdentity(identityValue)
+ .tags(
+ Tag.builder().key("env").value("dev").build(),
+ Tag.builder().key("team").value("platform").build())
+ .build());
+
+ ListTagsForResourceResponse listed = sesV2.listTagsForResource(ListTagsForResourceRequest.builder()
+ .resourceArn(identityArn).build());
+ assertThat(listed.tags()).hasSize(2);
+
+ GetEmailIdentityResponse got = sesV2.getEmailIdentity(GetEmailIdentityRequest.builder()
+ .emailIdentity(identityValue).build());
+ assertThat(got.tags())
+ .extracting(Tag::key)
+ .containsExactlyInAnyOrder("env", "team");
+ }
+
+ @Test
+ @Order(21)
+ void emailIdentity_tagAndUntag_lifecycle() {
+ sesV2.tagResource(TagResourceRequest.builder()
+ .resourceArn(identityArn)
+ .tags(Tag.builder().key("owner").value("alice").build())
+ .build());
+
+ ListTagsForResourceResponse afterTag = sesV2.listTagsForResource(ListTagsForResourceRequest.builder()
+ .resourceArn(identityArn).build());
+ assertThat(afterTag.tags()).hasSize(3);
+
+ sesV2.untagResource(UntagResourceRequest.builder()
+ .resourceArn(identityArn)
+ .tagKeys("env", "team")
+ .build());
+
+ ListTagsForResourceResponse afterUntag = sesV2.listTagsForResource(ListTagsForResourceRequest.builder()
+ .resourceArn(identityArn).build());
+ assertThat(afterUntag.tags()).hasSize(1);
+ assertThat(afterUntag.tags().get(0).key()).isEqualTo("owner");
+ }
}
diff --git a/docs/services/ses.md b/docs/services/ses.md
index c8b820cce9..d0af55d420 100644
--- a/docs/services/ses.md
+++ b/docs/services/ses.md
@@ -200,6 +200,6 @@ Alongside the classic Query API, Floci implements a subset of the SES v2 REST JS
| `DELETE` | `/v2/email/tags?ResourceArn=...&TagKeys=...` | `UntagResource` |
| `GET` | `/v2/email/tags?ResourceArn=...` | `ListTagsForResource` |
-Tag operations currently support `arn:aws:ses:<region>:<account>:configuration-set/<name>` and `arn:aws:ses:<region>:<account>:template/<name>` ARNs. Tags supplied to `CreateConfigurationSet` and `CreateEmailTemplate` are reachable through `ListTagsForResource`; `UpdateEmailTemplate` does not modify tags. Other resource types return `NotFoundException`.
+Tag operations support these ARN forms: `arn:aws:ses:<region>:<account>:configuration-set/<name>`, `arn:aws:ses:<region>:<account>:template/<name>`, and `arn:aws:ses:<region>:<account>:identity/<email-or-domain>`. Tags supplied to `CreateConfigurationSet`, `CreateEmailTemplate`, and `CreateEmailIdentity` are reachable through `ListTagsForResource`; `UpdateEmailTemplate` does not modify tags. Other resource types return `NotFoundException`.
Identity, template, configuration-set, and sent-message state is shared between the v1 Query API and the v2 REST JSON API, so a template created with `CreateTemplate` resolves through `SendEmail` on v2 (and vice versa), a configuration set created with `CreateConfigurationSet` is visible to both `DescribeConfigurationSet` (v1) and `GetConfigurationSet` (v2), and every send appears in the same `GET /_aws/ses` inspection mailbox.
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
index 2e5ef6e59d..dd03a564f0 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesController.java
@@ -83,6 +83,11 @@ public class SesController {
? sesService.verifyEmailIdentity(emailIdentity, region)
: sesService.verifyDomainIdentity(emailIdentity, region);
+ List<Tag> parsedTags = parseTagsArray(request.path("Tags"));
+ if (parsedTags != null) {
+ sesService.setIdentityTags(emailIdentity, region, parsedTags);
+ }
+
ObjectNode result = objectMapper.createObjectNode();
result.put("IdentityType", toV2IdentityType(identity.getIdentityType()));
result.put("VerifiedForSendingStatus", true);
@@ -773,7 +778,13 @@ public class SesController {
v1BehaviorToV2(identity.getBehaviorOnMxFailure()));
result.putObject("Policies");
- result.putArray("Tags");
+ ArrayNode tags = result.putArray("Tags");
+ for (Tag t : identity.getTags()) {
+ ObjectNode tagNode = objectMapper.createObjectNode();
+ tagNode.put("Key", t.key());
+ tagNode.put("Value", t.value());
+ tags.add(tagNode);
+ }
return result;
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
index 803a82b7a0..b78d22b7de 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java
@@ -490,10 +490,11 @@ public class SesService {
ResourceRef ref = parseSesArn(arn);
return switch (ref.type()) {
case "configuration-set" -> listConfigurationSetTags(ref.name(), ref.region());
- // AWS ListTagsForResource on template ARNs uses the signing region for lookup
- // (the ARN region is effectively ignored), unlike configuration-set which routes
- // by the ARN's region.
+ // AWS ListTagsForResource on template / identity ARNs uses the signing region
+ // for lookup (the ARN region is effectively ignored), unlike configuration-set
+ // which routes by the ARN's region.
case "template" -> listEmailTemplateTags(ref.name(), region);
+ case "identity" -> listIdentityTags(ref.name(), region);
default -> throw new AwsException("NotFoundException",
"Resource " + arn + " was not found.", 404);
};
@@ -515,6 +516,7 @@ public class SesService {
switch (ref.type()) {
case "configuration-set" -> tagConfigurationSet(ref.name(), ref.region(), newTags);
case "template" -> tagEmailTemplate(ref.name(), ref.region(), newTags);
+ case "identity" -> tagIdentity(ref.name(), ref.region(), newTags);
default -> throw new AwsException("NotFoundException",
"Resource " + arn + " was not found.", 404);
}
@@ -530,14 +532,21 @@ public class SesService {
switch (ref.type()) {
case "configuration-set" -> untagConfigurationSet(ref.name(), ref.region(), tagKeys);
case "template" -> {
- // AWS UntagResource on template ARNs strictly requires the ARN region to match
- // the signing region (rejects mismatch with BadRequestException), unlike
- // configuration-set which routes the lookup to the ARN's region.
+ // AWS UntagResource on template / identity ARNs strictly requires the ARN
+ // region to match the signing region (rejects mismatch with
+ // BadRequestException), unlike configuration-set which routes the lookup
+ // to the ARN's region.
if (!ref.region().equals(region)) {
throw new AwsException("BadRequestException", "Failed to untag resource", 400);
}
untagEmailTemplate(ref.name(), region, tagKeys);
}
+ case "identity" -> {
+ if (!ref.region().equals(region)) {
+ throw new AwsException("BadRequestException", "Failed to untag resource", 400);
+ }
+ untagIdentity(ref.name(), region, tagKeys);
+ }
default -> throw new AwsException("NotFoundException",
"Resource " + arn + " was not found.", 404);
}
@@ -602,6 +611,48 @@ public class SesService {
return out;
}
+ private List<Tag> listIdentityTags(String identityValue, String region) {
+ Identity identity = identityStore.get(identityKey(region, identityValue))
+ .orElseThrow(() -> new AwsException("NotFoundException",
+ "No EmailIdentity present with name: " + identityValue, 404));
+ return new ArrayList<>(identity.getTags());
+ }
+
+ private void tagIdentity(String identityValue, String region, List<Tag> newTags) {
+ String key = identityKey(region, identityValue);
+ Identity identity = identityStore.get(key)
+ .orElseThrow(() -> new AwsException("NotFoundException",
+ "No EmailIdentity present with name: " + identityValue, 404));
+ identity.setTags(mergeTags(identity.getTags(), newTags));
+ identityStore.put(key, identity);
+ LOG.infov("Tagged SES identity: {0} (region {1}, +{2} tags)", identityValue, region, newTags.size());
+ }
+
+ private void untagIdentity(String identityValue, String region, List<String> tagKeys) {
+ String key = identityKey(region, identityValue);
+ Identity identity = identityStore.get(key)
+ .orElseThrow(() -> new AwsException("NotFoundException",
+ "No EmailIdentity present with name: " + identityValue, 404));
+ Set<String> toRemove = new HashSet<>(tagKeys);
+ identity.getTags().removeIf(t -> toRemove.contains(t.key()));
+ identityStore.put(key, identity);
+ LOG.infov("Untagged SES identity: {0} (region {1}, -{2} keys)", identityValue, region, tagKeys.size());
+ }
+
+ public void setIdentityTags(String identityValue, String region, List<Tag> tags) {
+ if (tags != null) {
+ for (Tag tag : tags) {
+ validateTag(tag);
+ }
+ }
+ String key = identityKey(region, identityValue);
+ Identity identity = identityStore.get(key)
+ .orElseThrow(() -> new AwsException("NotFoundException",
+ "No EmailIdentity present with name: " + identityValue, 404));
+ identity.setTags(tags);
+ identityStore.put(key, identity);
+ }
+
private void untagEmailTemplate(String name, String region, List<String> tagKeys) {
String key = templateKey(region, name);
EmailTemplate template = templateStore.get(key)
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/model/Identity.java b/src/main/java/io/github/hectorvent/floci/services/ses/model/Identity.java
index 3852122509..107adfc444 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ses/model/Identity.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ses/model/Identity.java
@@ -5,7 +5,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import io.quarkus.runtime.annotations.RegisterForReflection;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@RegisterForReflection
@@ -51,6 +53,9 @@ public class Identity {
@JsonProperty("CreatedAt")
private Instant createdAt;
+ @JsonProperty("Tags")
+ private List<Tag> tags = new ArrayList<>();
+
public Identity() {}
public Identity(String identity, String identityType) {
@@ -101,4 +106,7 @@ public class Identity {
public Instant getCreatedAt() { return createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
+
+ public List<Tag> getTags() { return tags; }
+ public void setTags(List<Tag> tags) { this.tags = tags != null ? tags : new ArrayList<>(); }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesTagsV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesTagsV2IntegrationTest.java
index 9c59c4e3af..ab9df0b659 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesTagsV2IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesTagsV2IntegrationTest.java
@@ -407,4 +407,127 @@ class SesTagsV2IntegrationTest {
.body("Tags[0].Key", equalTo("owner"))
.body("Tags[0].Value", equalTo("alice"));
}
+
+ @Test
+ @Order(16)
+ void tags_lifecycle_onEmailIdentity() {
+ // Seed: create an email identity we can tag against
+ given()
+ .contentType("application/json")
+ .header("Authorization", AUTH_HEADER)
+ .body("""
+ {"EmailIdentity": "[email protected]"}
+ """)
+ .when()
+ .post("/v2/email/identities")
+ .then()
+ .statusCode(200);
+
+ String arn = "arn:aws:ses:us-east-1:000000000000:identity/[email protected]";
+
+ // Initially empty
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .when()
+ .get("/v2/email/tags")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(0));
+
+ // Tag it
+ given()
+ .contentType("application/json")
+ .header("Authorization", AUTH_HEADER)
+ .body("""
+ {"ResourceArn": "%s", "Tags": [
+ {"Key": "env", "Value": "stg"},
+ {"Key": "owner", "Value": "alice"}
+ ]}
+ """.formatted(arn))
+ .when()
+ .post("/v2/email/tags")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .when()
+ .get("/v2/email/tags")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(2));
+
+ // Untag a key
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .queryParam("TagKeys", "env")
+ .when()
+ .delete("/v2/email/tags")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .when()
+ .get("/v2/email/tags")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(1))
+ .body("Tags[0].Key", equalTo("owner"));
+ }
+
+ @Test
+ @Order(17)
+ void tagResource_unknownEmailIdentity_returns404() {
+ String arn = "arn:aws:ses:us-east-1:000000000000:identity/[email protected]";
+ given()
+ .contentType("application/json")
+ .header("Authorization", AUTH_HEADER)
+ .body("""
+ {"ResourceArn": "%s", "Tags": [{"Key": "env", "Value": "dev"}]}
+ """.formatted(arn))
+ .when()
+ .post("/v2/email/tags")
+ .then()
+ .statusCode(404)
+ .body(containsString("No EmailIdentity present with name: [email protected]"));
+ }
+
+ @Test
+ @Order(18)
+ void untagResource_identity_arnRegionMismatch_returns400() {
+ // Identity follows the same strict region check as templates for UntagResource.
+ String arn = "arn:aws:ses:eu-west-1:000000000000:identity/[email protected]";
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .queryParam("TagKeys", "k")
+ .when()
+ .delete("/v2/email/tags")
+ .then()
+ .statusCode(400)
+ .body(containsString("Failed to untag resource"));
+ }
+
+ @Test
+ @Order(19)
+ void listTagsForResource_identity_arnRegionIgnored_usesSigningRegion() {
+ // tag-id-1 lives in us-east-1 and was left with a single "owner=alice" tag by
+ // the lifecycle case at @Order(16); an eu-west-1 ARN must still surface it.
+ String arn = "arn:aws:ses:eu-west-1:000000000000:identity/[email protected]";
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .when()
+ .get("/v2/email/tags")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(1))
+ .body("Tags[0].Key", equalTo("owner"))
+ .body("Tags[0].Value", equalTo("alice"));
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesV2IntegrationTest.java
index 652469de9d..f1f0f3e391 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesV2IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesV2IntegrationTest.java
@@ -329,6 +329,49 @@ class SesV2IntegrationTest {
.body("message", containsString("leading or trailing whitespace"));
}
+ @Test
+ @Order(15)
+ void createEmailIdentity_withTags_visibleViaGetAndListTags() {
+ // Tags supplied to CreateEmailIdentity must round-trip through GetEmailIdentity
+ // and ListTagsForResource (template/configuration-set behaviour parallel).
+ given()
+ .contentType("application/json")
+ .header("Authorization", AUTH_HEADER)
+ .body("""
+ {
+ "EmailIdentity": "v2-tag-roundtrip.floci.test",
+ "Tags": [
+ {"Key": "team", "Value": "platform"},
+ {"Key": "env", "Value": "stg"}
+ ]
+ }
+ """)
+ .when()
+ .post("/v2/email/identities")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .get("/v2/email/identities/v2-tag-roundtrip.floci.test")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(2))
+ .body("Tags.find { it.Key == 'team' }.Value", equalTo("platform"))
+ .body("Tags.find { it.Key == 'env' }.Value", equalTo("stg"));
+
+ String arn = "arn:aws:ses:us-east-1:000000000000:identity/v2-tag-roundtrip.floci.test";
+ given()
+ .header("Authorization", AUTH_HEADER)
+ .queryParam("ResourceArn", arn)
+ .when()
+ .get("/v2/email/tags")
+ .then()
+ .statusCode(200)
+ .body("Tags", hasSize(2));
+ }
+
// ──────────────── DKIM Attributes ────────────────
@Test