fix(agents): Add additional cleanup agents when agentScheduler is null (

#5101)
spinnaker · Nov 16, 2020 · 0af2a3f · 0af2a3f
1 parent 6815f34
commit 0af2a3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...rc/main/groovy/com/netflix/spinnaker/clouddriver/aws/provider/config/ProviderHelpers.java b/...rc/main/groovy/com/netflix/spinnaker/clouddriver/aws/provider/config/ProviderHelpers.java
@@ -256,7 +256,7 @@ public static List<Agent> buildAwsCleanupAgents(
         }
       }
     }
-    if (awsCleanupProvider.getAgentScheduler() != null) {
+    if (awsCleanupProvider.getAgentScheduler() == null) {
       if (awsConfigurationProperties.getCleanup().getAlarms().getEnabled()) {
         newlyAddedAgents.add(
             new CleanupAlarmsAgent(

diff --git a/...m/netflix/spinnaker/clouddriver/aws/security/AmazonCredentialsLifecycleHandlerSpec.groovy b/...m/netflix/spinnaker/clouddriver/aws/security/AmazonCredentialsLifecycleHandlerSpec.groovy
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spectator.api.DefaultRegistry
 import com.netflix.spinnaker.cats.agent.AgentProvider
 import com.netflix.spinnaker.clouddriver.aws.AmazonCloudProvider
+import com.netflix.spinnaker.clouddriver.aws.AwsConfigurationProperties
 import com.netflix.spinnaker.clouddriver.aws.TestCredential
 import com.netflix.spinnaker.clouddriver.aws.edda.EddaApiFactory
 import com.netflix.spinnaker.clouddriver.aws.provider.AwsCleanupProvider
@@ -64,6 +65,8 @@ class AmazonCredentialsLifecycleHandlerSpec extends Specification {
   )
   def deployDefaults = new  AwsConfiguration.DeployDefaults()
 
+  def awsConfigurationProperties = new AwsConfigurationProperties()
+
   def setup() {
     awsCleanupProvider = new AwsCleanupProvider()
     awsInfrastructureProvider = new AwsInfrastructureProvider()
@@ -111,7 +114,7 @@ class AmazonCredentialsLifecycleHandlerSpec extends Specification {
       getAmazonEC2(_, _) >> amazonEC2
     }
     def handler = new AmazonCredentialsLifecycleHandler(awsCleanupProvider, awsInfrastructureProvider, awsProvider,
-      amazonCloudProvider, amazonClientProvider, null, null, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
+      amazonCloudProvider, amazonClientProvider, null, awsConfigurationProperties, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
       credentialsRepository)
     def credThree = TestCredential.named('three')
 
@@ -132,7 +135,7 @@ class AmazonCredentialsLifecycleHandlerSpec extends Specification {
 
   def 'subsequent call should not add reservation caching agents'() {
     def handler = new AmazonCredentialsLifecycleHandler(awsCleanupProvider, awsInfrastructureProvider, awsProvider,
-      amazonCloudProvider, null, null, null, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
+      amazonCloudProvider, null, null, awsConfigurationProperties, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
       credentialsRepository)
     def credThree = TestCredential.named('three')
     handler.reservationReportCachingAgentScheduled = true
@@ -157,7 +160,7 @@ class AmazonCredentialsLifecycleHandlerSpec extends Specification {
       getAmazonEC2(_, _) >> amazonEC2
     }
     def handler = new AmazonCredentialsLifecycleHandler(awsCleanupProvider, awsInfrastructureProvider, awsProvider,
-      amazonCloudProvider, amazonClientProvider, null, null, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
+      amazonCloudProvider, amazonClientProvider, null, awsConfigurationProperties, objectMapper, null, eddaApiFactory, null, registry, reservationReportPool, agentProviders, null, null, dynamicConfigService, deployDefaults,
       credentialsRepository)
     def credThree = TestCredential.named('three')
     handler.credentialsAdded(credThree)