Skip to content

Commit 46e08ec

Browse files
hessjcghessjcg
committed
wip: Graalvm and build script
1 parent 88631fc commit 46e08ec

File tree

9 files changed

+27
-24
lines changed

9 files changed

+27
-24
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ jobs:
131131
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
132132
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
133133
MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_JAVA_IAM_CONNECTION_NAME
134-
MYSQL_IAM_USER_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA
134+
MYSQL_USER_IAM_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA
135135
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
136136
POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
137137
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
138-
POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA
138+
POSTGRES_USER_IAM_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA
139139
POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
140140
POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB
141141
POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME
@@ -157,11 +157,11 @@ jobs:
157157
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
158158
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
159159
MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
160-
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER_JAVA }}"
160+
MYSQL_USER_IAM_JAVA: "${{ steps.secrets.outputs.MYSQL_USER_IAM_JAVA }}"
161161
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
162162
POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
163163
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
164-
POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}"
164+
POSTGRES_USER_IAM_JAVA: "${{ steps.secrets.outputs.POSTGRES_USER_IAM_JAVA }}"
165165
POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}"
166166
POSTGRES_DB: "${{ steps.secrets.outputs.POSTGRES_DB }}"
167167
POSTGRES_CAS_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CAS_CONNECTION_NAME }}"
@@ -204,7 +204,10 @@ jobs:
204204
./flakybot --repo ${{github.repository}} --commit_hash ${{github.sha}} --build_url https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
205205
graalvm:
206206
# run job on periodic (schedule) event
207-
if: "${{ github.event_name == 'schedule' }}"
207+
if: |
208+
github.event_name == 'schedule' ||
209+
github.event_name != 'pull_request' ||
210+
(github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]')
208211
name: graalvm native / linux
209212
runs-on: ubuntu-latest
210213
permissions:
@@ -242,11 +245,11 @@ jobs:
242245
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
243246
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
244247
MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_JAVA_IAM_CONNECTION_NAME
245-
MYSQL_IAM_USER_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA
248+
MYSQL_USER_IAM_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA
246249
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
247250
POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
248251
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
249-
POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA
252+
POSTGRES_USER_IAM_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA
250253
POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
251254
POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB
252255
POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME
@@ -269,11 +272,11 @@ jobs:
269272
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
270273
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
271274
MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
272-
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER_JAVA }}"
275+
MYSQL_USER_IAM_JAVA: "${{ steps.secrets.outputs.MYSQL_USER_IAM_JAVA }}"
273276
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
274277
POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
275278
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
276-
POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}"
279+
POSTGRES_USER_IAM_JAVA: "${{ steps.secrets.outputs.POSTGRES_USER_IAM_JAVA }}"
277280
POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}"
278281
POSTGRES_DB: "${{ steps.secrets.outputs.POSTGRES_DB }}"
279282
POSTGRES_CAS_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CAS_CONNECTION_NAME }}"

