Skip to content

Do not log warning message for STS credentials when properties are not configured #1444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Do not log warning message for STS credentials when properties are not configured #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a52af8
Do not log warning message for STS credentials when properties are no…
maciejwalkowiak Aug 24, 2025
b10da1d
Merge remote-tracking branch 'origin/main' into gh-862
maciejwalkowiak Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .../main/java/io/awspring/cloud/autoconfigure/core/CredentialsProviderAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.auth.StsWebIdentityTokenFileCredentialsProvider;

import static software.amazon.awssdk.core.SdkSystemSetting.AWS_WEB_IDENTITY_TOKEN_FILE;

/**
* {@link EnableAutoConfiguration} for {@link AwsCredentialsProvider}.
*
Expand Down Expand Up @@ -103,7 +105,7 @@ public static AwsCredentialsProvider createCredentialsProvider(CredentialsProper
}

StsProperties sts = properties.getSts();
if (ClassUtils.isPresent(STS_WEB_IDENTITY_TOKEN_FILE_CREDENTIALS_PROVIDER, null)) {
if (isWebIdentitiyTokenFileConfigured(sts) && ClassUtils.isPresent(STS_WEB_IDENTITY_TOKEN_FILE_CREDENTIALS_PROVIDER, null)) {
try {
providers.add(StsCredentialsProviderFactory.create(sts, regionProvider));
}
Expand All @@ -124,6 +126,11 @@ else if (providers.size() == 1) {
}
}

private static boolean isWebIdentitiyTokenFileConfigured(@Nullable StsProperties sts) {
// AWS_WEB_IDENTITY_TOKEN_FILE can be configured either through environment variable, system properties or `spring.cloud.aws.sts` properties.
return AWS_WEB_IDENTITY_TOKEN_FILE.getStringValue().isPresent() || (sts != null && sts.getWebIdentityTokenFile() != null);
}

private static StaticCredentialsProvider createStaticCredentialsProvider(CredentialsProperties properties) {
return StaticCredentialsProvider
.create(AwsBasicCredentials.create(properties.getAccessKey(), properties.getSecretKey()));
Expand Down
18 changes: 18 additions & 0 deletions .../java/io/awspring/cloud/autoconfigure/core/CredentialsProviderAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@
import java.io.IOException;
import java.nio.file.Path;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
Expand Down Expand Up @@ -116,6 +119,21 @@ void credentialsProvider_stsPropertiesConfigured_configuresStsWebIdentityTokenFi
});
}

@Test
@ExtendWith(OutputCaptureExtension.class)
void credentialsProvider_stsCredentialsProviderNotConfigured_whenWebIdentityTokenNotConfigured(CapturedOutput output)
throws IOException {
this.contextRunner
.withPropertyValues("spring.cloud.aws.region.static:af-south-1")
.run((context) -> {
AwsCredentialsProvider awsCredentialsProvider = context.getBean("credentialsProvider",
AwsCredentialsProvider.class);
assertThat(awsCredentialsProvider).isNotNull()
.isInstanceOf(DefaultCredentialsProvider.class);
});
assertThat(output).doesNotContain("Skipping creating `StsCredentialsProvider`");
}

@Test
void credentialsProvider_stsSystemPropertiesDefault_configuresStsWebIdentityTokenFileCredentialsProvider()
throws IOException {
Expand Down