Skip to content

Commit 3d8c3ac

Browse files
kgala2kgala2
authored
test: update ip type for connectors (#433)
1 parent 9427007 commit 3d8c3ac

10 files changed

+28
-11
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
!/.trampolinerc
2323
!/.kokoro
2424
!/tsconfig*.json
25+
!/.ci

‎system-test/mysql2-connect.cjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ t.test('open connection and run basic mysql commands', async t => {
2020
const connector = new Connector();
2121
const clientOpts = await connector.getOptions({
2222
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
23-
ipType: 'PUBLIC',
23+
ipType: process.env.IP_TYPE || 'PUBLIC',
2424
authType: 'PASSWORD',
2525
});
2626
const conn = await mysql.createConnection({
@@ -42,7 +42,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
4242
const connector = new Connector();
4343
const clientOpts = await connector.getOptions({
4444
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
45-
ipType: 'PUBLIC',
45+
ipType: process.env.IP_TYPE || 'PUBLIC',
4646
authType: 'IAM',
4747
});
4848
const conn = await mysql.createConnection({

‎system-test/mysql2-connect.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ t.test('open connection and run basic mysql commands', async t => {
2020
const connector = new Connector();
2121
const clientOpts = await connector.getOptions({
2222
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
23-
ipType: 'PUBLIC',
23+
ipType: process.env.IP_TYPE || 'PUBLIC',
2424
authType: 'PASSWORD',
2525
});
2626
const conn = await mysql.createConnection({
@@ -42,7 +42,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
4242
const connector = new Connector();
4343
const clientOpts = await connector.getOptions({
4444
instanceConnectionName: process.env.MYSQL_CONNECTION_NAME,
45-
ipType: 'PUBLIC',
45+
ipType: process.env.IP_TYPE || 'PUBLIC',
4646
authType: 'IAM',
4747
});
4848
const conn = await mysql.createConnection({

‎system-test/mysql2-connect.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ t.test('open connection and run basic mysql commands', async t => {
2929
const connector = new Connector();
3030
const clientOpts = await connector.getOptions({
3131
instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
32+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
3233
});
3334
const conn = await mysql.createConnection({
3435
...clientOpts,
@@ -50,7 +51,7 @@ t.test('open IAM connection and run basic mysql commands', async t => {
5051
const connector = new Connector();
5152
const clientOpts = await connector.getOptions({
5253
instanceConnectionName: String(process.env.MYSQL_CONNECTION_NAME),
53-
ipType: IpAddressTypes.PUBLIC,
54+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
5455
authType: AuthTypes.IAM,
5556
});
5657
const conn = await mysql.createConnection({

‎system-test/pg-connect.cjs

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
2121
const connector = new Connector();
2222
const clientOpts = await connector.getOptions({
2323
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
24+
ipType: process.env.IP_TYPE || 'PUBLIC',
2425
});
2526
const client = new Client({
2627
...clientOpts,
@@ -49,7 +50,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
4950
const connector = new Connector();
5051
const clientOpts = await connector.getOptions({
5152
instanceConnectionName: process.env.POSTGRES_CONNECTION_NAME,
52-
ipType: 'PUBLIC',
53+
ipType: process.env.IP_TYPE || 'PUBLIC',
5354
authType: 'IAM',
5455
});
5556
const client = new Client({
@@ -79,6 +80,7 @@ t.test(
7980
const connector = new Connector();
8081
const clientOpts = await connector.getOptions({
8182
instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
83+
ipType: process.env.IP_TYPE || 'PUBLIC',
8284
});
8385
const client = new Client({
8486
...clientOpts,
@@ -112,6 +114,7 @@ t.test(
112114
instanceConnectionName: String(
113115
process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
114116
),
117+
ipType: process.env.IP_TYPE || 'PUBLIC',
115118
});
116119
const client = new Client({
117120
...clientOpts,
@@ -142,6 +145,7 @@ t.test(
142145
const connector = new Connector();
143146
const clientOpts = await connector.getOptions({
144147
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
148+
ipType: process.env.IP_TYPE || 'PUBLIC',
145149
});
146150
const client = new Client({
147151
...clientOpts,
@@ -172,6 +176,7 @@ t.test(
172176
const connector = new Connector();
173177
const clientOpts = await connector.getOptions({
174178
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
179+
ipType: process.env.IP_TYPE || 'PUBLIC',
175180
});
176181
const client = new Client({
177182
...clientOpts,

‎system-test/pg-connect.mjs

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
2222
const connector = new Connector();
2323
const clientOpts = await connector.getOptions({
2424
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
25+
ipType: process.env.IP_TYPE || 'PUBLIC',
2526
});
2627
const client = new Client({
2728
...clientOpts,
@@ -50,7 +51,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
5051
const connector = new Connector();
5152
const clientOpts = await connector.getOptions({
5253
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
53-
ipType: 'PUBLIC',
54+
ipType: process.env.IP_TYPE || 'PUBLIC',
5455
authType: 'IAM',
5556
});
5657
const client = new Client({
@@ -80,6 +81,7 @@ t.test(
8081
const connector = new Connector();
8182
const clientOpts = await connector.getOptions({
8283
instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
84+
ipType: process.env.IP_TYPE || 'PUBLIC',
8385
});
8486
const client = new Client({
8587
...clientOpts,
@@ -113,6 +115,7 @@ t.test(
113115
instanceConnectionName: String(
114116
process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
115117
),
118+
ipType: process.env.IP_TYPE || 'PUBLIC',
116119
});
117120
const client = new Client({
118121
...clientOpts,
@@ -143,6 +146,7 @@ t.test(
143146
const connector = new Connector();
144147
const clientOpts = await connector.getOptions({
145148
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
149+
ipType: process.env.IP_TYPE || 'PUBLIC',
146150
});
147151
const client = new Client({
148152
...clientOpts,
@@ -173,6 +177,7 @@ t.test(
173177
const connector = new Connector();
174178
const clientOpts = await connector.getOptions({
175179
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
180+
ipType: process.env.IP_TYPE || 'PUBLIC',
176181
});
177182
const client = new Client({
178183
...clientOpts,

‎system-test/pg-connect.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ t.test('open connection and retrieves standard pg tables', async t => {
2525
const connector = new Connector();
2626
const clientOpts = await connector.getOptions({
2727
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
28+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
2829
});
2930
const client = new Client({
3031
...clientOpts,
@@ -53,7 +54,7 @@ t.test('open IAM connection and retrieves standard pg tables', async t => {
5354
const connector = new Connector();
5455
const clientOpts = await connector.getOptions({
5556
instanceConnectionName: String(process.env.POSTGRES_CONNECTION_NAME),
56-
ipType: IpAddressTypes.PUBLIC,
57+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
5758
authType: AuthTypes.IAM,
5859
});
5960
const client = new Client({
@@ -83,6 +84,7 @@ t.test(
8384
const connector = new Connector();
8485
const clientOpts = await connector.getOptions({
8586
instanceConnectionName: String(process.env.POSTGRES_CAS_CONNECTION_NAME),
87+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
8688
});
8789
const client = new Client({
8890
...clientOpts,
@@ -116,6 +118,7 @@ t.test(
116118
instanceConnectionName: String(
117119
process.env.POSTGRES_CUSTOMER_CAS_CONNECTION_NAME
118120
),
121+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
119122
});
120123
const client = new Client({
121124
...clientOpts,
@@ -146,6 +149,7 @@ t.test(
146149
const connector = new Connector();
147150
const clientOpts = await connector.getOptions({
148151
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_DOMAIN_NAME),
152+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
149153
});
150154
const client = new Client({
151155
...clientOpts,
@@ -176,6 +180,7 @@ t.test(
176180
const connector = new Connector();
177181
const clientOpts = await connector.getOptions({
178182
domainName: String(process.env.POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME),
183+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
179184
});
180185
const client = new Client({
181186
...clientOpts,

‎system-test/tedious-connect.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
2020
const connector = new Connector();
2121
const clientOpts = await connector.getTediousOptions({
2222
instanceConnectionName: process.env.SQLSERVER_CONNECTION_NAME,
23-
ipType: 'PUBLIC',
23+
ipType: process.env.IP_TYPE || 'PUBLIC',
2424
});
2525
const connection = new Connection({
2626
server: '0.0.0.0',

‎system-test/tedious-connect.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
2020
const connector = new Connector();
2121
const clientOpts = await connector.getTediousOptions({
2222
instanceConnectionName: process.env.SQLSERVER_CONNECTION_NAME,
23-
ipType: 'PUBLIC',
23+
ipType: process.env.IP_TYPE || 'PUBLIC',
2424
});
2525
const connection = new Connection({
2626
server: '0.0.0.0',

‎system-test/tedious-connect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ t.test('open connection and run basic sqlserver commands', async t => {
2020
const connector = new Connector();
2121
const clientOpts = await connector.getTediousOptions({
2222
instanceConnectionName: String(process.env.SQLSERVER_CONNECTION_NAME),
23-
ipType: IpAddressTypes.PUBLIC,
23+
ipType: process.env.IP_TYPE || IpAddressTypes.PUBLIC,
2424
});
2525
const connection = new Connection({
2626
server: '0.0.0.0',

0 commit comments

Comments
 (0)