fix(spring): Wire up force cancel command manually (spinnaker#2483)

clanesf · Dec 8, 2018 · a455cf1 · a455cf1
1 parent c2850c5
commit a455cf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/...re/src/main/java/com/netflix/spinnaker/orca/commands/ForceExecutionCancellationCommand.kt b/...re/src/main/java/com/netflix/spinnaker/orca/commands/ForceExecutionCancellationCommand.kt
@@ -20,7 +20,6 @@ import com.netflix.spinnaker.orca.ExecutionStatus.NOT_STARTED
 import com.netflix.spinnaker.orca.pipeline.model.Execution
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
 import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Component
 import java.time.Clock
 
 /**
@@ -29,7 +28,6 @@ import java.time.Clock
  *
  * TODO(rz): Fix zombies.
  */
-@Component
 class ForceExecutionCancellationCommand(
   private val executionRepository: ExecutionRepository,
   private val clock: Clock

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.kork.core.RetrySupport;
+import com.netflix.spinnaker.orca.commands.ForceExecutionCancellationCommand;
 import com.netflix.spinnaker.orca.events.ExecutionEvent;
 import com.netflix.spinnaker.orca.events.ExecutionListenerAdapter;
 import com.netflix.spinnaker.orca.exceptions.DefaultExceptionHandler;
@@ -177,4 +178,10 @@ public TaskScheduler taskScheduler() {
   public EventListenerFactory eventListenerFactory() {
     return new InspectableEventListenerFactory();
   }
+
+  @Bean
+  public ForceExecutionCancellationCommand forceExecutionCancellationCommand(ExecutionRepository executionRepository,
+                                                                             Clock clock) {
+    return new ForceExecutionCancellationCommand(executionRepository, clock);
+  }
 }
diff --git a/...t/groovy/com/netflix/spinnaker/orca/commands/ForceExecutionCancellationCommandSpec.groovy b/...t/groovy/com/netflix/spinnaker/orca/commands/ForceExecutionCancellationCommandSpec.groovy
@@ -15,7 +15,6 @@
  */
 package com.netflix.spinnaker.orca.commands
 
-import com.netflix.spinnaker.orca.ExecutionStatus
 import com.netflix.spinnaker.orca.pipeline.model.Task
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
 import spock.lang.Specification
@@ -24,10 +23,7 @@ import java.time.Clock
 import java.time.Instant
 import java.time.ZoneId
 
-import static com.netflix.spinnaker.orca.ExecutionStatus.CANCELED
-import static com.netflix.spinnaker.orca.ExecutionStatus.NOT_STARTED
-import static com.netflix.spinnaker.orca.ExecutionStatus.RUNNING
-import static com.netflix.spinnaker.orca.ExecutionStatus.SUCCEEDED
+import static com.netflix.spinnaker.orca.ExecutionStatus.*
 import static com.netflix.spinnaker.orca.pipeline.model.Execution.ExecutionType.PIPELINE
 import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.pipeline
 import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.stage
@@ -45,7 +41,7 @@ class ForceExecutionCancellationCommandSpec extends Specification {
       status = RUNNING
       stage {
         id = "s1"
-        status = ExecutionStatus.SUCCEEDED
+        status = SUCCEEDED
       }
       stage {
         id = "s2"
@@ -54,7 +50,7 @@ class ForceExecutionCancellationCommandSpec extends Specification {
       }
       stage {
         id = "s3"
-        status = ExecutionStatus.NOT_STARTED
+        status = NOT_STARTED
       }
     }