chore: update ip type param

Author: kgala2

.cl/cloudbuild.yaml

@@ -16,7 +16,9 @@ steps:
   - id: run-tests
     name: python:3.10
     entrypoint: bash
-    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_PASS_VALID_DOMAIN_NAME","SQLSERVER_CONNECTION_NAME", "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB"]
+    env: 
+      - "IP_TYPE=_IP_TYPE"
+    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_PASS_VALID_DOMAIN_NAME","SQLSERVER_CONNECTION_NAME", "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB","IP_TYPE"]
     args:
       - "-c"
       - |
@@ -62,6 +64,8 @@ availableSecrets:
     env: 'SQLSERVER_PASS'
   - versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest'
     env: 'SQLSERVER_DB'
+substitutions:
+  _IP_TYPE: "private" 
 options:
   dynamicSubstitutions: true
   pool:

tests/system/test_asyncpg_connection.py

@@ -87,7 +87,9 @@ async def create_sqlalchemy_engine(
             user=user,
             password=password,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
         ),
         execution_options={"isolation_level": "AUTOCOMMIT"},
     )
@@ -145,7 +147,9 @@ async def getconn(
             user=user,
             password=password,
             db=db,
-            ip_type="public",  # can also be "private" or "psc",
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can also be "private" or "psc",
             **kwargs,
         )
         return conn

tests/system/test_asyncpg_iam_auth.py

@@ -71,7 +71,9 @@ async def create_sqlalchemy_engine(
             "asyncpg",
             user=user,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
             enable_iam_auth=True,
         ),
         execution_options={"isolation_level": "AUTOCOMMIT"},

tests/system/test_pg8000_connection.py

@@ -85,7 +85,9 @@ def create_sqlalchemy_engine(
             user=user,
             password=password,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
         ),
     )
     return engine, connector

tests/system/test_pg8000_iam_auth.py

@@ -70,7 +70,9 @@ def create_sqlalchemy_engine(
             "pg8000",
             user=user,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
             enable_iam_auth=True,
         ),
     )

tests/system/test_pymysql_connection.py

@@ -75,7 +75,9 @@ def create_sqlalchemy_engine(
             user=user,
             password=password,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
         ),
     )
     return engine, connector

tests/system/test_pymysql_iam_auth.py

@@ -70,7 +70,9 @@ def create_sqlalchemy_engine(
             "pymysql",
             user=user,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
             enable_iam_auth=True,
         ),
     )

tests/system/test_pytds_connection.py

@@ -73,7 +73,9 @@ def create_sqlalchemy_engine(
             user=user,
             password=password,
             db=db,
-            ip_type="public",  # can also be "private" or "psc"
+            ip_type=os.environ.get(
+                "IP_TYPE", "public"
+            ),  # can be "public","private" or "psc"
         ),
     )
     return engine, connector