Skip to content

Commit 0d0adaf

Browse files
kgala2kgala2
authored
chore: audit test csql instances (#418)
1 parent 551ceeb commit 0d0adaf

31 files changed

+30
-38
lines changed

‎.github/workflows/tests.yml

-8
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,11 @@ jobs:
148148
with:
149149
secrets: |-
150150
MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
151-
MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_IAM_CONNECTION_NAME
152151
MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
153152
MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_NODE
154153
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
155154
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
156155
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
157-
POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
158156
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
159157
POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_NODE
160158
POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
@@ -177,13 +175,11 @@ jobs:
177175
- name: Run System Tests
178176
env:
179177
MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
180-
MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
181178
MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
182179
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
183180
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
184181
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
185182
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
186-
POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
187183
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
188184
POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}"
189185
POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}"
@@ -273,13 +269,11 @@ jobs:
273269
with:
274270
secrets: |-
275271
MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
276-
MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_IAM_CONNECTION_NAME
277272
MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
278273
MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_NODE
279274
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
280275
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
281276
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
282-
POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
283277
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
284278
POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_NODE
285279
POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
@@ -292,13 +286,11 @@ jobs:
292286
- name: Run Sample Tests
293287
env:
294288
MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
295-
MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
296289
MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
297290
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
298291
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
299292
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
300293
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
301-
POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
302294
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
303295
POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}"
304296
POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}"

‎examples/knex/mysql2/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
1717

1818
t.test('mysql knex cjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
user: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/knex/mysql2/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('mysql knex mjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
user: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/knex/mysql2/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('mysql knex ts', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
user: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/knex/pg/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
1717

1818
t.test('pg knex cjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
user: process.env.POSTGRES_IAM_USER,
2222
databaseName: process.env.POSTGRES_DB,
2323
});

‎examples/knex/pg/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('pg knex mjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
user: process.env.POSTGRES_IAM_USER,
2222
databaseName: process.env.POSTGRES_DB,
2323
});

‎examples/knex/pg/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('pg knex ts', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: String(process.env.POSTGRES_IAM_CONNECTION_NAME),
20+
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
2121
user: String(process.env.POSTGRES_IAM_USER),
2222
databaseName: String(process.env.POSTGRES_DB),
2323
});

