chore: audit test csql instances (#418)

kgala2 · web-flow · commit 0d0adaff73d6 · 2025-02-26T09:47:56.000-08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -148,13 +148,11 @@ jobs:
         with:
           secrets: |-
             MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
-            MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_IAM_CONNECTION_NAME
             MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
             MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_NODE
             MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
             MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
             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_NODE
             POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
@@ -177,13 +175,11 @@ jobs:
       - name: Run System Tests
         env:
           MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
-          MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
           MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
           MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
           MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
           MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
           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 }}"
@@ -273,13 +269,11 @@ jobs:
         with:
           secrets: |-
             MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
-            MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_IAM_CONNECTION_NAME
             MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
             MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_NODE
             MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
             MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
             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_NODE
             POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
@@ -292,13 +286,11 @@ jobs:
       - name: Run Sample Tests
         env:
           MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
-          MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
           MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
           MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
           MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
           MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
           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/examples/knex/mysql2/test/connect.cjs b/examples/knex/mysql2/test/connect.cjs
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
 
 t.test('mysql knex cjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     user: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/knex/mysql2/test/connect.mjs b/examples/knex/mysql2/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('mysql knex mjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     user: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/knex/mysql2/test/connect.ts b/examples/knex/mysql2/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('mysql knex ts', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     user: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/knex/pg/test/connect.cjs b/examples/knex/pg/test/connect.cjs
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
 
 t.test('pg knex cjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     user: process.env.POSTGRES_IAM_USER,
     databaseName: process.env.POSTGRES_DB,
   });
diff --git a/examples/knex/pg/test/connect.mjs b/examples/knex/pg/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('pg knex mjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     user: process.env.POSTGRES_IAM_USER,
     databaseName: process.env.POSTGRES_DB,
   });
diff --git a/examples/knex/pg/test/connect.ts b/examples/knex/pg/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('pg knex ts', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: String(process.env.POSTGRES_IAM_CONNECTION_NAME),
+    instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
     user: String(process.env.POSTGRES_IAM_USER),
     databaseName: String(process.env.POSTGRES_DB),
   });
