Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}"
Expand Down Expand Up @@ -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
Expand All @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/mysql2/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/mysql2/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/mysql2/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/pg/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/pg/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/knex/pg/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/mysql/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/mysql/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/mysql/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/postgresql/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/postgresql/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/prisma/postgresql/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/mysql2/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/mysql2/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/mysql2/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/pg/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/pg/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sequelize/pg/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/mysql2/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/mysql2/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/mysql2/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/pg/test/connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/pg/test/connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion examples/typeorm/pg/test/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/mysql2-connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/mysql2-connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/mysql2-connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/pg-connect.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/pg-connect.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});
Expand Down
2 changes: 1 addition & 1 deletion system-test/pg-connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
Loading