‎examples/prisma/mysql/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ t.test('mysql prisma cjs', async t => {
3030

3131
const {connect} = require('../connect.cjs');
3232
const {prisma, close} = await connect({
33-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
33+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
3434
user: process.env.MYSQL_IAM_USER,
3535
database: process.env.MYSQL_DB,
3636
});

‎examples/prisma/mysql/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ t.test('mysql prisma mjs', async t => {
3333

3434
const { connect } = await import('../connect.mjs');
3535
const { prisma, close } = await connect({
36-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
36+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
3737
user: process.env.MYSQL_IAM_USER,
3838
database: process.env.MYSQL_DB,
3939
});

‎examples/prisma/mysql/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ t.test('mysql prisma ts', async t => {
3232
default: {connect},
3333
} = await import('../connect.ts');
3434
const {prisma, close} = await connect({
35-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
35+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
3636
user: process.env.MYSQL_IAM_USER,
3737
database: process.env.MYSQL_DB,
3838
});

‎examples/prisma/postgresql/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ t.test('pg prisma cjs', async t => {
3030

3131
const {connect} = require('../connect.cjs');
3232
const {prisma, close} = await connect({
33-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
33+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
3434
user: process.env.POSTGRES_IAM_USER,
3535
database: process.env.POSTGRES_DB,
3636
});

‎examples/prisma/postgresql/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ t.test('pg prisma mjs', async t => {
3333

3434
const { connect } = await import('../connect.mjs');
3535
const { prisma, close } = await connect({
36-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
36+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
3737
user: process.env.POSTGRES_IAM_USER,
3838
database: process.env.POSTGRES_DB,
3939
});

‎examples/prisma/postgresql/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ t.test('pg prisma ts', async t => {
3232
default: {connect},
3333
} = await import('../connect.ts');
3434
const {prisma, close} = await connect({
35-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
35+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
3636
user: process.env.POSTGRES_IAM_USER,
3737
database: process.env.POSTGRES_DB,
3838
});

‎examples/sequelize/mysql2/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
1717

1818
t.test('mysql sequelize cjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/sequelize/mysql2/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('mysql sequelize mjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/sequelize/mysql2/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('mysql sequelize ts', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
databaseName: process.env.MYSQL_DB,
2323
});

‎examples/sequelize/pg/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
1717

1818
t.test('pg sequelize cjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
databaseName: process.env.POSTGRES_DB,
2323
});

‎examples/sequelize/pg/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('pg sequelize mjs', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
databaseName: process.env.POSTGRES_DB,
2323
});

‎examples/sequelize/pg/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('pg sequelize ts', async t => {
1919
const {database, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
databaseName: process.env.POSTGRES_DB,
2323
});

‎examples/typeorm/mysql2/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const connector = require('../connect.cjs');
1717

1818
t.test('mysql2 typeorm cjs', async t => {
1919
const { dataSource, close } = await connector.connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
database: process.env.MYSQL_DB,
2323
});

‎examples/typeorm/mysql2/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('mysql2 typeorm mjs', async t => {
1919
const { dataSource, close } = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
database: process.env.MYSQL_DB,
2323
});

‎examples/typeorm/mysql2/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('mysql typeorm ts', async t => {
1919
const {dataSource, close} = await connect({
20-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
2121
username: process.env.MYSQL_IAM_USER,
2222
database: process.env.MYSQL_DB,
2323
});

‎examples/typeorm/pg/test/connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const connector = require('../connect.cjs');
1717

1818
t.test('pg typeorm cjs', async t => {
1919
const { dataSource, close } = await connector.connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
database: process.env.POSTGRES_DB,
2323
});

‎examples/typeorm/pg/test/connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
1717

1818
t.test('pg typeorm mjs', async t => {
1919
const { dataSource, close } = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
database: process.env.POSTGRES_DB,
2323
});

‎examples/typeorm/pg/test/connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {connect} from '../connect';
1717

1818
t.test('pg typeorm ts', async t => {
1919
const {dataSource, close} = await connect({
20-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
20+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
2121
username: process.env.POSTGRES_IAM_USER,
2222
database: process.env.POSTGRES_DB,
2323
});

‎system-test/mysql2-connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ t.test('open connection and run basic mysql commands', async t => {
4141
t.test('open IAM connection and run basic mysql commands', async t => {
4242
const connector = new Connector();
4343
const clientOpts = await connector.getOptions({
44-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
44+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
4545
ipType: 'PUBLIC',
4646
authType: 'IAM',
4747
});

‎system-test/mysql2-connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ t.test('open connection and run basic mysql commands', async t => {
4141
t.test('open IAM connection and run basic mysql commands', async t => {
4242
const connector = new Connector();
4343
const clientOpts = await connector.getOptions({
44-
instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
44+
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
4545
ipType: 'PUBLIC',
4646
authType: 'IAM',
4747
});

‎system-test/mysql2-connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ t.test('open connection and run basic mysql commands', async t => {
4949
t.test('open IAM connection and run basic mysql commands', async t => {
5050
const connector = new Connector();
5151
const clientOpts = await connector.getOptions({
52-
instanceConnectionName: String(process.env.MYSQL_IAM_CONNECTION_NAME),
52+
instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
5353
ipType: IpAddressTypes.PUBLIC,
5454
authType: AuthTypes.IAM,
5555
});

‎system-test/pg-connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
4545
t.test('open IAM connection and retrieves standard pg tables', async t => {
4646
const connector = new Connector();
4747
const clientOpts = await connector.getOptions({
48-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
48+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
4949
ipType: 'PUBLIC',
5050
authType: 'IAM',
5151
});

‎system-test/pg-connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
4545
t.test('open IAM connection and retrieves standard pg tables', async t => {
4646
const connector = new Connector();
4747
const clientOpts = await connector.getOptions({
48-
instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
48+
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
4949
ipType: 'PUBLIC',
5050
authType: 'IAM',
5151
});

‎system-test/pg-connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
4747
t.test('open IAM connection and retrieves standard pg tables', async t => {
4848
const connector = new Connector();
4949
const clientOpts = await connector.getOptions({
50-
instanceConnectionName: String(process.env.POSTGRES_IAM_CONNECTION_NAME),
50+
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
5151
ipType: IpAddressTypes.PUBLIC,
5252
authType: AuthTypes.IAM,
5353
});

0 commit comments

Comments
 (0)