这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

fixed SES client uses us-east-1 by default and SimpleDB cannot have dashes in name #177

Closed
wants to merge 2 commits into from
Closed

fixed SES client uses us-east-1 by default and SimpleDB cannot have dashes in name #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a32fe1
fix SES client always uses us-east-1
Mar 21, 2015
37dff45
fixed error with dashes in SimpleDB domain names
Mar 22, 2015
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
4 changes: 2 additions & 2 deletions src/main/java/com/netflix/simianarmy/aws/janitor/SimpleDBJanitorResourceTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public List<Resource> getResources(ResourceType resourceType, CleanupState state
Validate.notEmpty(resourceRegion);
List<Resource> resources = new ArrayList<Resource>();
StringBuilder query = new StringBuilder();
query.append(String.format("select * from %s where ", domain));
query.append(String.format("select * from `%s` where ", domain));
if (resourceType != null) {
query.append(String.format("resourceType='%s' and ", resourceType));
}
Expand Down Expand Up @@ -130,7 +130,7 @@ public List<Resource> getResources(ResourceType resourceType, CleanupState state
public Resource getResource(String resourceId) {
Validate.notEmpty(resourceId);
StringBuilder query = new StringBuilder();
query.append(String.format("select * from %s where resourceId = '%s'", domain, resourceId));
query.append(String.format("select * from `%s` where resourceId = '%s'", domain, resourceId));

LOGGER.debug(String.format("Query is '%s'", query));

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/netflix/simianarmy/basic/BasicChaosMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package com.netflix.simianarmy.basic;

import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.netflix.simianarmy.MonkeyConfiguration;
import com.netflix.simianarmy.basic.chaos.BasicChaosEmailNotifier;
import com.netflix.simianarmy.basic.chaos.BasicChaosInstanceSelector;
Expand Down Expand Up @@ -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} */
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/netflix/simianarmy/basic/conformity/BasicConformityMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package com.netflix.simianarmy.basic.conformity;

import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.netflix.discovery.DiscoveryClient;
Expand Down Expand Up @@ -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", ""), ",");
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/netflix/simianarmy/basic/janitor/BasicJanitorMonkeyContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package com.netflix.simianarmy.basic.janitor;

import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.netflix.discovery.DiscoveryManager;
import com.netflix.simianarmy.MonkeyCalendar;
import com.netflix.simianarmy.MonkeyConfiguration;
Expand Down Expand Up @@ -120,6 +122,7 @@ public BasicJanitorMonkeyContext() {

janitorEmailBuilder = new BasicJanitorEmailBuilder();
sesClient = new AmazonSimpleEmailServiceClient();
sesClient.setRegion(Region.getRegion(Regions.fromName(region())));
defaultEmail = configuration().getStrOrElse("simianarmy.janitor.notification.defaultEmail", "");
ccEmails = StringUtils.split(
configuration().getStrOrElse("simianarmy.janitor.notification.ccEmails", ""), ",");
Expand Down