-
Notifications
You must be signed in to change notification settings - Fork 807
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(monitoredDeploy): Completed event should include details of succ…
…ess/failure (#3214) * feat(monitoredDeploy): Completed event should include details of success/failure * addressing comments * adding tests * Update orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTaskSpec.groovy Co-Authored-By: Mark Vulfson <markvu@live.com> * Update orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTask.java Co-Authored-By: Mark Vulfson <markvu@live.com> * removing null check
- Loading branch information
1 parent
871358f
commit 3483221
Showing
10 changed files
with
227 additions
and
23 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
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
173 changes: 173 additions & 0 deletions
173
...lix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTaskSpec.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,173 @@ | ||
| /* | ||
| * Copyright 2019 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.monitoreddeploy | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper | ||
| import com.netflix.spectator.api.NoopRegistry | ||
| import com.netflix.spinnaker.config.DeploymentMonitorDefinition | ||
| import com.netflix.spinnaker.config.DeploymentMonitorServiceProvider | ||
| import com.netflix.spinnaker.orca.ExecutionStatus | ||
| import com.netflix.spinnaker.orca.TaskResult | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.cluster.RollbackClusterStage | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.monitoreddeploy.NotifyDeployCompletedStage | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.CreateServerGroupStage | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.strategies.DeploymentMonitor | ||
| import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.strategies.MonitoredDeployStageData | ||
| import com.netflix.spinnaker.orca.deploymentmonitor.DeploymentMonitorService | ||
| import com.netflix.spinnaker.orca.deploymentmonitor.models.DeploymentCompletedRequest | ||
| import com.netflix.spinnaker.orca.pipeline.model.Execution | ||
| import com.netflix.spinnaker.orca.pipeline.model.Stage | ||
| import retrofit.client.Response | ||
| import spock.lang.Specification | ||
|
|
||
| import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.pipeline | ||
|
|
||
| class NotifyDeployCompletedTaskSpec extends Specification { | ||
| ObjectMapper mapper = new ObjectMapper() | ||
| Execution pipe = pipeline { | ||
| } | ||
|
|
||
| def "should indicate deployment success or failure when no rollback is performed"() { | ||
| given: | ||
| def monitorServiceStub = Stub(DeploymentMonitorService) { | ||
| notifyCompleted(_) >> { | ||
| return new Response("", 200, "OK", [], null) | ||
| } | ||
| } | ||
|
|
||
| def serviceProviderStub = Stub(DeploymentMonitorServiceProvider) { | ||
| getDefinitionById(_) >> { | ||
| def deploymentMonitor = new DeploymentMonitorDefinition() | ||
| deploymentMonitor.id = "LogMonitorId" | ||
| deploymentMonitor.name = "LogMonitor" | ||
| deploymentMonitor.failOnError = true | ||
| deploymentMonitor.service = monitorServiceStub | ||
|
|
||
| return deploymentMonitor | ||
| } | ||
| } | ||
|
|
||
| def task = new NotifyDeployCompletedTask(serviceProviderStub, new NoopRegistry()) | ||
|
|
||
| MonitoredDeployStageData stageData = new MonitoredDeployStageData() | ||
| stageData.deploymentMonitor = new DeploymentMonitor() | ||
| stageData.deploymentMonitor.id = "LogMonitorId" | ||
| stageData.application = pipe.application | ||
|
|
||
| def stage = new Stage(pipe, NotifyDeployCompletedStage.PIPELINE_CONFIG_TYPE, mapper.convertValue(stageData, Map)) | ||
| stage.context.put("hasDeploymentFailed", false) | ||
|
|
||
| when: | ||
| TaskResult result = task.execute(stage) | ||
|
|
||
| then: | ||
| monitorServiceStub.notifyCompleted({ | ||
| it != null | ||
| } as DeploymentCompletedRequest) >> { DeploymentCompletedRequest request -> | ||
| assert request.status == DeploymentCompletedRequest.DeploymentStatus.SUCCESS && | ||
| request.rollback == DeploymentCompletedRequest.DeploymentStatus.ROLLBACK_NOT_PERFORMED | ||
| new Response('', 200, 'OK', [], null) | ||
| } | ||
|
|
||
|
|
||
| when: 'deployment has failed' | ||
|
|
||
| stage.context.put("hasDeploymentFailed", true) | ||
| result = task.execute(stage) | ||
|
|
||
| then: | ||
| monitorServiceStub.notifyCompleted({ | ||
| it != null | ||
| } as DeploymentCompletedRequest) >> { DeploymentCompletedRequest request -> | ||
| assert request.status == DeploymentCompletedRequest.DeploymentStatus.FAILURE && | ||
| request.rollback == DeploymentCompletedRequest.DeploymentStatus.ROLLBACK_NOT_PERFORMED | ||
| new Response('', 200, 'OK', [], null) | ||
| } | ||
|
|
||
| result.status == ExecutionStatus.SUCCEEDED | ||
| } | ||
|
|
||
| def "rollback stage was initiated"() { | ||
| given: | ||
| def monitorServiceStub = Stub(DeploymentMonitorService) { | ||
|
|
||
| notifyCompleted(_) >> { | ||
| return new Response("", 200, "OK", [], null) | ||
| } | ||
| } | ||
|
|
||
| def serviceProviderStub = Stub(DeploymentMonitorServiceProvider) { | ||
| getDefinitionById(_) >> { | ||
| def deploymentMonitor = new DeploymentMonitorDefinition() | ||
| deploymentMonitor.id = "LogMonitorId" | ||
| deploymentMonitor.name = "LogMonitor" | ||
| deploymentMonitor.failOnError = true | ||
| deploymentMonitor.service = monitorServiceStub | ||
|
|
||
| return deploymentMonitor | ||
| } | ||
| } | ||
|
|
||
| def task = new NotifyDeployCompletedTask(serviceProviderStub, new NoopRegistry()) | ||
|
|
||
| MonitoredDeployStageData stageData = new MonitoredDeployStageData() | ||
| stageData.deploymentMonitor = new DeploymentMonitor() | ||
| stageData.deploymentMonitor.id = "LogMonitorId" | ||
| stageData.application = pipe.application | ||
|
|
||
|
|
||
| def notifyCompleteStage = new Stage(pipe, NotifyDeployCompletedStage.PIPELINE_CONFIG_TYPE, mapper.convertValue(stageData, Map)) | ||
| def rollbackStage = new Stage(pipe, RollbackClusterStage.PIPELINE_CONFIG_TYPE, mapper.convertValue(stageData, Map)) | ||
| def createServerGroupStage = new Stage(pipe, CreateServerGroupStage.PIPELINE_CONFIG_TYPE, mapper.convertValue(stageData, Map)) | ||
| rollbackStage.status = ExecutionStatus.SUCCEEDED | ||
|
|
||
| notifyCompleteStage.setParentStageId(createServerGroupStage.getId()) | ||
| rollbackStage.setParentStageId(createServerGroupStage.getId()) | ||
| pipe.stages.addAll([notifyCompleteStage, rollbackStage, createServerGroupStage]) | ||
|
|
||
|
|
||
| when: 'rollback was initiated and successful' | ||
| TaskResult result = task.execute(notifyCompleteStage) | ||
|
|
||
| then: | ||
|
|
||
| monitorServiceStub.notifyCompleted({ | ||
| it != null | ||
| } as DeploymentCompletedRequest) >> { DeploymentCompletedRequest request -> | ||
| assert request.rollback == DeploymentCompletedRequest.DeploymentStatus.SUCCESS | ||
| new Response('', 200, 'OK', [], null) | ||
| } | ||
|
|
||
| when: 'rollback was initiated and failed' | ||
|
|
||
| rollbackStage.status = ExecutionStatus.FAILED_CONTINUE | ||
| result = task.execute(notifyCompleteStage) | ||
|
|
||
| then: | ||
|
|
||
| monitorServiceStub.notifyCompleted({ | ||
| it != null | ||
| } as DeploymentCompletedRequest) >> { DeploymentCompletedRequest request -> | ||
| assert request.rollback == DeploymentCompletedRequest.DeploymentStatus.FAILURE | ||
| new Response('', 200, 'OK', [], null) | ||
| } | ||
|
|
||
| result.status == ExecutionStatus.SUCCEEDED | ||
| } | ||
| } | ||
|
|
||
|
|
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