test: update IP type env variable on integration tests (#2137)

kgala2 · web-flow · commit a30ec714ed1b · 2025-04-03T10:36:32.000-07:00
diff --git a/jdbc/mariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIamAuthIntegrationTests.java b/jdbc/mariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIamAuthIntegrationTests.java
@@ -41,6 +41,9 @@ public class JdbcMariaDBIamAuthIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("MYSQL_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
+
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_CONNECTION_NAME", "MYSQL_DB", "MYSQL_IAM_USER");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -70,6 +73,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mariadb.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
 
     // Initialize connection pool
diff --git a/jdbc/mariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIntegrationTests.java b/jdbc/mariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcMariaDBIntegrationTests {
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_USER", "MYSQL_PASS", "MYSQL_DB", "MYSQL_CONNECTION_NAME");
 
@@ -70,6 +72,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mariadb.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
 
     // Initialize connection pool
     HikariConfig config = new HikariConfig();
diff --git a/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8DomainNameIntegrationTests.java b/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8DomainNameIntegrationTests.java
@@ -44,6 +44,8 @@ public class JdbcMysqlJ8DomainNameIntegrationTests {
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_USER", "MYSQL_PASS", "MYSQL_DB", "MYSQL_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -68,6 +70,7 @@ public void setUpPool() throws SQLException {
     Properties connProps = new Properties();
     connProps.setProperty("user", DB_USER);
     connProps.setProperty("password", DB_PASSWORD);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
 
     // Register a resolver that resolves `db.example.com` to the connection name
diff --git a/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IAMServiceAccountImpersonationIntegrationTests.java b/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IAMServiceAccountImpersonationIntegrationTests.java
@@ -41,6 +41,8 @@ public class JdbcMysqlJ8IAMServiceAccountImpersonationIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("MYSQL_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String IMPERSONATED_USER = System.getenv("IMPERSONATED_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_DB", "MYSQL_CONNECTION_NAME", "IMPERSONATED_USER");
@@ -69,6 +71,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
 
     // Initialize connection pool
diff --git a/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IamAuthIntegrationTests.java b/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IamAuthIntegrationTests.java
@@ -41,6 +41,8 @@ public class JdbcMysqlJ8IamAuthIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("MYSQL_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_CONNECTION_NAME");
@@ -68,6 +70,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
 
     // Initialize connection pool
diff --git a/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IntegrationTests.java b/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcMysqlJ8IntegrationTests {
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("MYSQL_USER", "MYSQL_PASS", "MYSQL_DB", "MYSQL_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -67,6 +69,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("user", DB_USER);
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
 
     // Initialize connection pool
diff --git a/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8ServiceAccountImpersonationIntegrationTests.java b/jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8ServiceAccountImpersonationIntegrationTests.java
@@ -47,6 +47,8 @@ public class JdbcMysqlJ8ServiceAccountImpersonationIntegrationTests {
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
   private static final String IMPERSONATED_USER = System.getenv("IMPERSONATED_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
           "MYSQL_USER", "MYSQL_PASS", "MYSQL_DB", "MYSQL_CONNECTION_NAME", "IMPERSONATED_USER");
@@ -74,6 +76,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("cloudSqlTargetPrincipal", IMPERSONATED_USER);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.mysql.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
 
     // Initialize connection pool
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCasIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCasIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcPostgresCasIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_CAS_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
           "POSTGRES_USER", "POSTGRES_CAS_PASS", "POSTGRES_DB", "POSTGRES_CAS_CONNECTION_NAME");
@@ -70,6 +72,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
 
     // Initialize connection pool
     HikariConfig config = new HikariConfig();
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCustomSanIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCustomSanIntegrationTests.java
@@ -47,6 +47,8 @@ public class JdbcPostgresCustomSanIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_CUSTOMER_CAS_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
           "POSTGRES_USER",
@@ -79,6 +81,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("user", DB_USER);
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
 
     // Initialize connection pool
     HikariConfig config = new HikariConfig();
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCustomerCasIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresCustomerCasIntegrationTests.java
@@ -43,6 +43,8 @@ public class JdbcPostgresCustomerCasIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_CUSTOMER_CAS_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
           "POSTGRES_USER",
@@ -73,6 +75,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("user", DB_USER);
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
 
     // Initialize connection pool
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresDomainNameIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresDomainNameIntegrationTests.java
@@ -44,6 +44,8 @@ public class JdbcPostgresDomainNameIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -70,6 +72,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("user", DB_USER);
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlNamedConnector", "resolver-test");
 
     ConnectorRegistry.register(
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIamAuthIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIamAuthIntegrationTests.java
@@ -50,6 +50,8 @@ public class JdbcPostgresIamAuthIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("POSTGRES_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   // [END cloud_sql_connector_postgres_jdbc_iam_auth]
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
@@ -94,6 +96,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
 
     // Initialize connection pool
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcPostgresIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -69,6 +71,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
 
     // Initialize connection pool
     HikariConfig config = new HikariConfig();
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresLazyRefreshIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresLazyRefreshIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcPostgresLazyRefreshIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -69,6 +71,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", DB_PASSWORD);
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlRefreshStrategy", "lazy");
 
     // Initialize connection pool
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresNamedConnectorIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresNamedConnectorIntegrationTests.java
@@ -47,6 +47,8 @@ public class JdbcPostgresNamedConnectorIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("POSTGRES_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -90,6 +92,7 @@ public void setUpPool() throws SQLException {
 
     // Configure Cloud SQL connector properties
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
 
     // Configure the named connector registered as "my-connector"
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjecImpersonationtIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjecImpersonationtIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcPostgresQuotaProjecImpersonationtIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String IMPERSONATED_USER = System.getenv("IMPERSONATED_USER");
   private static final String QUOTA_PROJECT = System.getenv("QUOTA_PROJECT");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
@@ -74,6 +76,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("enableIamAuth", "true");
     connProps.setProperty("cloudSqlAdminQuotaProject", QUOTA_PROJECT);
 
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjectIAMAuthIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjectIAMAuthIntegrationTests.java
@@ -42,6 +42,8 @@ public class JdbcPostgresQuotaProjectIAMAuthIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
   private static final String QUOTA_PROJECT = System.getenv("QUOTA_PROJECT");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
@@ -74,6 +76,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
     connProps.setProperty("enableIamAuth", "true");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlAdminQuotaProject", QUOTA_PROJECT);
 
     // Initialize connection pool
diff --git a/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresServiceAccountImpersonationIntegrationTests.java b/jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresServiceAccountImpersonationIntegrationTests.java
@@ -45,6 +45,8 @@ public class JdbcPostgresServiceAccountImpersonationIntegrationTests {
   private static final String CONNECTION_NAME = System.getenv("POSTGRES_CONNECTION_NAME");
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String IMPERSONATED_USER = System.getenv("IMPERSONATED_USER");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_DB", "POSTGRES_CONNECTION_NAME", "IMPERSONATED_USER");
@@ -74,6 +76,7 @@ public void setUpPool() throws SQLException {
     connProps.setProperty("password", "password");
     connProps.setProperty("sslmode", "disable");
     connProps.setProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
+    connProps.setProperty("ipTypes", IP_TYPE);
     connProps.setProperty("cloudSqlInstance", CONNECTION_NAME);
     connProps.setProperty("enableIamAuth", "true");
 
diff --git a/jdbc/sqlserver/src/test/java/com/google/cloud/sql/sqlserver/JdbcSqlServerIntegrationTests.java b/jdbc/sqlserver/src/test/java/com/google/cloud/sql/sqlserver/JdbcSqlServerIntegrationTests.java
@@ -41,6 +41,10 @@ public class JdbcSqlServerIntegrationTests {
   private static final String DB_NAME = System.getenv("SQLSERVER_DB");
   private static final String DB_USER = System.getenv("SQLSERVER_USER");
   private static final String DB_PASSWORD = System.getenv("SQLSERVER_PASS");
+  private static final String IP_TYPE =
+      System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
+  private static final String CONNECTION_NAME_WITH_IP_TYPE =
+      CONNECTION_NAME + "?ipTypes=" + IP_TYPE;
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of(
           "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB", "SQLSERVER_CONNECTION_NAME");
@@ -72,7 +76,7 @@ public void setUpPool() throws SQLException {
 
     config.addDataSourceProperty(
         "socketFactoryClass", "com.google.cloud.sql.sqlserver.SocketFactory");
-    config.addDataSourceProperty("socketFactoryConstructorArg", CONNECTION_NAME);
+    config.addDataSourceProperty("socketFactoryConstructorArg", CONNECTION_NAME_WITH_IP_TYPE);
     config.addDataSourceProperty("encrypt", "false");
     config.setConnectionTimeout(30000); // 30s
     config.setInitializationFailTimeout(10000);
diff --git a/r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIamAuthIntegrationTests.java b/r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIamAuthIntegrationTests.java
diff --git a/r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIntegrationTests.java b/r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIntegrationTests.java
diff --git a/r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIamAuthIntegrationTests.java b/r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIamAuthIntegrationTests.java
diff --git a/r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIntegrationTests.java b/r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIntegrationTests.java
diff --git a/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIamAuthIntegrationTests.java b/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIamAuthIntegrationTests.java
diff --git a/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIntegrationTests.java b/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIntegrationTests.java
diff --git a/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresPoolRemoteValidationIntegrationTests.java b/r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresPoolRemoteValidationIntegrationTests.java
diff --git a/r2dbc/sqlserver/src/test/java/com/google/cloud/sql/core/R2dbcSqlserverIntegrationTests.java b/r2dbc/sqlserver/src/test/java/com/google/cloud/sql/core/R2dbcSqlserverIntegrationTests.java
