Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(tag-generator): include server group coordinates in generate… #1634

Merged
merged 2 commits into from
Sep 20, 2017
Merged

refactor(tag-generator): include server group coordinates in generate… #1634

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
fc1eb72
refactor(tag-generator): include server group coordinates in generate…
anotherchrisberry Sep 20, 2017
ce4b211
Merge branch 'master' into tag-generator-refactor
anotherchrisberry Sep 20, 2017
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
6 changes: 5 additions & 1 deletion .../netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ class AddServerGroupEntityTagsTask extends AbstractCloudProviderAwareTask implem
def operations = []
((StageData) stage.mapTo(StageData)).deployServerGroups.each { String region, Set<String> serverGroups ->
serverGroups.each { String serverGroup ->
Collection<Map<String, Object>> tags = tagGenerators ? tagGenerators.findResults { it.generateTags(stage) }.flatten() : []
Collection<Map<String, Object>> tags = tagGenerators ?
tagGenerators.findResults {
it.generateTags(stage, serverGroup, getCredentials(stage), region, getCloudProvider(stage))
}.flatten() :
[]
if (!tags) {
return []
}
Expand Down
2 changes: 1 addition & 1 deletion ...innaker/orca/clouddriver/tasks/servergroup/ContextBasedServerGroupEntityTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
public class ContextBasedServerGroupEntityTagGenerator implements ServerGroupEntityTagGenerator {

@Override
public List<Map<String, Object>> generateTags(Stage stage) {
public List<Map<String, Object>> generateTags(Stage stage, String serverGroup, String account, String location, String cloudProvider) {
Map context = stage.getContext();

if (context.containsKey("entityTags")) {
Expand Down
2 changes: 1 addition & 1 deletion ...m/netflix/spinnaker/orca/clouddriver/tasks/servergroup/ServerGroupEntityTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ public interface ServerGroupEntityTagGenerator {
* @param stage the stage that performed the deployment
* @return a collection of maps representing tags to send to Clouddriver
*/
Collection<Map<String, Object>> generateTags(Stage stage);
Collection<Map<String, Object>> generateTags(Stage stage, String serverGroup, String account, String location, String cloudProvider);
}
2 changes: 1 addition & 1 deletion ...pinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
public class SpinnakerMetadataServerGroupTagGenerator implements ServerGroupEntityTagGenerator {

@Override
public Collection<Map<String, Object>> generateTags(Stage stage) {
public Collection<Map<String, Object>> generateTags(Stage stage, String serverGroup, String account, String location, String cloudProvider) {
Execution execution = stage.getExecution();
Map context = stage.getContext();

Expand Down