From 1dfe99308374fada3cc27acbd8c5c141d5b2be02 Mon Sep 17 00:00:00 2001 From: Iuliia Sobolevska Date: Tue, 20 May 2025 15:59:47 -0700 Subject: [PATCH] change conditional so that autoconfiguration is not skipped when AWSCredentialsProvider bean is created later on --- .../genie/common/internal/configs/AwsAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/genie-common-internal/src/main/java/com/netflix/genie/common/internal/configs/AwsAutoConfiguration.java b/genie-common-internal/src/main/java/com/netflix/genie/common/internal/configs/AwsAutoConfiguration.java index 0414b8409b0..5efbe536a31 100644 --- a/genie-common-internal/src/main/java/com/netflix/genie/common/internal/configs/AwsAutoConfiguration.java +++ b/genie-common-internal/src/main/java/com/netflix/genie/common/internal/configs/AwsAutoConfiguration.java @@ -37,7 +37,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -67,7 +67,7 @@ ContextStackAutoConfiguration.class } ) -@ConditionalOnBean(AWSCredentialsProvider.class) +@ConditionalOnClass(name = "com.amazonaws.auth.AWSCredentialsProvider") @Slf4j public class AwsAutoConfiguration {