From bc6c062644c860e1d9e2037331c73006f75b7061 Mon Sep 17 00:00:00 2001 From: Adam Jordens Date: Thu, 16 Nov 2017 20:02:22 -0800 Subject: [PATCH] chore(core): Use `RetrySupport` from `kork-exceptions` (#1807) --- build.gradle | 2 +- .../rollback/PreviousImageRollback.groovy | 2 +- .../support/TargetServerGroupResolver.groovy | 2 +- .../tasks/job/WaitOnJobCompletion.groovy | 2 +- .../AbstractServerGroupTask.groovy | 2 +- ...nnakerMetadataServerGroupTagGenerator.java | 2 +- .../rollback/PreviousImageRollbackSpec.groovy | 2 +- .../TargetServerGroupResolverSpec.groovy | 2 +- .../AbstractServerGroupTaskSpec.groovy | 2 +- .../AddServerGroupEntityTagsTaskSpec.groovy | 2 +- .../DestroyServerGroupTaskSpec.groovy | 2 +- ...MetadataServerGroupTagGeneratorSpec.groovy | 2 +- .../support/SourceResolverSpec.groovy | 2 +- .../netflix/spinnaker/orca/RetrySupport.java | 49 ------------ .../orca/config/OrcaConfiguration.java | 2 +- .../spinnaker/orca/RetrySupportSpec.groovy | 79 ------------------- .../FastPropertyCleanupListener.groovy | 4 +- .../tasks/PropertyChangeCleanupSpec.groovy | 2 +- .../orca/mine/pipeline/CanaryStage.groovy | 2 +- .../orca/mine/pipeline/CanaryStageSpec.groovy | 2 +- 20 files changed, 19 insertions(+), 147 deletions(-) delete mode 100644 orca-core/src/main/groovy/com/netflix/spinnaker/orca/RetrySupport.java delete mode 100644 orca-core/src/test/groovy/com/netflix/spinnaker/orca/RetrySupportSpec.groovy diff --git a/build.gradle b/build.gradle index 72ac3bf2c0..21547255a2 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ allprojects { group = "com.netflix.spinnaker.orca" ext { - spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.122.0' + spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.123.0' } def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion] diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollback.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollback.groovy index 8a150c7a57..55002c4357 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollback.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollback.groovy @@ -18,7 +18,7 @@ package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.rollback import com.fasterxml.jackson.annotation.JsonIgnore import com.netflix.frigga.Names -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.CloneServerGroupStage import com.netflix.spinnaker.orca.pipeline.model.Stage diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolver.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolver.groovy index f1be56f269..cd995424da 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolver.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolver.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import groovy.util.logging.Slf4j import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spinnaker.orca.clouddriver.OortService diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy index 358ee105af..63933303b0 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.job -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import java.util.concurrent.TimeUnit import com.fasterxml.jackson.core.type.TypeReference diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTask.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTask.groovy index f3238da7f6..d6de244eda 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTask.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTask.groovy @@ -18,7 +18,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup import com.netflix.spinnaker.moniker.Moniker import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.RetryableTask import com.netflix.spinnaker.orca.TaskResult import com.netflix.spinnaker.orca.clouddriver.KatoService diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java index 86b93d25d8..6157cce053 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGenerator.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; import com.netflix.frigga.Names; -import com.netflix.spinnaker.orca.RetrySupport; +import com.netflix.spinnaker.kork.core.RetrySupport; import com.netflix.spinnaker.orca.clouddriver.OortService; import com.netflix.spinnaker.orca.pipeline.model.Execution; import com.netflix.spinnaker.orca.pipeline.model.Stage; diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollbackSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollbackSpec.groovy index 4c1e2c25d4..d8b3d7fcba 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollbackSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/PreviousImageRollbackSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.rollback -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.CloneServerGroupStage import com.netflix.spinnaker.orca.pipeline.model.SyntheticStageOwner diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolverSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolverSpec.groovy index 66db09c66f..0e60fbe61b 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolverSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolverSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support import com.fasterxml.jackson.databind.ObjectMapper -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.pipeline.model.Stage import retrofit.RetrofitError diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTaskSpec.groovy index 6bd7a2f689..970de0e596 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTaskSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AbstractServerGroupTaskSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.KatoService import com.netflix.spinnaker.orca.clouddriver.model.TaskId import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroup diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTaskSpec.groovy index 482c949689..1dadd286d6 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTaskSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/AddServerGroupEntityTagsTaskSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.KatoService import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.pipeline.model.Execution diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/DestroyServerGroupTaskSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/DestroyServerGroupTaskSpec.groovy index 3557e6d717..fec492d579 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/DestroyServerGroupTaskSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/DestroyServerGroupTaskSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.KatoService import com.netflix.spinnaker.orca.clouddriver.model.TaskId import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroup diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGeneratorSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGeneratorSpec.groovy index 63c6d3c18f..08bc151700 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGeneratorSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/servergroup/SpinnakerMetadataServerGroupTagGeneratorSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.orca.clouddriver.tasks.servergroup -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.pipeline.model.Stage import retrofit.RetrofitError diff --git a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/SourceResolverSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/SourceResolverSpec.groovy index 26ab318171..c032c9fa32 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/SourceResolverSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/SourceResolverSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.kato.pipeline.support import com.fasterxml.jackson.databind.ObjectMapper -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.OortService import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroupResolver import com.netflix.spinnaker.orca.pipeline.model.Execution diff --git a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/RetrySupport.java b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/RetrySupport.java deleted file mode 100644 index 4a75597c18..0000000000 --- a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/RetrySupport.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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; - -import java.util.function.Supplier; - -public class RetrySupport { - public T retry(Supplier fn, int maxRetries, long retryBackoff, boolean exponential) { - int retries = 0; - while (true) { - try { - return fn.get(); - } catch (Exception e) { - if (retries >= (maxRetries - 1)) { - throw e; - } - - long timeout = !exponential ? retryBackoff : (long) Math.pow(2, retries) * retryBackoff; - sleep(timeout); - - retries++; - } - } - } - - /** - * Overridable by test cases to avoid Thread.sleep() - */ - void sleep(long duration) { - try { - Thread.sleep(duration); - } catch (InterruptedException ignored) { - } - } -} diff --git a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/config/OrcaConfiguration.java b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/config/OrcaConfiguration.java index 5e48a02dc0..ff4d0a5b13 100644 --- a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/config/OrcaConfiguration.java +++ b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/config/OrcaConfiguration.java @@ -21,7 +21,7 @@ import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.orca.RetrySupport; +import com.netflix.spinnaker.kork.core.RetrySupport; import com.netflix.spinnaker.orca.events.ExecutionEvent; import com.netflix.spinnaker.orca.events.ExecutionListenerAdapter; import com.netflix.spinnaker.orca.exceptions.DefaultExceptionHandler; diff --git a/orca-core/src/test/groovy/com/netflix/spinnaker/orca/RetrySupportSpec.groovy b/orca-core/src/test/groovy/com/netflix/spinnaker/orca/RetrySupportSpec.groovy deleted file mode 100644 index d6d63ba954..0000000000 --- a/orca-core/src/test/groovy/com/netflix/spinnaker/orca/RetrySupportSpec.groovy +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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 - -import spock.lang.Specification -import spock.lang.Unroll - -class RetrySupportSpec extends Specification { - @Unroll - def "should retry until success or #maxRetries attempts is reached"() { - given: - def retrySupport = Spy(RetrySupport) { - Math.min(maxRetries - 1, failures) * sleep(10000) >> { /* do nothing */ } - } - - int attemptCounter = 0; - - when: - def exceptionMessage - try { - retrySupport.retry({ - if (attemptCounter++ < failures) { - throw new IllegalStateException("Failed after " + attemptCounter + " attempts"); - } - }, maxRetries, 10000, false) - } catch (Exception e) { - exceptionMessage = e.message - } - - then: - attemptCounter == expectedAttempts - exceptionMessage == expectedExceptionMessage - - where: - failures || maxRetries || expectedAttempts || expectedExceptionMessage - 3 || 10 || 4 || null - 11 || 10 || 10 || "Failed after 10 attempts" - } - - def "should sleep exponentially"() { - given: - def retrySupport = Spy(RetrySupport) { - 1 * sleep(10000) >> { /* do nothing */ } - 1 * sleep(20000) >> { /* do nothing */ } - 1 * sleep(40000) >> { /* do nothing */ } - 1 * sleep(80000) >> { /* do nothing */ } - } - - int attemptCounter = 0; - - when: - retrySupport.retry({ - if (attemptCounter++ < failures) { - throw new IllegalStateException("Failed after " + attemptCounter + " attempts"); - } - }, maxRetries, 10000, true) - - then: - attemptCounter == expectedAttempts - - where: - failures || maxRetries || expectedAttempts - 4 || 10 || 5 - } -} diff --git a/orca-mahe/src/main/groovy/com/netflix/spinnaker/orca/mahe/cleanup/FastPropertyCleanupListener.groovy b/orca-mahe/src/main/groovy/com/netflix/spinnaker/orca/mahe/cleanup/FastPropertyCleanupListener.groovy index 7292a99164..53d36d7614 100644 --- a/orca-mahe/src/main/groovy/com/netflix/spinnaker/orca/mahe/cleanup/FastPropertyCleanupListener.groovy +++ b/orca-mahe/src/main/groovy/com/netflix/spinnaker/orca/mahe/cleanup/FastPropertyCleanupListener.groovy @@ -18,7 +18,7 @@ package com.netflix.spinnaker.orca.mahe.cleanup import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.listeners.ExecutionListener import com.netflix.spinnaker.orca.listeners.Persister import com.netflix.spinnaker.orca.mahe.MaheService @@ -125,7 +125,7 @@ class FastPropertyCleanupListener implements ExecutionListener { return retrySupport.retry({ mahe.getPropertyById(property.propertyId, property.env) return true - }, 3, 2, false) + }, 3, 2000, false) } catch (RetrofitError error) { if (error.kind == RetrofitError.Kind.HTTP && error.response.status == 404) { return false diff --git a/orca-mahe/src/test/groovy/com/netflix/spinnaker/orca/mahe/tasks/PropertyChangeCleanupSpec.groovy b/orca-mahe/src/test/groovy/com/netflix/spinnaker/orca/mahe/tasks/PropertyChangeCleanupSpec.groovy index ed6f7f9ed3..f344f94ddd 100644 --- a/orca-mahe/src/test/groovy/com/netflix/spinnaker/orca/mahe/tasks/PropertyChangeCleanupSpec.groovy +++ b/orca-mahe/src/test/groovy/com/netflix/spinnaker/orca/mahe/tasks/PropertyChangeCleanupSpec.groovy @@ -18,7 +18,7 @@ package com.netflix.spinnaker.orca.mahe.tasks import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spinnaker.orca.ExecutionStatus -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.mahe.MaheService import com.netflix.spinnaker.orca.mahe.PropertyAction import com.netflix.spinnaker.orca.mahe.cleanup.FastPropertyCleanupListener diff --git a/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStage.groovy b/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStage.groovy index 19a550d0a4..0b560c98dd 100644 --- a/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStage.groovy +++ b/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStage.groovy @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit import com.netflix.frigga.autoscaling.AutoScalingGroupNameBuilder import com.netflix.spinnaker.orca.CancellableStage import com.netflix.spinnaker.orca.CancellableStage.Result -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.KatoService import com.netflix.spinnaker.orca.clouddriver.tasks.servergroup.DestroyServerGroupTask import com.netflix.spinnaker.orca.clouddriver.utils.OortHelper diff --git a/orca-mine/src/test/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStageSpec.groovy b/orca-mine/src/test/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStageSpec.groovy index 8d0d413fa0..a5267b1f0a 100644 --- a/orca-mine/src/test/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStageSpec.groovy +++ b/orca-mine/src/test/groovy/com/netflix/spinnaker/orca/mine/pipeline/CanaryStageSpec.groovy @@ -17,7 +17,7 @@ package com.netflix.spinnaker.orca.mine.pipeline import com.netflix.spinnaker.orca.CancellableStage.Result -import com.netflix.spinnaker.orca.RetrySupport +import com.netflix.spinnaker.kork.core.RetrySupport import com.netflix.spinnaker.orca.clouddriver.model.TaskId import com.netflix.spinnaker.orca.clouddriver.tasks.servergroup.DestroyServerGroupTask import com.netflix.spinnaker.orca.clouddriver.KatoService