diff --git a/src/main/java/com/netflix/simianarmy/basic/BasicChaosMonkeyContext.java b/src/main/java/com/netflix/simianarmy/basic/BasicChaosMonkeyContext.java index 296b12cb..f8f5038e 100644 --- a/src/main/java/com/netflix/simianarmy/basic/BasicChaosMonkeyContext.java +++ b/src/main/java/com/netflix/simianarmy/basic/BasicChaosMonkeyContext.java @@ -17,6 +17,8 @@ */ package com.netflix.simianarmy.basic; +import com.amazonaws.regions.Region; +import com.amazonaws.regions.Regions; import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient; import com.netflix.simianarmy.MonkeyConfiguration; import com.netflix.simianarmy.basic.chaos.BasicChaosEmailNotifier; @@ -51,7 +53,9 @@ public BasicChaosMonkeyContext() { setChaosCrawler(new ASGChaosCrawler(awsClient())); setChaosInstanceSelector(new BasicChaosInstanceSelector()); MonkeyConfiguration cfg = configuration(); - setChaosEmailNotifier(new BasicChaosEmailNotifier(cfg, new AmazonSimpleEmailServiceClient(), null)); + AmazonSimpleEmailServiceClient sesClient = new AmazonSimpleEmailServiceClient(); + sesClient.setRegion(Region.getRegion(Regions.fromName(region()))); + setChaosEmailNotifier(new BasicChaosEmailNotifier(cfg, sesClient, null)); } /** {@inheritDoc} */ diff --git a/src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java b/src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java index e08c9983..bedad458 100644 --- a/src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java +++ b/src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java @@ -17,6 +17,8 @@ // CHECKSTYLE IGNORE MagicNumberCheck package com.netflix.simianarmy.basic.conformity; +import com.amazonaws.regions.Region; +import com.amazonaws.regions.Regions; import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -162,6 +164,7 @@ public BasicConformityMonkeyContext() { clusterCrawler = new AWSClusterCrawler(regionToAwsClient, configuration()); sesClient = new AmazonSimpleEmailServiceClient(); + sesClient.setRegion(Region.getRegion(Regions.fromName(region()))); defaultEmail = configuration().getStrOrElse("simianarmy.conformity.notification.defaultEmail", null); ccEmails = StringUtils.split( configuration().getStrOrElse("simianarmy.conformity.notification.ccEmails", ""), ","); diff --git a/src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java b/src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java index f0860a7c..c6d4f47c 100644 --- a/src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java +++ b/src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java @@ -17,6 +17,8 @@ // CHECKSTYLE IGNORE MagicNumberCheck package com.netflix.simianarmy.basic.janitor; +import com.amazonaws.regions.Region; +import com.amazonaws.regions.Regions; import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient; import com.netflix.discovery.DiscoveryManager; import com.netflix.simianarmy.MonkeyCalendar; @@ -120,6 +122,7 @@ public BasicJanitorMonkeyContext() { janitorEmailBuilder = new BasicJanitorEmailBuilder(); sesClient = new AmazonSimpleEmailServiceClient(); + sesClient.setRegion(Region.getRegion(Regions.fromName(monkeyRegion))); defaultEmail = configuration().getStrOrElse("simianarmy.janitor.notification.defaultEmail", ""); ccEmails = StringUtils.split( configuration().getStrOrElse("simianarmy.janitor.notification.ccEmails", ""), ",");