fix: use the AwsCredentialsProviderHandler from the ConfigurationProfile when it is defined

CHANGELOG.md

@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/#semantic-versioning-200).
 
+### :bug: Fixed
+- Use the AwsCredentialsProviderHandler from the ConfigurationProfile when it is defined ([PR #1183](https://github.com/aws/aws-advanced-jdbc-wrapper/pull/1183)).
+
 ## [2.5.2] - 2024-11-4
 ### :bug: Fixed
 - Limitless Connection Plugin to reduce extra connections made during new connection creation ([PR #1174](https://github.com/aws/aws-advanced-jdbc-wrapper/pull/1174)).

wrapper/src/main/java/software/amazon/jdbc/PluginService.java

@@ -27,6 +27,7 @@
 import software.amazon.jdbc.dialect.Dialect;
 import software.amazon.jdbc.exceptions.ExceptionHandler;
 import software.amazon.jdbc.hostavailability.HostAvailability;
+import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.states.SessionStateService;
 import software.amazon.jdbc.targetdriverdialect.TargetDriverDialect;
 import software.amazon.jdbc.util.telemetry.TelemetryFactory;
@@ -231,6 +232,8 @@ HostSpec getHostSpecByStrategy(List<HostSpec> hosts, HostRole role, String strat
 
   String getDriverProtocol();
 
+  @Nullable ConfigurationProfile getConfigurationProfile();
+
   Properties getProperties();
 
   TelemetryFactory getTelemetryFactory();

wrapper/src/main/java/software/amazon/jdbc/PluginServiceImpl.java

@@ -244,6 +244,12 @@ public String getDriverProtocol() {
     return this.driverProtocol;
   }
 
+  @Override
+  @Nullable
+  public ConfigurationProfile getConfigurationProfile() {
+    return this.configurationProfile;
+  }
+
   @Override
   public void setCurrentConnection(
       final @NonNull Connection connection, final @NonNull HostSpec hostSpec) throws SQLException {

wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerConnectionPlugin.java

@@ -49,6 +49,7 @@
 import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.PropertyDefinition;
 import software.amazon.jdbc.authentication.AwsCredentialsManager;
+import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.RegionUtils;
 import software.amazon.jdbc.util.StringUtils;
@@ -175,7 +176,12 @@ public AwsSecretsManagerConnectionPlugin(final PluginService pluginService, fina
 
     this.secretKey = Pair.of(secretId, region);
 
+    ConfigurationProfile profile = this.pluginService.getConfigurationProfile();
+    if (profile != null && profile.getAwsCredentialsProviderHandler() != null) {
+      AwsCredentialsManager.setCustomHandler(profile.getAwsCredentialsProviderHandler());
+    }
     this.secretsManagerClientFunc = secretsManagerClientFunc;
+
     this.getSecretValueRequestFunc = getSecretValueRequestFunc;
     this.fetchCredentialsCounter = this.pluginService.getTelemetryFactory()
         .createCounter(TELEMETRY_FETCH_CREDENTIALS_COUNTER);

wrapper/src/main/java/software/amazon/jdbc/plugin/customendpoint/CustomEndpointPlugin.java

@@ -34,6 +34,7 @@
 import software.amazon.jdbc.PropertyDefinition;
 import software.amazon.jdbc.authentication.AwsCredentialsManager;
 import software.amazon.jdbc.plugin.AbstractConnectionPlugin;
+import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.RdsUtils;
 import software.amazon.jdbc.util.RegionUtils;
@@ -145,6 +146,11 @@ public CustomEndpointPlugin(
       final BiFunction<HostSpec, Region, RdsClient> rdsClientFunc) {
     this.pluginService = pluginService;
     this.props = props;
+
+    ConfigurationProfile profile = this.pluginService.getConfigurationProfile();
+    if (profile != null && profile.getAwsCredentialsProviderHandler() != null) {
+      AwsCredentialsManager.setCustomHandler(profile.getAwsCredentialsProviderHandler());
+    }
     this.rdsClientFunc = rdsClientFunc;
 
     this.shouldWaitForInfo = WAIT_FOR_CUSTOM_ENDPOINT_INFO.getBoolean(this.props);

wrapper/src/main/java/software/amazon/jdbc/plugin/iam/IamAuthConnectionPlugin.java

@@ -36,6 +36,7 @@
 import software.amazon.jdbc.authentication.AwsCredentialsManager;
 import software.amazon.jdbc.plugin.AbstractConnectionPlugin;
 import software.amazon.jdbc.plugin.TokenInfo;
+import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.util.IamAuthUtils;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.RdsUtils;
@@ -98,6 +99,11 @@ public IamAuthConnectionPlugin(final @NonNull PluginService pluginService) {
     this.telemetryFactory = pluginService.getTelemetryFactory();
     this.cacheSizeGauge = telemetryFactory.createGauge("iam.tokenCache.size", () -> (long) tokenCache.size());
     this.fetchTokenCounter = telemetryFactory.createCounter("iam.fetchToken.count");
+
+    ConfigurationProfile profile = this.pluginService.getConfigurationProfile();
+    if (profile != null && profile.getAwsCredentialsProviderHandler() != null) {
+      AwsCredentialsManager.setCustomHandler(profile.getAwsCredentialsProviderHandler());
+    }
   }
 
   @Override