diff --git a/examples/prisma/mysql/test/connect.cjs b/examples/prisma/mysql/test/connect.cjs
@@ -30,7 +30,7 @@ t.test('mysql prisma cjs', async t => {
 
   const {connect} = require('../connect.cjs');
   const {prisma, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     user: process.env.MYSQL_IAM_USER,
     database: process.env.MYSQL_DB,
   });
diff --git a/examples/prisma/mysql/test/connect.mjs b/examples/prisma/mysql/test/connect.mjs
@@ -33,7 +33,7 @@ t.test('mysql prisma mjs', async t => {
 
     const { connect } = await import('../connect.mjs');
     const { prisma, close } = await connect({
-        instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+        instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
         user: process.env.MYSQL_IAM_USER,
         database: process.env.MYSQL_DB,
     });
diff --git a/examples/prisma/mysql/test/connect.ts b/examples/prisma/mysql/test/connect.ts
@@ -32,7 +32,7 @@ t.test('mysql prisma ts', async t => {
     default: {connect},
   } = await import('../connect.ts');
   const {prisma, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     user: process.env.MYSQL_IAM_USER,
     database: process.env.MYSQL_DB,
   });
diff --git a/examples/prisma/postgresql/test/connect.cjs b/examples/prisma/postgresql/test/connect.cjs
@@ -30,7 +30,7 @@ t.test('pg prisma cjs', async t => {
 
   const {connect} = require('../connect.cjs');
   const {prisma, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     user: process.env.POSTGRES_IAM_USER,
     database: process.env.POSTGRES_DB,
   });
diff --git a/examples/prisma/postgresql/test/connect.mjs b/examples/prisma/postgresql/test/connect.mjs
@@ -33,7 +33,7 @@ t.test('pg prisma mjs', async t => {
 
     const { connect } = await import('../connect.mjs');
     const { prisma, close } = await connect({
-        instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+        instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
         user: process.env.POSTGRES_IAM_USER,
         database: process.env.POSTGRES_DB,
     });
diff --git a/examples/prisma/postgresql/test/connect.ts b/examples/prisma/postgresql/test/connect.ts
@@ -32,7 +32,7 @@ t.test('pg prisma ts', async t => {
     default: {connect},
   } = await import('../connect.ts');
   const {prisma, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     user: process.env.POSTGRES_IAM_USER,
     database: process.env.POSTGRES_DB,
   });
diff --git a/examples/sequelize/mysql2/test/connect.cjs b/examples/sequelize/mysql2/test/connect.cjs
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
 
 t.test('mysql sequelize cjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/sequelize/mysql2/test/connect.mjs b/examples/sequelize/mysql2/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('mysql sequelize mjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/sequelize/mysql2/test/connect.ts b/examples/sequelize/mysql2/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('mysql sequelize ts', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     databaseName: process.env.MYSQL_DB,
   });
diff --git a/examples/sequelize/pg/test/connect.cjs b/examples/sequelize/pg/test/connect.cjs
@@ -17,7 +17,7 @@ const {connect} = require('../connect.cjs');
 
 t.test('pg sequelize cjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     databaseName: process.env.POSTGRES_DB,
   });
diff --git a/examples/sequelize/pg/test/connect.mjs b/examples/sequelize/pg/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('pg sequelize mjs', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     databaseName: process.env.POSTGRES_DB,
   });
diff --git a/examples/sequelize/pg/test/connect.ts b/examples/sequelize/pg/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('pg sequelize ts', async t => {
   const {database, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     databaseName: process.env.POSTGRES_DB,
   });
diff --git a/examples/typeorm/mysql2/test/connect.cjs b/examples/typeorm/mysql2/test/connect.cjs
@@ -17,7 +17,7 @@ const connector = require('../connect.cjs');
 
 t.test('mysql2 typeorm cjs', async t => {
   const { dataSource, close } = await connector.connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     database: process.env.MYSQL_DB,
   });
diff --git a/examples/typeorm/mysql2/test/connect.mjs b/examples/typeorm/mysql2/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('mysql2 typeorm mjs', async t => {
   const { dataSource, close } = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     database: process.env.MYSQL_DB,
   });
diff --git a/examples/typeorm/mysql2/test/connect.ts b/examples/typeorm/mysql2/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('mysql typeorm ts', async t => {
   const {dataSource, close} = await connect({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     username: process.env.MYSQL_IAM_USER,
     database: process.env.MYSQL_DB,
   });
diff --git a/examples/typeorm/pg/test/connect.cjs b/examples/typeorm/pg/test/connect.cjs
@@ -17,7 +17,7 @@ const connector = require('../connect.cjs');
 
 t.test('pg typeorm cjs', async t => {
   const { dataSource, close } = await connector.connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     database: process.env.POSTGRES_DB,
   });
diff --git a/examples/typeorm/pg/test/connect.mjs b/examples/typeorm/pg/test/connect.mjs
@@ -17,7 +17,7 @@ import {connect} from '../connect.mjs';
 
 t.test('pg typeorm mjs', async t => {
   const { dataSource, close } = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     database: process.env.POSTGRES_DB,
   });
diff --git a/examples/typeorm/pg/test/connect.ts b/examples/typeorm/pg/test/connect.ts
@@ -17,7 +17,7 @@ import {connect} from '../connect';
 
 t.test('pg typeorm ts', async t => {
   const {dataSource, close} = await connect({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     username: process.env.POSTGRES_IAM_USER,
     database: process.env.POSTGRES_DB,
   });
diff --git a/system-test/mysql2-connect.cjs b/system-test/mysql2-connect.cjs
@@ -41,7 +41,7 @@ t.test('open connection and run basic mysql commands', async t => {
 t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     ipType: 'PUBLIC',
     authType: 'IAM',
   });
diff --git a/system-test/mysql2-connect.mjs b/system-test/mysql2-connect.mjs
@@ -41,7 +41,7 @@ t.test('open connection and run basic mysql commands', async t => {
 t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: process.env.MYSQL_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
     ipType: 'PUBLIC',
     authType: 'IAM',
   });
diff --git a/system-test/mysql2-connect.ts b/system-test/mysql2-connect.ts
@@ -49,7 +49,7 @@ t.test('open connection and run basic mysql commands', async t => {
 t.test('open IAM connection and run basic mysql commands', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: String(process.env.MYSQL_IAM_CONNECTION_NAME),
+    instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
     ipType: IpAddressTypes.PUBLIC,
     authType: AuthTypes.IAM,
   });
diff --git a/system-test/pg-connect.cjs b/system-test/pg-connect.cjs
@@ -45,7 +45,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
 t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     ipType: 'PUBLIC',
     authType: 'IAM',
   });
diff --git a/system-test/pg-connect.mjs b/system-test/pg-connect.mjs
@@ -45,7 +45,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
 t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: process.env.POSTGRES_IAM_CONNECTION_NAME,
+    instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
     ipType: 'PUBLIC',
     authType: 'IAM',
   });
diff --git a/system-test/pg-connect.ts b/system-test/pg-connect.ts
@@ -47,7 +47,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
 t.test('open IAM connection and retrieves standard pg tables', async t => {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
-    instanceConnectionName: String(process.env.POSTGRES_IAM_CONNECTION_NAME),
+    instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
     ipType: IpAddressTypes.PUBLIC,
     authType: AuthTypes.IAM,
   });
