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

Override SES client region with an optional property and a SimpleDB fix #202

Merged
merged 1 commit into from
Aug 18, 2015
Merged

Override SES client region with an optional property and a SimpleDB fix #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 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 @@ -17,6 +17,9 @@
*/
package com.netflix.simianarmy.basic;

import com.amazonaws.regions.RegionUtils;
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;
Expand Down Expand Up @@ -51,7 +54,11 @@ public BasicChaosMonkeyContext() {
setChaosCrawler(new ASGChaosCrawler(awsClient()));
setChaosInstanceSelector(new BasicChaosInstanceSelector());
MonkeyConfiguration cfg = configuration();
setChaosEmailNotifier(new BasicChaosEmailNotifier(cfg, new AmazonSimpleEmailServiceClient(), null));
AmazonSimpleEmailServiceClient sesClient = new AmazonSimpleEmailServiceClient();
if (configuration().getStr("simianarmy.aws.email.region") != null) {
sesClient.setRegion(Region.getRegion(Regions.fromName(configuration().getStr("simianarmy.aws.email.region"))));
}
setChaosEmailNotifier(new BasicChaosEmailNotifier(cfg, sesClient, null));
}

/** {@inheritDoc} */
Expand Down
5 changes: 5 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 @@ -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;
Expand Down Expand Up @@ -162,6 +164,9 @@ public BasicConformityMonkeyContext() {

clusterCrawler = new AWSClusterCrawler(regionToAwsClient, configuration());
sesClient = new AmazonSimpleEmailServiceClient();
if (configuration().getStr("simianarmy.aws.email.region") != null) {
sesClient.setRegion(Region.getRegion(Regions.fromName(configuration().getStr("simianarmy.aws.email.region"))));
}
defaultEmail = configuration().getStrOrElse("simianarmy.conformity.notification.defaultEmail", null);
ccEmails = StringUtils.split(
configuration().getStrOrElse("simianarmy.conformity.notification.ccEmails", ""), ",");
Expand Down
6 changes: 6 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 @@ -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;
Expand Down Expand Up @@ -60,6 +62,7 @@
import com.netflix.simianarmy.janitor.JanitorMonkey;
import com.netflix.simianarmy.janitor.JanitorResourceTracker;
import com.netflix.simianarmy.janitor.JanitorRuleEngine;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -120,6 +123,9 @@ public BasicJanitorMonkeyContext() {

janitorEmailBuilder = new BasicJanitorEmailBuilder();
sesClient = new AmazonSimpleEmailServiceClient();
if (configuration().getStr("simianarmy.aws.email.region") != null) {
sesClient.setRegion(Region.getRegion(Regions.fromName(configuration().getStr("simianarmy.aws.email.region"))));
}
defaultEmail = configuration().getStrOrElse("simianarmy.janitor.notification.defaultEmail", "");
ccEmails = StringUtils.split(
configuration().getStrOrElse("simianarmy.janitor.notification.ccEmails", ""), ",");
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/simianarmy.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ simianarmy.calendar.timezone = America/Los_Angeles
# Allows you to Set the (case sensitive) AWS Tag Key to use for owner tags; e.g. Owner or owner
# Will be Monkey Wide - used by all Monkeys. If not set defaults to "owner"
# simianarmy.tags.owner = Owner

# Region override for Amazon Simple Email Service Client
#simianarmy.aws.email.region=us-west-1