-
Notifications
You must be signed in to change notification settings - Fork 808
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(servergroup): allow ad-hoc entity tags on deployments (#1627)
- Loading branch information
1 parent
77ff216
commit be6e239
Showing
8 changed files
with
153 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
.../netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTask.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright 2017 Netflix, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup | ||
|
|
||
| import java.util.concurrent.TimeUnit | ||
| import com.fasterxml.jackson.annotation.JsonProperty | ||
| import com.netflix.spinnaker.orca.ExecutionStatus | ||
| import com.netflix.spinnaker.orca.RetryableTask | ||
| import com.netflix.spinnaker.orca.TaskResult | ||
| import com.netflix.spinnaker.orca.clouddriver.KatoService | ||
| import com.netflix.spinnaker.orca.clouddriver.model.TaskId | ||
| import com.netflix.spinnaker.orca.clouddriver.tasks.AbstractCloudProviderAwareTask | ||
| import com.netflix.spinnaker.orca.pipeline.model.Stage | ||
| import groovy.util.logging.Slf4j | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.stereotype.Component | ||
|
|
||
| @Component | ||
| @Slf4j | ||
| class AddServerGroupEntityTagsTask extends AbstractCloudProviderAwareTask implements RetryableTask { | ||
| long backoffPeriod = TimeUnit.SECONDS.toMillis(5) | ||
| long timeout = TimeUnit.MINUTES.toMillis(5) | ||
|
|
||
| @Autowired | ||
| KatoService kato | ||
|
|
||
| @Autowired | ||
| Collection<ServerGroupEntityTagGenerator> tagGenerators | ||
|
|
||
| @Override | ||
| TaskResult execute(Stage stage) { | ||
| try { | ||
| List<Map> tagOperations = buildTagOperations(stage) | ||
| if (!tagOperations) { | ||
| return new TaskResult(ExecutionStatus.SKIPPED) | ||
| } | ||
| TaskId taskId = kato.requestOperations(tagOperations).toBlocking().first() | ||
| return new TaskResult(ExecutionStatus.SUCCEEDED, new HashMap<String, Object>() { | ||
| { | ||
| put("notification.type", "upsertentitytags") | ||
| put("kato.last.task.id", taskId) | ||
| } | ||
| }) | ||
| } catch (Exception e) { | ||
| log.error("Failed to tag deployed server groups (stageId: ${stage.id}, executionId: ${stage.execution.id})", e) | ||
| return new TaskResult(ExecutionStatus.FAILED_CONTINUE) | ||
| } | ||
| } | ||
|
|
||
| private List<Map> buildTagOperations(Stage stage) { | ||
| 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() : [] | ||
| if (!tags) { | ||
| return [] | ||
| } | ||
| operations << | ||
| [ | ||
| "upsertEntityTags": [ | ||
| tags : tags, | ||
| entityRef: [ | ||
| entityType : "servergroup", | ||
| entityId : serverGroup, | ||
| account : getCredentials(stage), | ||
| region : region, | ||
| cloudProvider: getCloudProvider(stage) | ||
| ] | ||
| ] | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| return operations | ||
| } | ||
|
|
||
| static class StageData { | ||
| @JsonProperty("deploy.server.groups") | ||
| Map<String, Set<String>> deployServerGroups = [:] | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...innaker/orca/clouddriver/tasks/servergroup/ContextBasedServerGroupEntityTagGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright 2017 Netflix, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License") | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup; | ||
|
|
||
| import com.netflix.spinnaker.orca.pipeline.model.Stage; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| @Component | ||
| public class ContextBasedServerGroupEntityTagGenerator implements ServerGroupEntityTagGenerator { | ||
|
|
||
| @Override | ||
| public List<Map<String, Object>> generateTags(Stage stage) { | ||
| Map context = stage.getContext(); | ||
|
|
||
| if (context.containsKey("entityTags")) { | ||
| return (List<Map<String, Object>>) context.getOrDefault("entityTags", null); | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters