diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 330df6a0b..5ad020ba9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -130,10 +130,8 @@ jobs: MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB - MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_JAVA_IAM_CONNECTION_NAME MYSQL_IAM_USER_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME - POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS @@ -156,10 +154,8 @@ jobs: MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}" MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}" MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}" - MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}" MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER_JAVA }}" POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}" - POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}" POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}" POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}" POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}" @@ -241,10 +237,8 @@ jobs: MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB - MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_JAVA_IAM_CONNECTION_NAME MYSQL_IAM_USER_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME - POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS @@ -268,10 +262,8 @@ jobs: MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}" MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}" MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}" - MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}" MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER_JAVA }}" POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}" - POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}" POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}" POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}" POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}" 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 index 0b2b35f36..4996e20f1 100644 --- 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 @@ -38,11 +38,11 @@ @RunWith(JUnit4.class) public class JdbcMariaDBIamAuthIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME"); + 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 ImmutableList requiredEnvVars = - ImmutableList.of("MYSQL_IAM_CONNECTION_NAME", "MYSQL_DB", "MYSQL_IAM_USER"); + ImmutableList.of("MYSQL_CONNECTION_NAME", "MYSQL_DB", "MYSQL_IAM_USER"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index c9c730954..f77c30dfc 100644 --- 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 @@ -38,12 +38,12 @@ @RunWith(JUnit4.class) public class JdbcMysqlJ8IAMServiceAccountImpersonationIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME"); + 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 ImmutableList requiredEnvVars = - ImmutableList.of("MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME", "IMPERSONATED_USER"); + ImmutableList.of("MYSQL_DB", "MYSQL_CONNECTION_NAME", "IMPERSONATED_USER"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index 8606eb224..0846e8e3d 100644 --- 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 @@ -38,12 +38,12 @@ @RunWith(JUnit4.class) public class JdbcMysqlJ8IamAuthIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME"); + 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 ImmutableList requiredEnvVars = - ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME"); + ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_CONNECTION_NAME"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index a64cbba0f..8e5c1c69b 100644 --- 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 @@ -47,12 +47,12 @@ public class JdbcPostgresIamAuthIntegrationTests { LoggerFactory.getLogger(JdbcPostgresIamAuthIntegrationTests.class); // [START cloud_sql_connector_postgres_jdbc_iam_auth] - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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"); // [END cloud_sql_connector_postgres_jdbc_iam_auth] private static final ImmutableList requiredEnvVars = - ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME"); + ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index c48baa805..00704bcff 100644 --- 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 @@ -44,11 +44,11 @@ @RunWith(JUnit4.class) public class JdbcPostgresNamedConnectorIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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 ImmutableList requiredEnvVars = - ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME"); + ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index dc9041f32..98271e57b 100644 --- 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 @@ -38,14 +38,14 @@ @RunWith(JUnit4.class) public class JdbcPostgresQuotaProjecImpersonationtIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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 QUOTA_PROJECT = System.getenv("QUOTA_PROJECT"); private static final ImmutableList requiredEnvVars = ImmutableList.of( - "IMPERSONATED_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME", "QUOTA_PROJECT"); + "IMPERSONATED_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME", "QUOTA_PROJECT"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index d27dad233..c487c87ad 100644 --- 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 @@ -38,14 +38,14 @@ @RunWith(JUnit4.class) public class JdbcPostgresQuotaProjectIAMAuthIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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 QUOTA_PROJECT = System.getenv("QUOTA_PROJECT"); private static final ImmutableList requiredEnvVars = ImmutableList.of( - "POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME", "QUOTA_PROJECT"); + "POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME", "QUOTA_PROJECT"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index b95b537a2..dd88cc147 100644 --- 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 @@ -42,12 +42,12 @@ @RunWith(JUnit4.class) public class JdbcPostgresServiceAccountImpersonationIntegrationTests { - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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 ImmutableList requiredEnvVars = - ImmutableList.of("POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME", "IMPERSONATED_USER"); + ImmutableList.of("POSTGRES_DB", "POSTGRES_CONNECTION_NAME", "IMPERSONATED_USER"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private HikariDataSource connectionPool; 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 index 28696d570..8c2fa540d 100644 --- 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 @@ -46,9 +46,9 @@ public class R2dbcMariadbIamAuthIntegrationTests { private static final ImmutableList requiredEnvVars = - ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME"); + ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_CONNECTION_NAME"); - private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME"); + 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"); 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 index f451ba0bd..cdb982ece 100644 --- 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 @@ -46,9 +46,9 @@ public class R2dbcMysqlIamAuthIntegrationTests { private static final ImmutableList requiredEnvVars = - ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME"); + ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_CONNECTION_NAME"); - private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME"); + 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"); 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 index 72caf7bec..41d320636 100644 --- 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 @@ -47,13 +47,12 @@ public class R2dbcPostgresIamAuthIntegrationTests { // [START cloud_sql_connector_postgres_r2dbc_iam_auth] - private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME"); + 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"); // [END cloud_sql_connector_postgres_r2dbc_iam_auth] private static final ImmutableList requiredEnvVars = - ImmutableList.of( - "POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME"); + ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME"); @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS); private ConnectionFactory connectionPool;