Skip to content

chore: audit csql test instances #2117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kgala2 merged 9 commits into from
Mar 7, 2025
Merged

chore: audit csql test instances #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e79e0d
chore(csql): update mysql iam reference
kgala2 Feb 20, 2025
0505135
chore(csql): update pg iam instance reference
kgala2 Feb 20, 2025
3cfa5f1
chore(csql): test integration tests with r2dbciam unchanged
kgala2 Feb 20, 2025
11d2ff7
chore(csql): test pg-iam conn for r2dbc with pg conn name
kgala2 Feb 21, 2025
2dd23f6
chore(csql): fix r2dbc iam pg format
kgala2 Feb 21, 2025
950319c
chore: add MySQL Java IAM conn secret
kgala2 Feb 25, 2025
4b03967
chore: remove mysql iam conn name and test if graalvm tests are affected
kgala2 Mar 6, 2025
2eec1ad
chore: restore graalvm test execution logic
kgala2 Mar 7, 2025
9d1f402
Merge branch 'main' into audit-csql-instances
jackwotherspoon Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}"
Expand Down Expand Up @@ -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
Copy link
Copy Markdown
Collaborator

@jackwotherspoon jackwotherspoon Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be a breaking change... this GraalVM test only runs nightly and not on PRs. It seems to use 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
Expand All @@ -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 }}"
Expand Down
4 changes: 2 additions & 2 deletions ...ariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
4 changes: 2 additions & 2 deletions ...com/google/cloud/sql/mysql/JdbcMysqlJ8IAMServiceAccountImpersonationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;

Expand Down
4 changes: 2 additions & 2 deletions ...ysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;

Expand Down
4 changes: 2 additions & 2 deletions ...gres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/com/google/cloud/sql/postgres/JdbcPostgresNamedConnectorIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
4 changes: 2 additions & 2 deletions .../com/google/cloud/sql/postgres/JdbcPostgresQuotaProjecImpersonationtIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjectIAMAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
4 changes: 2 additions & 2 deletions ...om/google/cloud/sql/postgres/JdbcPostgresServiceAccountImpersonationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;

Expand Down
4 changes: 2 additions & 2 deletions .../mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
public class R2dbcMariadbIamAuthIntegrationTests {

private static final ImmutableList<String> 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");

Expand Down
4 changes: 2 additions & 2 deletions r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
public class R2dbcMysqlIamAuthIntegrationTests {

private static final ImmutableList<String> 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");

Expand Down
5 changes: 2 additions & 3 deletions ...ostgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIamAuthIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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;
Expand Down
Loading