Refactor FederatedAuthPlugin and add unit tests

aws · Nov 17, 2023 · a2ac9cd · a2ac9cd
1 parent 6bc826d
commit a2ac9cd
Show file tree

Hide file tree

Showing 22 changed files with 1,784 additions and 423 deletions.
diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
@@ -28,8 +28,4 @@
   <suppress files="[\\/]PgDataSourceHelper\.java" checks="IllegalImport"/>
   <suppress files="[\\/]test[\\/]" checks="IllegalImport"/>
   <suppress files="[\\/]ExtendedFormatter\.java" checks="Header"/>
-  <suppress files="[\\/]NonValidatingFactory\.java" checks="Header"/>
-  <suppress files="[\\/]WrappedFactory\.java" checks="Header"/>
-  <suppress files="[\\/]FederatedAuthConnectionPluginFactory\.java" checks="Header"/>
-  <suppress files="[\\/]FederatedAuthConnectionPlugin\.java" checks="Header"/>
 </suppressions>
diff --git a/.../AWSDriverExample/src/main/java/software/amazon/FederatedAuthConnectionPluginExample.java b/.../AWSDriverExample/src/main/java/software/amazon/FederatedAuthConnectionPluginExample.java
@@ -17,7 +17,7 @@
 package software.amazon;
 
 import software.amazon.jdbc.PropertyDefinition;
-import software.amazon.jdbc.plugin.FederatedAuthConnectionPlugin;
+import software.amazon.jdbc.plugin.federatedauth.FederatedAuthConnectionPlugin;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -35,6 +35,7 @@ public static void main(String[] args) throws SQLException {
 
     // Enable the AWS Federated Authentication Connection Plugin.
     properties.setProperty(PropertyDefinition.PLUGINS.name, "federatedAuth");
+    properties.setProperty(FederatedAuthConnectionPlugin.IDP_NAME.name, "adfs");
     properties.setProperty(FederatedAuthConnectionPlugin.IDP_HOST.name, "ec2amaz-ab3cdef.example.com");
     properties.setProperty(FederatedAuthConnectionPlugin.IAM_ROLE_ARN.name, "arn:aws:iam::123456789012:role/adfs_example_iam_role");
     properties.setProperty(FederatedAuthConnectionPlugin.IAM_IDP_ARN.name, "arn:aws:iam::123456789012:saml-provider/adfs_example");

diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts
@@ -63,7 +63,8 @@ dependencies {
     testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8
     testImplementation("software.amazon.awssdk:rds:2.21.11")
     testImplementation("software.amazon.awssdk:ec2:2.21.12")
-    testImplementation("software.amazon.awssdk:secretsmanager:2.21.21")
+    testImplementation("software.amazon.awssdk:secretsmanager:2.21.11")
+    testImplementation("software.amazon.awssdk:sts:2.21.11")
     testImplementation("org.testcontainers:testcontainers:1.19.1")
     testImplementation("org.testcontainers:mysql:1.19.1")
     testImplementation("org.testcontainers:postgresql:1.19.1")

diff --git a/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginChainBuilder.java b/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginChainBuilder.java
@@ -33,12 +33,12 @@
 import software.amazon.jdbc.plugin.DefaultConnectionPlugin;
 import software.amazon.jdbc.plugin.DriverMetaDataConnectionPluginFactory;
 import software.amazon.jdbc.plugin.ExecutionTimeConnectionPluginFactory;
-import software.amazon.jdbc.plugin.FederatedAuthConnectionPluginFactory;
 import software.amazon.jdbc.plugin.IamAuthConnectionPluginFactory;
 import software.amazon.jdbc.plugin.LogQueryConnectionPluginFactory;
 import software.amazon.jdbc.plugin.dev.DeveloperConnectionPluginFactory;
 import software.amazon.jdbc.plugin.efm.HostMonitoringConnectionPluginFactory;
 import software.amazon.jdbc.plugin.failover.FailoverConnectionPluginFactory;
+import software.amazon.jdbc.plugin.federatedauth.FederatedAuthConnectionPluginFactory;
 import software.amazon.jdbc.plugin.readwritesplitting.ReadWriteSplittingPluginFactory;
 import software.amazon.jdbc.plugin.staledns.AuroraStaleDnsPluginFactory;
 import software.amazon.jdbc.profile.DriverConfigurationProfiles;