‎jdbc/mariadb/src/test/java/com/google/cloud/sql/mariadb/JdbcMariaDBIamAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public class JdbcMariaDBIamAuthIntegrationTests {
4040

4141
private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME");
4242
private static final String DB_NAME = System.getenv("MYSQL_DB");
43-
private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
43+
private static final String DB_USER = System.getenv("MYSQL_USER_IAM_JAVA");
4444
private static final ImmutableList<String> requiredEnvVars =
45-
ImmutableList.of("MYSQL_IAM_CONNECTION_NAME", "MYSQL_DB", "MYSQL_IAM_USER");
45+
ImmutableList.of("MYSQL_IAM_CONNECTION_NAME", "MYSQL_DB", "MYSQL_USER_IAM_JAVA");
4646
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
4747

4848
private HikariDataSource connectionPool;

‎jdbc/mysql-j-8/src/test/java/com/google/cloud/sql/mysql/JdbcMysqlJ8IamAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public class JdbcMysqlJ8IamAuthIntegrationTests {
4040

4141
private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME");
4242
private static final String DB_NAME = System.getenv("MYSQL_DB");
43-
private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
43+
private static final String DB_USER = System.getenv("MYSQL_USER_IAM_JAVA");
4444

4545
private static final ImmutableList<String> requiredEnvVars =
46-
ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
46+
ImmutableList.of("MYSQL_USER_IAM_JAVA", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
4747
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
4848
private HikariDataSource connectionPool;
4949

‎jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresIamAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public class JdbcPostgresIamAuthIntegrationTests {
4949
// [START cloud_sql_connector_postgres_jdbc_iam_auth]
5050
private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME");
5151
private static final String DB_NAME = System.getenv("POSTGRES_DB");
52-
private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
52+
private static final String DB_USER = System.getenv("POSTGRES_USER_IAM_JAVA");
5353
// [END cloud_sql_connector_postgres_jdbc_iam_auth]
5454
private static final ImmutableList<String> requiredEnvVars =
55-
ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME");
55+
ImmutableList.of("POSTGRES_USER_IAM_JAVA", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME");
5656
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
5757

5858
private HikariDataSource connectionPool;

‎jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresNamedConnectorIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public class JdbcPostgresNamedConnectorIntegrationTests {
4646

4747
private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME");
4848
private static final String DB_NAME = System.getenv("POSTGRES_DB");
49-
private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
49+
private static final String DB_USER = System.getenv("POSTGRES_USER_IAM_JAVA");
5050
private static final ImmutableList<String> requiredEnvVars =
51-
ImmutableList.of("POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME");
51+
ImmutableList.of("POSTGRES_USER_IAM_JAVA", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME");
5252
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
5353

5454
private HikariDataSource connectionPool;

‎jdbc/postgres/src/test/java/com/google/cloud/sql/postgres/JdbcPostgresQuotaProjectIAMAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public class JdbcPostgresQuotaProjectIAMAuthIntegrationTests {
4040

4141
private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME");
4242
private static final String DB_NAME = System.getenv("POSTGRES_DB");
43-
private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
43+
private static final String DB_USER = System.getenv("POSTGRES_USER_IAM_JAVA");
4444
private static final String QUOTA_PROJECT = System.getenv("QUOTA_PROJECT");
4545

4646
private static final ImmutableList<String> requiredEnvVars =
4747
ImmutableList.of(
48-
"POSTGRES_IAM_USER", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME", "QUOTA_PROJECT");
48+
"POSTGRES_USER_IAM_JAVA", "POSTGRES_DB", "POSTGRES_IAM_CONNECTION_NAME", "QUOTA_PROJECT");
4949
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
5050

5151
private HikariDataSource connectionPool;

‎r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIamAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
public class R2dbcMariadbIamAuthIntegrationTests {
4747

4848
private static final ImmutableList<String> requiredEnvVars =
49-
ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
49+
ImmutableList.of("MYSQL_USER_IAM", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
5050

5151
private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME");
5252
private static final String DB_NAME = System.getenv("MYSQL_DB");
53-
private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
53+
private static final String DB_USER = System.getenv("MYSQL_USER_IAM");
5454

5555
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
5656

‎r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIamAuthIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
public class R2dbcMysqlIamAuthIntegrationTests {
4747

4848
private static final ImmutableList<String> requiredEnvVars =
49-
ImmutableList.of("MYSQL_IAM_USER", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
49+
ImmutableList.of("MYSQL_USER_IAM", "MYSQL_DB", "MYSQL_IAM_CONNECTION_NAME");
5050

5151
private static final String CONNECTION_NAME = System.getenv("MYSQL_IAM_CONNECTION_NAME");
5252
private static final String DB_NAME = System.getenv("MYSQL_DB");
53-
private static final String DB_USER = System.getenv("MYSQL_IAM_USER");
53+
private static final String DB_USER = System.getenv("MYSQL_USER_IAM");
5454

5555
@Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
5656

‎r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIamAuthIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class R2dbcPostgresIamAuthIntegrationTests {
4949
// [START cloud_sql_connector_postgres_r2dbc_iam_auth]
5050
private static final String CONNECTION_NAME = System.getenv("POSTGRES_IAM_CONNECTION_NAME");
5151
private static final String DB_NAME = System.getenv("POSTGRES_DB");
52-
private static final String DB_USER = System.getenv("POSTGRES_IAM_USER");
52+
private static final String DB_USER = System.getenv("POSTGRES_USER_IAM_JAVA");
5353
// [END cloud_sql_connector_postgres_r2dbc_iam_auth]
5454
private static final ImmutableList<String> requiredEnvVars =
5555
ImmutableList.of(

0 commit comments

Comments
 (0)