From 8720b869ae6252785c6dbf478107aeac06efd27e Mon Sep 17 00:00:00 2001 From: Sanjeev Thatiparthi <54054932+sanopsmx@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:12:25 +0530 Subject: [PATCH] Temp fix to check if aws & ecs accounts are fetched.We are seeing few issues with aws & ecs accounts. (#77) --- .../groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy | 1 - .../java/com/netflix/spinnaker/config/EcsConfiguration.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy index 2758050964d..b08537173ef 100644 --- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy +++ b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/config/AwsConfiguration.groovy @@ -66,7 +66,6 @@ import org.springframework.core.Ordered import org.springframework.core.annotation.Order @Configuration -@ConditionalOnProperty('aws.enabled') @ComponentScan(["com.netflix.spinnaker.clouddriver.aws"]) @EnableConfigurationProperties(AwsConfigurationProperties) @Import([ diff --git a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java index 80a203662d0..4d0849735eb 100644 --- a/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java +++ b/clouddriver-ecs/src/main/java/com/netflix/spinnaker/config/EcsConfiguration.java @@ -16,11 +16,9 @@ package com.netflix.spinnaker.config; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("com.netflix.spinnaker.clouddriver.ecs") -@ConditionalOnProperty("ecs.enabled") public class EcsConfiguration {}