Skip to content

fix: removed credential workaround #563

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

Merged
embano1 merged 2 commits into from
Jun 17, 2025
Merged

fix: removed credential workaround #563

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
f12da23
fix: removed credential workaround
maschnetwork Jun 16, 2025
8389648
fix: formatting
maschnetwork Jun 16, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<aws.java.sdk.version>2.31.59</aws.java.sdk.version>
<aws.java.sdk.version>2.31.63</aws.java.sdk.version>
<aws.schema.registry.version>1.1.15</aws.schema.registry.version>
<ch.qos.logback.version>1.5.18</ch.qos.logback.version>
<com.fasterxml.jackson.version>2.19.0</com.fasterxml.jackson.version>
Expand Down
15 changes: 1 addition & 14 deletions ...a/software/amazon/event/kafkaconnector/auth/EventBridgeAwsCredentialsProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.slf4j.Logger;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
import software.amazon.awssdk.profiles.ProfileFile;
import software.amazon.awssdk.profiles.ProfileFileSupplier;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.sts.StsClient;
Expand Down Expand Up @@ -83,25 +82,13 @@ public static AwsCredentialsProvider getAwsCredentialsProvider(EventBridgeSinkCo
return getStsAssumeRoleCredentialsProvider(config);
}

// Temporary workaround until AWS SDK issue is fixed:
// https://github.com/aws/aws-sdk-java-v2/issues/5635
private static ProfileFileSupplier wrappedProfileDefaultSupplier() {
return () -> {
try {
return ProfileFileSupplier.defaultSupplier().get();
} catch (NullPointerException e) {
return ProfileFile.defaultProfileFile();
}
};
}

private static DefaultCredentialsProvider getDefaultCredentialsProvider(
EventBridgeSinkConfig config) {
var builder = DefaultCredentialsProvider.builder();

// Leverage DefaultSupplier to automatically reload credentials on file refresh
// https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-profiles.html#profile-reloading
builder.profileFile(wrappedProfileDefaultSupplier());
builder.profileFile(ProfileFileSupplier.defaultSupplier());

var profileName = config.profileName;
if (!profileName.isBlank()) {
Expand Down
19 changes: 0 additions & 19 deletions .../software/amazon/event/kafkaconnector/auth/EventBridgeCredentialsProviderFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
package software.amazon.event.kafkaconnector.auth;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
import software.amazon.event.kafkaconnector.AwsCredentialProviderImpl;
import software.amazon.event.kafkaconnector.EventBridgeSinkConfig;
Expand Down Expand Up @@ -67,20 +64,4 @@ public void shouldUseAwsCredentialsProviderByProvidedClass() {
assertThat(provider).isInstanceOf(AwsCredentialsProvider.class);
assertThat(provider).isExactlyInstanceOf(AwsCredentialProviderImpl.class);
}

@Test
@Disabled // Todo: Excluded because it is environment specific (Requires no credentials and config
// files present to work). Will keep to verify once AWS SDK issue is fixed:
// https://github.com/aws/aws-sdk-java-v2/issues/5635
public void shouldNotGetSDKClientExceptionWithNull() {
var props = new HashMap<>(commonProps);
var provider =
EventBridgeAwsCredentialsProviderFactory.getAwsCredentialsProvider(
new EventBridgeSinkConfig(props));
var exception = assertThrows(SdkClientException.class, provider::resolveCredentials);

assertThat(exception)
.hasMessageNotContaining(
"Cannot invoke \"java.nio.file.Path.getFileSystem()\" because \"path\" is null");
}
}