chore: update ipType to env variable

Author: kgala2

.cl/cloudbuild.yaml

@@ -16,6 +16,8 @@ steps:
   - id: run integration tests
     name: node:latest
     entrypoint: bash
+    env: 
+      - "IP_TYPE=PRIVATE"
     secretEnv: ['MYSQL_CONNECTION_NAME', 'MYSQL_USER', 'MYSQL_IAM_USER', 'MYSQL_PASS', 'MYSQL_DB', 'POSTGRES_CONNECTION_NAME', 'POSTGRES_USER', 'POSTGRES_IAM_USER', 'POSTGRES_PASS', 'POSTGRES_DB', 'POSTGRES_CAS_CONNECTION_NAME', 'POSTGRES_CAS_PASS', 'POSTGRES_CUSTOMER_CAS_CONNECTION_NAME', 'POSTGRES_CUSTOMER_CAS_PASS', 'POSTGRES_CUSTOMER_CAS_DOMAIN_NAME', 'POSTGRES_CUSTOMER_CAS_INVALID_DOMAIN_NAME', 'SQLSERVER_CONNECTION_NAME', 'SQLSERVER_USER', 'SQLSERVER_PASS', 'SQLSERVER_DB']
     args:
       - "-c"

README.md

@@ -94,7 +94,7 @@ const {Pool} = pg;
 const connector = new Connector();
 const clientOpts = await connector.getOptions({
   instanceConnectionName: 'my-project:region:my-instance',
-  ipType: 'PUBLIC',
+  ipType: process.env.IP_TYPE || 'PUBLIC',
 });
 const pool = new Pool({
   ...clientOpts,
@@ -122,7 +122,7 @@ import {Connector} from '@google-cloud/cloud-sql-connector';
 const connector = new Connector();
 const clientOpts = await connector.getOptions({
   instanceConnectionName: 'my-project:region:my-instance',
-  ipType: 'PUBLIC',
+  ipType: process.env.IP_TYPE || 'PUBLIC',
 });
 const pool = await mysql.createPool({
   ...clientOpts,
@@ -150,7 +150,7 @@ const {Connector} = require('@google-cloud/cloud-sql-connector');
 const connector = new Connector();
 const clientOpts = await connector.getTediousOptions({
   instanceConnectionName: process.env.SQLSERVER_CONNECTION_NAME,
-  ipType: 'PUBLIC',
+  ipType: process.env.IP_TYPE || 'PUBLIC',
 });
 const connection = new Connection({
   // Please note that the `server` property here is not used and is only defined
@@ -481,7 +481,7 @@ import {Connector} from '@google-cloud/cloud-sql-connector';
 const connector = new Connector();
 const clientOpts = await connector.getOptions({
   domainName: 'prod-db.mycompany.example.com',
-  ipType: 'PUBLIC',
+  ipType: process.env.IP_TYPE || 'PUBLIC',
 });
 
 const pool = await mysql.createPool({

examples/knex/mysql2/connect.cjs

@@ -19,7 +19,7 @@ async function connect({ instanceConnectionName, user, databaseName }) {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
 

examples/knex/mysql2/connect.mjs

@@ -19,7 +19,7 @@ export async function connect({ instanceConnectionName, user, databaseName }) {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
 

examples/knex/pg/connect.cjs

@@ -19,7 +19,7 @@ async function connect({ instanceConnectionName, user, databaseName }) {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
 

examples/knex/pg/connect.mjs

@@ -19,7 +19,7 @@ export async function connect({ instanceConnectionName, user, databaseName }) {
   const connector = new Connector();
   const clientOpts = await connector.getOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
   });
 

examples/knex/tedious/connect.cjs

@@ -19,7 +19,7 @@ async function connect({ instanceConnectionName, user, password, databaseName })
   const connector = new Connector();
   const clientOpts = await connector.getTediousOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'PASSWORD',
   });
 

examples/knex/tedious/connect.mjs

@@ -19,7 +19,7 @@ export async function connect({ instanceConnectionName, user, password, database
   const connector = new Connector();
   const clientOpts = await connector.getTediousOptions({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'PASSWORD',
   });
 

examples/prisma/mysql/connect.cjs

@@ -21,7 +21,7 @@ async function connect({instanceConnectionName, user, database}) {
   const connector = new Connector();
   await connector.startLocalProxy({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
     listenOptions: {path},
   });

examples/prisma/mysql/connect.mjs

@@ -21,7 +21,7 @@ export async function connect({instanceConnectionName, user, database}) {
   const connector = new Connector();
   await connector.startLocalProxy({
     instanceConnectionName,
-    ipType: 'PUBLIC',
+    ipType: process.env.IP_TYPE || 'PUBLIC',
     authType: 'IAM',
     listenOptions: {path},
   });