From 0098b135cf6a7683d2a57b80844b9bca498dcb93 Mon Sep 17 00:00:00 2001 From: Mark Vulfson Date: Mon, 16 Sep 2019 07:29:38 -0700 Subject: [PATCH] chore(monitored deploy): clean up naming broadcast -> notify (#3155) left over cleanup from the previous PR --- .../strategies/MonitoredDeployStrategy.groovy | 14 +++++++------- .../monitoreddeploy/NotifyDeployCompletedTask.java | 2 +- .../monitoreddeploy/NotifyDeployStartingTask.java | 2 +- .../EvaluateDeploymentHealthTaskSpec.groovy | 4 ++-- .../DeploymentMonitorService.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy index ddbef8e101..d3397d3a62 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy @@ -56,10 +56,10 @@ class MonitoredDeployStrategy implements Strategy { WaitStage waitStage @Autowired - NotifyDeployStartingStage broadcastDeployStartingStage + NotifyDeployStartingStage notifyDeployStartingStage @Autowired - NotifyDeployCompletedStage broadcastDeployCompletedStage + NotifyDeployCompletedStage notifyDeployCompletedStage @Autowired EvaluateDeploymentHealthStage evaluateDeploymentHealthStage @@ -181,15 +181,15 @@ class MonitoredDeployStrategy implements Strategy { } if (mdsd.deploymentMonitor.id) { - def broadcastDeployStartingStage = newStage( + def notifyDeployStartingStage = newStage( stage.execution, - broadcastDeployStartingStage.type, + this.notifyDeployStartingStage.type, "Notify monitored deploy starting", evalContext, stage, SyntheticStageOwner.STAGE_AFTER ) - stages << broadcastDeployStartingStage + stages << notifyDeployStartingStage } else { log.warn("No deployment monitor specified, all monitoring will be skipped") } @@ -304,8 +304,8 @@ class MonitoredDeployStrategy implements Strategy { if (mdsd.deploymentMonitor.id) { stages << newStage( stage.execution, - broadcastDeployCompletedStage.type, - "Broadcast Monitored Deployment Completed", + notifyDeployCompletedStage.type, + "Notify monitored deploy complete", evalContext, stage, SyntheticStageOwner.STAGE_AFTER diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTask.java index f14bf2e9b5..612cb2a6f4 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTask.java +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployCompletedTask.java @@ -39,7 +39,7 @@ public class NotifyDeployCompletedTask extends MonitoredDeployBaseTask { public @Nonnull TaskResult executeInternal() { // TODO(mvulfson): actually populate the request data DeploymentCompletedRequest request = new DeploymentCompletedRequest(stage); - monitorDefinition.getService().broadcastCompleted(request); + monitorDefinition.getService().notifyCompleted(request); return TaskResult.ofStatus(ExecutionStatus.SUCCEEDED); } diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployStartingTask.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployStartingTask.java index 185cd18011..1e0e26b313 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployStartingTask.java +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/NotifyDeployStartingTask.java @@ -43,7 +43,7 @@ public class NotifyDeployStartingTask extends MonitoredDeployBaseTask { @Override public @Nonnull TaskResult executeInternal() { RequestBase request = new RequestBase(stage); - EvaluateHealthResponse response = monitorDefinition.getService().broadcastStarting(request); + EvaluateHealthResponse response = monitorDefinition.getService().notifyStarting(request); sanitizeAndLogResponse(response); diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy index e67e52bdc3..31a36d700f 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/monitoreddeploy/EvaluateDeploymentHealthTaskSpec.groovy @@ -90,10 +90,10 @@ class EvaluateDeploymentHealthTaskSpec extends Specification { def "should handle bad responses from 3rd party monitor"() { given: def monitorServiceStub = Stub(DeploymentMonitorService) { -// broadcastStarting(_) >> { +// notifyStarting(_) >> { // } // -// broadcastCompleted(_) >> { +// notifyCompleted(_) >> { // } // evaluateHealth(_) >> { diff --git a/orca-deploymentmonitor/src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/DeploymentMonitorService.java b/orca-deploymentmonitor/src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/DeploymentMonitorService.java index 514c4583b6..e37a98ce83 100644 --- a/orca-deploymentmonitor/src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/DeploymentMonitorService.java +++ b/orca-deploymentmonitor/src/main/java/com/netflix/spinnaker/orca/deploymentmonitor/DeploymentMonitorService.java @@ -23,10 +23,10 @@ public interface DeploymentMonitorService { @POST("/deployment/starting") - EvaluateHealthResponse broadcastStarting(@Body RequestBase request); + EvaluateHealthResponse notifyStarting(@Body RequestBase request); @POST("/deployment/completed") - Response broadcastCompleted(@Body DeploymentCompletedRequest request); + Response notifyCompleted(@Body DeploymentCompletedRequest request); @POST("/deployment/evaluateHealth") EvaluateHealthResponse evaluateHealth(@Body EvaluateHealthRequest request);