Skip to content

Commit

Permalink
Fix checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron-congo committed Jan 22, 2025
1 parent 98a1b7f commit 435626b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import integration.TestEnvironmentInfo;
import integration.TestInstanceInfo;
import integration.container.ConnectionStringHelper;
import integration.container.TestEnvironment;
import integration.container.TestDriverProvider;
import integration.container.TestEnvironment;
import integration.container.condition.EnableOnDatabaseEngineDeployment;
import integration.container.condition.EnableOnNumOfInstances;
import integration.container.condition.EnableOnTestFeature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import com.zaxxer.hikari.HikariConfig;
import integration.TestEnvironmentFeatures;
import integration.container.ConnectionStringHelper;
import integration.container.TestEnvironment;
import integration.container.TestDriverProvider;
import integration.container.TestEnvironment;
import integration.container.condition.EnableOnNumOfInstances;
import integration.container.condition.EnableOnTestFeature;
import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
import integration.TestEnvironmentInfo;
import integration.TestInstanceInfo;
import integration.container.ConnectionStringHelper;
import integration.container.TestEnvironment;
import integration.container.ProxyHelper;
import integration.container.TestDriver;
import integration.container.TestDriverProvider;
import integration.container.TestEnvironment;
import integration.container.aurora.TestPluginServiceImpl;
import integration.container.condition.DisableOnTestDriver;
import integration.container.condition.DisableOnTestFeature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import integration.TestProxyDatabaseInfo;
import integration.TestTelemetryInfo;
import integration.host.TestEnvironmentProvider.EnvPreCreateInfo;
import integration.util.ContainerHelper;
import integration.util.AuroraTestUtility;
import integration.util.ContainerHelper;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
Expand Down
26 changes: 11 additions & 15 deletions wrapper/src/test/java/integration/util/AuroraTestUtility.java
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,9 @@ protected static Region getRegionInternal(String rdsRegion) {
}

/**
* Performs the following:
* - creates an RDS cluster based on the passed in details
* - waits until it is available
* - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
* - creates a database with the given name within the cluster
* Creates an RDS cluster based on the passed in details. After the cluster is created, this method will wait
* until it is available, adds the current IP address to the default security group, and create a database with the
* given name within the cluster.
*
* @param username the master username for access to the database
* @param password the master password for access to the database
Expand Down Expand Up @@ -227,6 +225,7 @@ public void createCluster(
case AURORA:
createAuroraCluster(
username, password, dbName, identifier, region, engine, instanceClass, version, numInstances);
break;
case RDS_MULTI_AZ_CLUSTER:
if (numInstances != MULTI_AZ_SIZE) {
throw new RuntimeException(
Expand All @@ -236,17 +235,16 @@ public void createCluster(

createMultiAzCluster(
username, password, dbName, identifier, region, engine, instanceClass, version);
break;
default:
throw new UnsupportedOperationException(deployment.toString());
}
}

/**
* Performs the following:
* - creates an RDS Aurora cluster based on the passed in details
* - waits until it is available
* - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
* - creates a database with the given name within the cluster
* Creates an RDS Aurora cluster based on the passed in details. After the cluster is created, this method will wait
* until it is available, adds the current IP address to the default security group, and create a database with the
* given name within the cluster.
*
* @param username the master username for access to the database
* @param password the master password for access to the database
Expand Down Expand Up @@ -321,11 +319,9 @@ public void createAuroraCluster(
}

/**
* Performs the following:
* - creates an RDS multi-az cluster based on the passed in details
* - waits until it is available
* - adds the current IP address as an inbound rule to the security group so that the cluster can be accessed
* - creates a database with the given name within the cluster
* Creates an RDS multi-az cluster based on the passed in details. After the cluster is created, this method will wait
* until it is available, adds the current IP address to the default security group, and create a database with the
* given name within the cluster.
*
* @param username the master username for access to the database
* @param password the master password for access to the database
Expand Down

0 comments on commit 435626b

Please sign in to comment.