Light, fluffy, and always free - The AWS Local Emulator alternative
refactor(ses): retire the receipt-rule delegations from the SesService facade (#3618)
Kenshin Okinakac6b736ad6054
diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.javaindex 76b52c8f51..9735fe2e40 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesQueryHandler.java@@ -45,11 +45,16 @@ public class SesQueryHandler {private static final Logger LOG = Logger.getLogger(SesQueryHandler.class);private final SesService sesService;+ private final SesReceiptRuleService receiptRuleService;+ private final SesIdentityService identityService;private final ObjectMapper objectMapper;@Inject- public SesQueryHandler(SesService sesService, ObjectMapper objectMapper) {+ public SesQueryHandler(SesService sesService, SesReceiptRuleService receiptRuleService,+ SesIdentityService identityService, ObjectMapper objectMapper) {this.sesService = sesService;+ this.receiptRuleService = receiptRuleService;+ this.identityService = identityService;this.objectMapper = objectMapper;}@@ -986,13 +991,14 @@ public class SesQueryHandler {}private Response handleCreateReceiptRuleSet(MultivaluedMap<String, String> params, String region) {- sesService.createReceiptRuleSet(getParam(params, "RuleSetName"), region);+ receiptRuleService.createReceiptRuleSet(getParam(params, "RuleSetName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("CreateReceiptRuleSet", AwsNamespaces.SES)).build();}private Response handleDescribeReceiptRuleSet(MultivaluedMap<String, String> params, String region) {- ReceiptRuleSet ruleSet = sesService.describeReceiptRuleSet(getParam(params, "RuleSetName"), region);+ ReceiptRuleSet ruleSet = receiptRuleService.describeReceiptRuleSet(+ getParam(params, "RuleSetName"), region);XmlBuilder xml = new XmlBuilder();writeReceiptRuleSetMetadata(xml, ruleSet);writeReceiptRules(xml, ruleSet.getRules());@@ -1002,7 +1008,7 @@ public class SesQueryHandler {private Response handleListReceiptRuleSets(String region) {XmlBuilder xml = new XmlBuilder().start("RuleSets");- for (ReceiptRuleSet rs : sesService.listReceiptRuleSets(region)) {+ for (ReceiptRuleSet rs : receiptRuleService.listReceiptRuleSets(region)) {xml.start("member");writeReceiptRuleSetMetadataFields(xml, rs);xml.end("member");@@ -1013,20 +1019,20 @@ public class SesQueryHandler {}private Response handleDeleteReceiptRuleSet(MultivaluedMap<String, String> params, String region) {- sesService.deleteReceiptRuleSet(getParam(params, "RuleSetName"), region);+ receiptRuleService.deleteReceiptRuleSet(getParam(params, "RuleSetName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("DeleteReceiptRuleSet", AwsNamespaces.SES)).build();}private Response handleSetActiveReceiptRuleSet(MultivaluedMap<String, String> params, String region) {// RuleSetName is optional here: when absent, the account's active rule set is cleared.- sesService.setActiveReceiptRuleSet(getParam(params, "RuleSetName"), region);+ receiptRuleService.setActiveReceiptRuleSet(getParam(params, "RuleSetName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("SetActiveReceiptRuleSet", AwsNamespaces.SES)).build();}private Response handleDescribeActiveReceiptRuleSet(String region) {- ReceiptRuleSet active = sesService.describeActiveReceiptRuleSet(region);+ ReceiptRuleSet active = receiptRuleService.describeActiveReceiptRuleSet(region);XmlBuilder xml = new XmlBuilder();// When no rule set is active AWS returns an empty result (no Metadata element).if (active != null) {@@ -1038,7 +1044,7 @@ public class SesQueryHandler {}private Response handleReorderReceiptRuleSet(MultivaluedMap<String, String> params, String region) {- sesService.reorderReceiptRuleSet(getParam(params, "RuleSetName"),+ receiptRuleService.reorderReceiptRuleSet(getParam(params, "RuleSetName"),parseReorderRuleNames(params), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("ReorderReceiptRuleSet", AwsNamespaces.SES)).build();@@ -1100,21 +1106,24 @@ public class SesQueryHandler {}private Response handleCloneReceiptRuleSet(MultivaluedMap<String, String> params, String region) {- sesService.cloneReceiptRuleSet(getParam(params, "RuleSetName"),+ receiptRuleService.cloneReceiptRuleSet(getParam(params, "RuleSetName"),getParam(params, "OriginalRuleSetName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("CloneReceiptRuleSet", AwsNamespaces.SES)).build();}+ // The bounce-sender check needs identity state; the rule domain takes it as a predicate rather+ // than depending on SesIdentityService itself.private Response handleCreateReceiptRule(MultivaluedMap<String, String> params, String region) {- sesService.createReceiptRule(getParam(params, "RuleSetName"), parseReceiptRule(params),- getParam(params, "After"), region);+ receiptRuleService.createReceiptRule(getParam(params, "RuleSetName"),+ parseReceiptRule(params), getParam(params, "After"), region,+ sender -> identityService.isVerifiedSender(sender, region));return Response.ok(AwsQueryResponse.envelopeEmptyResult("CreateReceiptRule", AwsNamespaces.SES)).build();}private Response handleDescribeReceiptRule(MultivaluedMap<String, String> params, String region) {- ReceiptRule rule = sesService.describeReceiptRule(getParam(params, "RuleSetName"),+ ReceiptRule rule = receiptRuleService.describeReceiptRule(getParam(params, "RuleSetName"),getParam(params, "RuleName"), region);XmlBuilder xml = new XmlBuilder();writeReceiptRule(xml, rule, "Rule");@@ -1123,20 +1132,22 @@ public class SesQueryHandler {}private Response handleUpdateReceiptRule(MultivaluedMap<String, String> params, String region) {- sesService.updateReceiptRule(getParam(params, "RuleSetName"), parseReceiptRule(params), region);+ receiptRuleService.updateReceiptRule(getParam(params, "RuleSetName"),+ parseReceiptRule(params), region,+ sender -> identityService.isVerifiedSender(sender, region));return Response.ok(AwsQueryResponse.envelopeEmptyResult("UpdateReceiptRule", AwsNamespaces.SES)).build();}private Response handleDeleteReceiptRule(MultivaluedMap<String, String> params, String region) {- sesService.deleteReceiptRule(getParam(params, "RuleSetName"),+ receiptRuleService.deleteReceiptRule(getParam(params, "RuleSetName"),getParam(params, "RuleName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("DeleteReceiptRule", AwsNamespaces.SES)).build();}private Response handleSetReceiptRulePosition(MultivaluedMap<String, String> params, String region) {- sesService.setReceiptRulePosition(getParam(params, "RuleSetName"),+ receiptRuleService.setReceiptRulePosition(getParam(params, "RuleSetName"),getParam(params, "RuleName"), getParam(params, "After"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("SetReceiptRulePosition", AwsNamespaces.SES)).build();@@ -1290,14 +1301,14 @@ public class SesQueryHandler {// nested per-member ones, so the absent structure must stay distinguishable as null.ReceiptFilter filter = name == null && policy == null && cidr == null? null : new ReceiptFilter(name, policy, cidr);- sesService.createReceiptFilter(filter, region);+ receiptRuleService.createReceiptFilter(filter, region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("CreateReceiptFilter", AwsNamespaces.SES)).build();}private Response handleListReceiptFilters(String region) {XmlBuilder xml = new XmlBuilder().start("Filters");- for (ReceiptFilter filter : sesService.listReceiptFilters(region)) {+ for (ReceiptFilter filter : receiptRuleService.listReceiptFilters(region)) {xml.start("member");xml.elem("Name", filter.getName());xml.start("IpFilter");@@ -1312,7 +1323,7 @@ public class SesQueryHandler {}private Response handleDeleteReceiptFilter(MultivaluedMap<String, String> params, String region) {- sesService.deleteReceiptFilter(getParam(params, "FilterName"), region);+ receiptRuleService.deleteReceiptFilter(getParam(params, "FilterName"), region);return Response.ok(AwsQueryResponse.envelopeEmptyResult("DeleteReceiptFilter", AwsNamespaces.SES)).build();}diff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesReceiptRuleService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesReceiptRuleService.javaindex 84c50ac0c2..db9570aa4c 100644--- a/src/main/java/io/github/hectorvent/floci/services/ses/SesReceiptRuleService.java+++ b/src/main/java/io/github/hectorvent/floci/services/ses/SesReceiptRuleService.java@@ -27,10 +27,11 @@ import java.util.regex.Pattern;/*** Owns the SES inbound-mail management domain: receipt rule sets and their rules (the- * {@code receiptRuleSetStore}) and receipt IP filters (the {@code receiptFilterStore}). Extracted from {@link SesService} in the store-based domain split and reached only through- * that facade. Action-target validation couples this domain to {@link S3Service},- * {@link SnsService}, and {@link LambdaService}, reproducing the checks real SES runs against the- * account; the bounce-sender check arrives as a predicate the facade binds to+ * {@code receiptRuleSetStore}) and receipt IP filters (the {@code receiptFilterStore}). Extracted+ * from {@link SesService} in the store-based domain split; the v1 {@link SesQueryHandler} is its+ * only caller and reaches it directly. Action-target validation couples this domain to+ * {@link S3Service}, {@link SnsService}, and {@link LambdaService}, reproducing the checks real SES+ * runs against the account; the bounce-sender check arrives as a predicate the handler binds to* {@code SesIdentityService}, keeping identity resolution out of this class's dependencies.** <p>Floci has no inbound-mail endpoint, so everything here is stored inertly: stored rulesdiff --git a/src/main/java/io/github/hectorvent/floci/services/ses/SesService.java b/src/main/java/io/github/hectorvent/floci/services/ses/SesService.javaindex 43442f6b74..0a068bbf98 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@@ -23,9 +23,6 @@ import io.github.hectorvent.floci.services.ses.model.Identity;import io.github.hectorvent.floci.services.ses.model.ListManagementOptions;import io.github.hectorvent.floci.services.ses.model.MessageHeader;import io.github.hectorvent.floci.services.ses.model.MessageTag;-import io.github.hectorvent.floci.services.ses.model.ReceiptFilter;-import io.github.hectorvent.floci.services.ses.model.ReceiptRule;-import io.github.hectorvent.floci.services.ses.model.ReceiptRuleSet;import io.github.hectorvent.floci.services.ses.model.Topic;import io.github.hectorvent.floci.services.ses.model.TopicPreference;import io.github.hectorvent.floci.services.ses.model.TrackingOptions;@@ -92,8 +89,6 @@ public class SesService {// Identity (sending authorization) policy storage, extracted to SesPolicyService.// The facade keeps the identity-existence check and delegates the rest.private final SesPolicyService policyService;- // Receipt-rule-set domain, extracted to its own service. The facade delegates.- private final SesReceiptRuleService receiptRuleService;// Custom verification email templates: storage extracted to SesCvetService. The// facade keeps the identity-dependent validation and the send path; the service owns the store.private final SesCvetService cvetService;@@ -110,8 +105,8 @@ public class SesService {private final RegionResolver regionResolver;@Inject- public SesService(SesIdentityService identityService, SesReceiptRuleService receiptRuleService,- SesAccountService accountService, SesCvetService cvetService,+ public SesService(SesIdentityService identityService, SesAccountService accountService,+ SesCvetService cvetService,SesPolicyService policyService, SesContactService contactService,SesSuppressionService suppressionService, SesDedicatedIpService dedicatedIpService,SesTemplateService templateService, SesSentEmailService sentEmailService,@@ -128,7 +123,6 @@ public class SesService {this.dedicatedIpService = dedicatedIpService;this.contactService = contactService;this.policyService = policyService;- this.receiptRuleService = receiptRuleService;this.cvetService = cvetService;this.tenantService = tenantService;this.smtpRelay = smtpRelay;@@ -147,7 +141,6 @@ public class SesService {SesDedicatedIpService dedicatedIpService,SesContactService contactService,SesPolicyService policyService,- SesReceiptRuleService receiptRuleService,SesCvetService cvetService,SesTenantService tenantService,SmtpRelay smtpRelay) {@@ -160,7 +153,6 @@ public class SesService {this.dedicatedIpService = dedicatedIpService;this.contactService = contactService;this.policyService = policyService;- this.receiptRuleService = receiptRuleService;this.cvetService = cvetService;this.tenantService = tenantService;this.smtpRelay = smtpRelay;@@ -1160,81 +1152,6 @@ public class SesService {throw new AwsException("NotFoundException", message, 404);}-- // ──────────────────────── Receipt rule sets (inbound) ────────────────────────- //- // Receipt rule sets live in SesReceiptRuleService; this facade- // just forwards, keeping the v1 SesQueryHandler call sites unchanged.-- public ReceiptRuleSet createReceiptRuleSet(String name, String region) {- return receiptRuleService.createReceiptRuleSet(name, region);- }-- public ReceiptRuleSet describeReceiptRuleSet(String name, String region) {- return receiptRuleService.describeReceiptRuleSet(name, region);- }-- public List<ReceiptRuleSet> listReceiptRuleSets(String region) {- return receiptRuleService.listReceiptRuleSets(region);- }-- public void deleteReceiptRuleSet(String name, String region) {- receiptRuleService.deleteReceiptRuleSet(name, region);- }-- public void setActiveReceiptRuleSet(String name, String region) {- receiptRuleService.setActiveReceiptRuleSet(name, region);- }-- public ReceiptRuleSet describeActiveReceiptRuleSet(String region) {- return receiptRuleService.describeActiveReceiptRuleSet(region);- }-- public void reorderReceiptRuleSet(String ruleSetName, List<String> ruleNames, String region) {- receiptRuleService.reorderReceiptRuleSet(ruleSetName, ruleNames, region);- }-- public ReceiptRuleSet cloneReceiptRuleSet(String ruleSetName, String originalRuleSetName, String region) {- return receiptRuleService.cloneReceiptRuleSet(ruleSetName, originalRuleSetName, region);- }-- // The bounce-sender check needs identity state; the rule domain receives it as a predicate- // bound here, keeping SesIdentityService out of its constructor surface.-- public void createReceiptRule(String ruleSetName, ReceiptRule rule, String after, String region) {- receiptRuleService.createReceiptRule(ruleSetName, rule, after, region,- sender -> identityService.isVerifiedSender(sender, region));- }-- public ReceiptRule describeReceiptRule(String ruleSetName, String ruleName, String region) {- return receiptRuleService.describeReceiptRule(ruleSetName, ruleName, region);- }-- public void updateReceiptRule(String ruleSetName, ReceiptRule rule, String region) {- receiptRuleService.updateReceiptRule(ruleSetName, rule, region,- sender -> identityService.isVerifiedSender(sender, region));- }-- public void deleteReceiptRule(String ruleSetName, String ruleName, String region) {- receiptRuleService.deleteReceiptRule(ruleSetName, ruleName, region);- }-- public void setReceiptRulePosition(String ruleSetName, String ruleName, String after, String region) {- receiptRuleService.setReceiptRulePosition(ruleSetName, ruleName, after, region);- }-- public void createReceiptFilter(ReceiptFilter filter, String region) {- receiptRuleService.createReceiptFilter(filter, region);- }-- public List<ReceiptFilter> listReceiptFilters(String region) {- return receiptRuleService.listReceiptFilters(region);- }-- public void deleteReceiptFilter(String filterName, String region) {- receiptRuleService.deleteReceiptFilter(filterName, region);- }-// ──────────────────────── Dedicated IP Pools ────────────────────────// Storage lives in SesDedicatedIpService; the facade forwards.diff --git a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.javaindex fb47deb7c0..67639361a9 100644--- a/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java+++ b/src/test/java/io/github/hectorvent/floci/services/ses/SesServiceTestBuilder.java@@ -2,9 +2,6 @@ package io.github.hectorvent.floci.services.ses;import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.core.storage.InMemoryStorage;-import io.github.hectorvent.floci.services.lambda.LambdaService;-import io.github.hectorvent.floci.services.s3.S3Service;-import io.github.hectorvent.floci.services.sns.SnsService;import io.github.hectorvent.floci.services.ses.model.AccountDetails;import io.github.hectorvent.floci.services.ses.model.AccountSuppressionAttributes;import io.github.hectorvent.floci.services.ses.model.AccountVdmAttributes;@@ -15,7 +12,6 @@ import io.github.hectorvent.floci.services.ses.model.CustomVerificationEmailTempimport io.github.hectorvent.floci.services.ses.model.DedicatedIpPool;import io.github.hectorvent.floci.services.ses.model.EmailTemplate;import io.github.hectorvent.floci.services.ses.model.Identity;-import io.github.hectorvent.floci.services.ses.model.ReceiptRuleSet;import io.github.hectorvent.floci.services.ses.model.SentEmail;import io.github.hectorvent.floci.services.ses.model.SuppressedDestination;import io.github.hectorvent.floci.services.ses.model.Tenant;@@ -49,7 +45,6 @@ final class SesServiceTestBuilder {private final InMemoryStorage<String, ContactList> contactListStore = new InMemoryStorage<>();private final InMemoryStorage<String, Contact> contactStore = new InMemoryStorage<>();private final InMemoryStorage<String, String> policyStore = new InMemoryStorage<>();- private final InMemoryStorage<String, ReceiptRuleSet> receiptRuleStore = new InMemoryStorage<>();private final InMemoryStorage<String, CustomVerificationEmailTemplate> cvetStore = new InMemoryStorage<>();private final InMemoryStorage<String, Tenant> tenantStore = new InMemoryStorage<>();private final InMemoryStorage<String, TenantResourceAssociation> tenantAssociationStore =@@ -128,8 +123,6 @@ final class SesServiceTestBuilder {new SesDedicatedIpService(dedicatedIpPoolStore),new SesContactService(contactListStore, contactStore, clock),new SesPolicyService(policyStore, objectMapper),- new SesReceiptRuleService(receiptRuleStore, new InMemoryStorage<>(), mock(S3Service.class),- mock(SnsService.class), mock(LambdaService.class), clock),new SesCvetService(cvetStore),new SesTenantService(tenantStore, tenantAssociationStore, clock, new SecureRandom()),smtpRelay);