chore(csql): update instance secrets for tests

Author: kgala2

.github/workflows/tests.yml

@@ -72,7 +72,7 @@ jobs:
             MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_PYTHON
             MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
             MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
-            POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
+            POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
             POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
             POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_PYTHON
             POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS
@@ -93,7 +93,7 @@ jobs:
           MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
           MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
           MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
-          POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
+          POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_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 }}"

CONTRIBUTING.md

@@ -73,7 +73,7 @@ export POSTGRES_PASS="db_pass"
 export POSTGRES_DB="db_name"
 # Postgres instance with IAM authentication enabled
 # (can be same as POSTGRES_CONNECTION_NAME)
-export POSTGRES_IAM_CONNECTION_NAME="<PROJECT>:<REGION>:<INSTANCE>"
+export POSTGRES_CONNECTION_NAME="<PROJECT>:<REGION>:<INSTANCE>"
 # IAM Principal of ADC sourced credentials
 export POSTGRES_IAM_USER="[email protected]"
 

tests/system/test_asyncpg_connection.py

@@ -151,8 +151,8 @@ async def getconn(
 
 async def test_sqlalchemy_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 
@@ -167,8 +167,8 @@ async def test_sqlalchemy_connection_with_asyncpg() -> None:
 
 async def test_lazy_sqlalchemy_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 
@@ -185,8 +185,8 @@ async def test_lazy_sqlalchemy_connection_with_asyncpg() -> None:
 
 async def test_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 
@@ -201,8 +201,8 @@ async def test_connection_with_asyncpg() -> None:
 
 async def test_lazy_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 

tests/system/test_asyncpg_iam_auth.py

@@ -86,7 +86,7 @@ async def getconn() -> asyncpg.Connection:
 
 async def test_iam_authn_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
     user = os.environ["POSTGRES_IAM_USER"]
     db = os.environ["POSTGRES_DB"]
 
@@ -101,7 +101,7 @@ async def test_iam_authn_connection_with_asyncpg() -> None:
 
 async def test_lazy_iam_authn_connection_with_asyncpg() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
     user = os.environ["POSTGRES_IAM_USER"]
     db = os.environ["POSTGRES_DB"]
 

tests/system/test_pg8000_connection.py

@@ -91,8 +91,8 @@ def getconn() -> pg8000.dbapi.Connection:
 
 def test_pg8000_connection() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 
@@ -107,8 +107,8 @@ def test_pg8000_connection() -> None:
 
 def test_lazy_pg8000_connection() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
-    user = os.environ["POSTGRES_IAM_USER"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
+    user = os.environ["POSTGRES_USER"]
     password = os.environ["POSTGRES_PASS"]
     db = os.environ["POSTGRES_DB"]
 

tests/system/test_pg8000_iam_auth.py

@@ -84,7 +84,7 @@ def getconn() -> pg8000.dbapi.Connection:
 
 def test_pg8000_iam_authn_connection() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
     user = os.environ["POSTGRES_IAM_USER"]
     db = os.environ["POSTGRES_DB"]
 
@@ -99,7 +99,7 @@ def test_pg8000_iam_authn_connection() -> None:
 
 def test_lazy_pg8000_iam_authn_connection() -> None:
     """Basic test to get time from database."""
-    inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
+    inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
     user = os.environ["POSTGRES_IAM_USER"]
     db = os.environ["POSTGRES_DB"]