chore: add manual workflow testing with codebuild (#973)

Author: karenc-bq

.github/workflows/run-integration-tests-codebuild.yml

@@ -0,0 +1,72 @@
+name: Run Aurora Integration Tests CodeBuild
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  aurora-integration-tests:
+    strategy:
+      matrix:
+        engine_version: ["latest"]
+        environment: ["mysql", "pg"]
+    runs-on: codebuild-jdbcWrapper-${{ github.run_id }}-${{ github.run_attempt }}
+    environment: ${{ matrix.environment }}_integ
+    steps:
+      - name: 'Clone repository'
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: 'Set up JDK 8'
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: 8
+      - name: 'Configure AWS credentials'
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+      - name: 'Set up temp AWS credentials'
+        run: |
+          creds=($(aws sts get-session-token \
+            --duration-seconds 21600 \
+            --query 'Credentials.[AccessKeyId, SecretAccessKey, SessionToken]' \
+            --output text \
+          | xargs));
+          echo "::add-mask::${creds[0]}"
+          echo "::add-mask::${creds[1]}"
+          echo "::add-mask::${creds[2]}"
+          echo "TEMP_AWS_ACCESS_KEY_ID=${creds[0]}" >> $GITHUB_ENV
+          echo "TEMP_AWS_SECRET_ACCESS_KEY=${creds[1]}" >> $GITHUB_ENV
+          echo "TEMP_AWS_SESSION_TOKEN=${creds[2]}" >> $GITHUB_ENV
+      - name: Run integration tests
+        run: |
+          ./gradlew --no-parallel --no-daemon test-all-${{ matrix.environment }}-aurora
+        env:
+          AURORA_CLUSTER_DOMAIN: ${{ secrets.DB_CONN_SUFFIX }}
+          AURORA_DB_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+          AWS_ACCESS_KEY_ID: ${{ env.TEMP_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ env.TEMP_AWS_SECRET_ACCESS_KEY }}
+          AWS_SESSION_TOKEN: ${{ env.TEMP_AWS_SESSION_TOKEN }}
+          RDS_ENDPOINT: ${{ secrets.RDS_ENDPOINT }}
+          AURORA_MYSQL_DB_ENGINE_VERSION: "latest"
+          AURORA_PG_ENGINE_VERSION: "latest"
+      - name: 'Archive junit results ${{ matrix.engine_version }}'
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: junit-report-${{ matrix.engine_version }}
+          path: ./wrapper/build/test-results
+          retention-days: 5
+      - name: 'Archive html summary report ${{ matrix.engine_version }}'
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-summary-report-${{ matrix.engine_version }}
+          path: ./wrapper/build/report
+          retention-days: 5

wrapper/src/test/java/integration/TestEnvironmentInfo.java

@@ -25,6 +25,7 @@ public class TestEnvironmentInfo {
   private String awsSessionToken;
 
   private String auroraRegion;
+  private String rdsEndpoint;
   private String auroraClusterName;
   private String iamUsername;
 
@@ -79,6 +80,10 @@ public String getAuroraRegion() {
     return this.auroraRegion;
   }
 
+  public String getRdsEndpoint() {
+    return this.rdsEndpoint;
+  }
+
   public String getAuroraClusterName() {
     return this.auroraClusterName;
   }
@@ -95,6 +100,10 @@ public void setAuroraRegion(String auroraRegion) {
     this.auroraRegion = auroraRegion;
   }
 
+  public void setRdsEndpoint(String rdsEndpoint) {
+    this.rdsEndpoint = rdsEndpoint;
+  }
+
   public void setAuroraClusterName(String auroraClusterName) {
     this.auroraClusterName = auroraClusterName;
   }

wrapper/src/test/java/integration/container/TestDriverProvider.java

@@ -77,9 +77,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
     for (TestDriver testDriver : TestEnvironment.getCurrent().getAllowedTestDrivers()) {
       TestTemplateInvocationContext testTemplateInvocationContext =
           getEnvironment(context, testDriver);
-      if (testTemplateInvocationContext != null) {
-        resultContextList.add(testTemplateInvocationContext);
-      }
+      resultContextList.add(testTemplateInvocationContext);
     }
     return Arrays.stream(resultContextList.toArray(new TestTemplateInvocationContext[0]));
   }
@@ -146,7 +144,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
                 }
 
                 if (testRequest.getDatabaseEngineDeployment() == DatabaseEngineDeployment.AURORA) {
-                  AuroraTestUtility auroraUtil = new AuroraTestUtility(testInfo.getAuroraRegion());
+                  AuroraTestUtility auroraUtil = AuroraTestUtility.getUtility(testInfo);
                   auroraUtil.waitUntilClusterHasRightState(testInfo.getAuroraClusterName());
 
                   boolean makeSureFirstInstanceWriter =
@@ -161,7 +159,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
                     // Wait up to 5min
                     long startTimeNano = System.nanoTime();
                     while ((instanceIDs.size() != testRequest.getNumOfInstances()
-                        || instanceIDs.size() == 0
+                        || instanceIDs.isEmpty()
                         || !auroraUtil.isDBInstanceWriter(instanceIDs.get(0)))
                         && TimeUnit.NANOSECONDS.toMinutes(System.nanoTime() - startTimeNano) < 5) {
 

wrapper/src/test/java/integration/container/TestEnvironment.java

@@ -43,7 +43,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
-import org.testcontainers.shaded.org.apache.commons.lang3.NotImplementedException;
 import software.amazon.jdbc.util.StringUtils;
 
 public class TestEnvironment {
@@ -260,7 +259,7 @@ public boolean isTestDriverAllowed(TestDriver testDriver) {
         disabledByFeature = features.contains(TestEnvironmentFeatures.SKIP_MARIADB_DRIVER_TESTS);
         break;
       default:
-        throw new NotImplementedException(testDriver.toString());
+        throw new UnsupportedOperationException(testDriver.toString());
     }
 
     if (disabledByFeature || !driverCompatibleToDatabaseEngine) {

wrapper/src/test/java/integration/container/tests/AdvancedPerformanceTest.java

@@ -26,6 +26,7 @@
 import static software.amazon.jdbc.plugin.failover.FailoverConnectionPlugin.FAILOVER_TIMEOUT_MS;
 
 import integration.TestEnvironmentFeatures;
+import integration.TestEnvironmentInfo;
 import integration.container.ConnectionStringHelper;
 import integration.container.TestDriverProvider;
 import integration.container.TestEnvironment;
@@ -37,6 +38,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -97,8 +99,7 @@ public class AdvancedPerformanceTest {
 
   private static final ConcurrentLinkedQueue<PerfStat> perfDataList = new ConcurrentLinkedQueue<>();
 
-  protected static final AuroraTestUtility auroraUtil =
-      new AuroraTestUtility(TestEnvironment.getCurrent().getInfo().getAuroraRegion());
+  protected static final AuroraTestUtility auroraUtil = AuroraTestUtility.getUtility();
 
   private static void doWritePerfDataToFile(
       String fileName, ConcurrentLinkedQueue<PerfStat> dataList) throws IOException {

wrapper/src/test/java/integration/container/tests/AuroraFailoverTest.java

@@ -26,6 +26,7 @@
 import integration.DatabaseEngine;
 import integration.DriverHelper;
 import integration.TestEnvironmentFeatures;
+import integration.TestEnvironmentInfo;
 import integration.TestInstanceInfo;
 import integration.container.ConnectionStringHelper;
 import integration.container.ProxyHelper;
@@ -38,6 +39,7 @@
 import integration.container.condition.EnableOnTestFeature;
 import integration.container.condition.MakeSureFirstInstanceWriter;
 import integration.util.AuroraTestUtility;
+import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -73,8 +75,8 @@ public class AuroraFailoverTest {
 
   private static final Logger LOGGER = Logger.getLogger(AuroraFailoverTest.class.getName());
 
-  protected static final AuroraTestUtility auroraUtil =
-      new AuroraTestUtility(TestEnvironment.getCurrent().getInfo().getAuroraRegion());
+  protected static final AuroraTestUtility auroraUtil = AuroraTestUtility.getUtility();
+
   protected static final int IS_VALID_TIMEOUT = 5;
 
   protected String currentWriter;

wrapper/src/test/java/integration/container/tests/AutoscalingTests.java

@@ -36,6 +36,7 @@
 import integration.container.condition.EnableOnTestFeature;
 import integration.container.condition.MakeSureFirstInstanceWriter;
 import integration.util.AuroraTestUtility;
+import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -62,8 +63,7 @@
 @EnableOnNumOfInstances(min = 5)
 @MakeSureFirstInstanceWriter
 public class AutoscalingTests {
-  protected static final AuroraTestUtility auroraUtil =
-      new AuroraTestUtility(TestEnvironment.getCurrent().getInfo().getAuroraRegion());
+  protected static final AuroraTestUtility auroraUtil = AuroraTestUtility.getUtility();
 
   protected static Properties getDefaultPropsNoPlugins() {
     final Properties props = ConnectionStringHelper.getDefaultProperties();

wrapper/src/test/java/integration/container/tests/AwsIamIntegrationTest.java

@@ -280,6 +280,9 @@ void test_TokenGenerators() {
   protected Properties initAwsIamProps(String user, String password) {
     final Properties props = ConnectionStringHelper.getDefaultProperties();
     props.setProperty(PropertyDefinition.PLUGINS.name, "iam");
+    props.setProperty(
+        IamAuthConnectionPlugin.IAM_REGION.name,
+        TestEnvironment.getCurrent().getInfo().getAuroraRegion());
     props.setProperty(PropertyDefinition.USER.name, user);
     props.setProperty(PropertyDefinition.PASSWORD.name, password);
     DriverHelper.setTcpKeepAlive(TestEnvironment.getCurrent().getCurrentDriver(), props, false);

wrapper/src/test/java/integration/container/tests/ReadWriteSplittingTests.java

@@ -47,6 +47,7 @@
 import integration.container.condition.EnableOnTestFeature;
 import integration.container.condition.MakeSureFirstInstanceWriter;
 import integration.util.AuroraTestUtility;
+import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -85,9 +86,7 @@
     TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY})
 @MakeSureFirstInstanceWriter
 public class ReadWriteSplittingTests {
-
-  protected static final AuroraTestUtility auroraUtil =
-      new AuroraTestUtility(TestEnvironment.getCurrent().getInfo().getAuroraRegion());
+  protected static final AuroraTestUtility auroraUtil = AuroraTestUtility.getUtility();
   private static final Logger LOGGER = Logger.getLogger(ReadWriteSplittingTests.class.getName());
 
   protected static Properties getProxiedPropsWithFailover() {

wrapper/src/test/java/integration/host/TestEnvironment.java

@@ -35,6 +35,7 @@
 import integration.util.AuroraTestUtility;
 import integration.util.ContainerHelper;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -82,6 +83,7 @@ public class TestEnvironment implements AutoCloseable {
   private boolean reuseAuroraDbCluster;
   private String auroraClusterName; // "cluster-mysql"
   private String auroraClusterDomain; // "XYZ.us-west-2.rds.amazonaws.com"
+  private String rdsEndpoint; // "https://rds-int.amazon.com"
 
   private String awsAccessKeyId;
   private String awsSecretAccessKey;
@@ -103,7 +105,7 @@ private TestEnvironment(TestEnvironmentRequest request) {
     this.info.setRequest(request);
   }
 
-  public static TestEnvironment build(TestEnvironmentRequest request) throws IOException {
+  public static TestEnvironment build(TestEnvironmentRequest request) throws IOException, URISyntaxException {
     LOGGER.finest("Building test env: " + request.getEnvPreCreateIndex());
     preCreateEnvironment(request.getEnvPreCreateIndex());
 
@@ -155,7 +157,7 @@ public static TestEnvironment build(TestEnvironmentRequest request) throws IOExc
     return env;
   }
 
-  private static TestEnvironment createAuroraEnvironment(TestEnvironmentRequest request) {
+  private static TestEnvironment createAuroraEnvironment(TestEnvironmentRequest request) throws URISyntaxException {
 
     EnvPreCreateInfo preCreateInfo =
         TestEnvironmentProvider.preCreateInfos.get(request.getEnvPreCreateIndex());
@@ -302,7 +304,7 @@ private static void createDatabaseContainers(TestEnvironment env) {
     }
   }
 
-  private static void createAuroraDbCluster(TestEnvironment env) {
+  private static void createAuroraDbCluster(TestEnvironment env) throws URISyntaxException {
 
     switch (env.info.getRequest().getDatabaseInstances()) {
       case SINGLE_INSTANCE:
@@ -328,7 +330,7 @@ private static void createAuroraDbCluster(TestEnvironment env) {
     }
   }
 
-  private static void createAuroraDbCluster(TestEnvironment env, int numOfInstances) {
+  private static void createAuroraDbCluster(TestEnvironment env, int numOfInstances) throws URISyntaxException {
 
     env.info.setAuroraRegion(
         !StringUtils.isNullOrEmpty(config.auroraDbRegion)
@@ -340,6 +342,8 @@ private static void createAuroraDbCluster(TestEnvironment env, int numOfInstance
             && Boolean.parseBoolean(config.reuseAuroraCluster);
     env.auroraClusterName = config.auroraClusterName; // "cluster-mysql"
     env.auroraClusterDomain = config.auroraClusterDomain; // "XYZ.us-west-2.rds.amazonaws.com"
+    env.rdsEndpoint = config.rdsEndpoint; // "XYZ.us-west-2.rds.amazonaws.com"
+    env.info.setRdsEndpoint(env.rdsEndpoint);
 
     if (StringUtils.isNullOrEmpty(env.auroraClusterDomain)) {
       throw new RuntimeException("Environment variable AURORA_CLUSTER_DOMAIN is required.");
@@ -348,6 +352,7 @@ private static void createAuroraDbCluster(TestEnvironment env, int numOfInstance
     env.auroraUtil =
         new AuroraTestUtility(
             env.info.getAuroraRegion(),
+            env.rdsEndpoint,
             env.awsAccessKeyId,
             env.awsSecretAccessKey,
             env.awsSessionToken);