Skip to content
This repository has been archived by the owner on Mar 4, 2021. It is now read-only.

replace hardcoded "owner" with property #212

Merged
merged 1 commit into from
Oct 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ private void updateInstanceToOwner(String region) {
LOGGER.info(String.format("Getting owners for all instances in region %s", region));

long startTime = DateTime.now().minusDays(LOOKBACK_DAYS).getMillis();
String url = String.format("%s/view/instances;_since=%d;state.name=running;tags.key=owner;"
String url = String.format("%1$s/view/instances;_since=%2$d;state.name=running;tags.key=%3$s;"
+ "_expand:(instanceId,tags:(key,value))",
eddaClient.getBaseUrl(region), startTime);
eddaClient.getBaseUrl(region), startTime, BasicSimianArmyContext.GLOBAL_OWNER_TAGKEY);
JsonNode jsonNode = null;
try {
jsonNode = eddaClient.getJsonNodeFromUrl(url);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private void refreshOwnerByImage(String region, List<Resource> resources) {
HashMap<String, String> imageToOwner = new HashMap<String, String>();
String url = eddaClient.getBaseUrl(region) + "/aws/images/";
url += StringUtils.join(imageIds, ',');
url += ";tags.key=owner;public=false;_expand:(imageId,tags:(owner))";
url += String.format(";tags.key=%1$s;public=false;_expand:(imageId,tags:(%1$s))", BasicSimianArmyContext.GLOBAL_OWNER_TAGKEY);
JsonNode imageJsonNode = null;
try {
imageJsonNode = eddaClient.getJsonNodeFromUrl(url);
Expand Down