From 9ba226ebd6b7ecfbf204115864589569c6125758 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Tue, 18 Feb 2025 16:30:07 -0800 Subject: [PATCH 1/9] chore(csql): audit test csql instances --- .github/workflows/tests.yml | 4 ---- tests/system/test_asyncpg_connection.py | 8 ++++---- tests/system/test_pg8000_connection.py | 4 ++-- tests/system/test_pymysql_iam_auth.py | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4218e23b..1062b161 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,12 +68,10 @@ 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_PYTHON 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_PYTHON @@ -91,12 +89,10 @@ jobs: - name: Run 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 }}" diff --git a/tests/system/test_asyncpg_connection.py b/tests/system/test_asyncpg_connection.py index 8de14d57..bc7f3178 100644 --- a/tests/system/test_asyncpg_connection.py +++ b/tests/system/test_asyncpg_connection.py @@ -151,7 +151,7 @@ async def getconn( async def test_sqlalchemy_connection_with_asyncpg() -> None: """Basic test to get time from database.""" - inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -167,7 +167,7 @@ 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_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -185,7 +185,7 @@ 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_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -201,7 +201,7 @@ 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_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] diff --git a/tests/system/test_pg8000_connection.py b/tests/system/test_pg8000_connection.py index b56a8e82..2813b25e 100644 --- a/tests/system/test_pg8000_connection.py +++ b/tests/system/test_pg8000_connection.py @@ -91,7 +91,7 @@ def getconn() -> pg8000.dbapi.Connection: def test_pg8000_connection() -> None: """Basic test to get time from database.""" - inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -107,7 +107,7 @@ def test_pg8000_connection() -> None: def test_lazy_pg8000_connection() -> None: """Basic test to get time from database.""" - inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"] + inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"] user = os.environ["POSTGRES_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] diff --git a/tests/system/test_pymysql_iam_auth.py b/tests/system/test_pymysql_iam_auth.py index 80a10a13..9a617b6f 100644 --- a/tests/system/test_pymysql_iam_auth.py +++ b/tests/system/test_pymysql_iam_auth.py @@ -84,7 +84,7 @@ def getconn() -> pymysql.Connection: def test_pymysql_iam_authn_connection() -> None: """Basic test to get time from database.""" - inst_conn_name = os.environ["MYSQL_IAM_CONNECTION_NAME"] + inst_conn_name = os.environ["MYSQL_CONNECTION_NAME"] user = os.environ["MYSQL_IAM_USER"] db = os.environ["MYSQL_DB"] @@ -99,7 +99,7 @@ def test_pymysql_iam_authn_connection() -> None: def test_lazy_pymysql_iam_authn_connection() -> None: """Basic test to get time from database.""" - inst_conn_name = os.environ["MYSQL_IAM_CONNECTION_NAME"] + inst_conn_name = os.environ["MYSQL_CONNECTION_NAME"] user = os.environ["MYSQL_IAM_USER"] db = os.environ["MYSQL_DB"] From 1cbfb1c18e9232aec1462fac9709a96b974d9d2d Mon Sep 17 00:00:00 2001 From: kgala2 Date: Wed, 19 Feb 2025 13:02:09 -0800 Subject: [PATCH 2/9] chore(csql): update postgres user for pg connection --- tests/system/test_asyncpg_connection.py | 8 ++++---- tests/system/test_pg8000_connection.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/system/test_asyncpg_connection.py b/tests/system/test_asyncpg_connection.py index bc7f3178..65ccc4bd 100644 --- a/tests/system/test_asyncpg_connection.py +++ b/tests/system/test_asyncpg_connection.py @@ -152,7 +152,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -168,7 +168,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -186,7 +186,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -202,7 +202,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] diff --git a/tests/system/test_pg8000_connection.py b/tests/system/test_pg8000_connection.py index 2813b25e..a1b237f0 100644 --- a/tests/system/test_pg8000_connection.py +++ b/tests/system/test_pg8000_connection.py @@ -92,7 +92,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] @@ -108,7 +108,7 @@ 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_USER"] + user = os.environ["POSTGRES_IAM_USER"] password = os.environ["POSTGRES_PASS"] db = os.environ["POSTGRES_DB"] From f6fdb844dc425152a93e1080b6e13c9e5dba911e Mon Sep 17 00:00:00 2001 From: kgala2 Date: Wed, 19 Feb 2025 14:15:44 -0800 Subject: [PATCH 3/9] chore(csql): update instance secrets for tests --- .github/workflows/tests.yml | 4 ++-- CONTRIBUTING.md | 2 +- tests/system/test_asyncpg_connection.py | 16 ++++++++-------- tests/system/test_asyncpg_iam_auth.py | 4 ++-- tests/system/test_pg8000_connection.py | 8 ++++---- tests/system/test_pg8000_iam_auth.py | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1062b161..e710138f 100644 --- a/.github/workflows/tests.yml +++ b/.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 }}" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df5533c8..59966376 100644 --- a/CONTRIBUTING.md +++ b/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="::" +export POSTGRES_CONNECTION_NAME="::" # IAM Principal of ADC sourced credentials export POSTGRES_IAM_USER="test-user@gmail.com" diff --git a/tests/system/test_asyncpg_connection.py b/tests/system/test_asyncpg_connection.py index 65ccc4bd..8de14d57 100644 --- a/tests/system/test_asyncpg_connection.py +++ b/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"] diff --git a/tests/system/test_asyncpg_iam_auth.py b/tests/system/test_asyncpg_iam_auth.py index 103efd1a..6e96d96b 100644 --- a/tests/system/test_asyncpg_iam_auth.py +++ b/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"] diff --git a/tests/system/test_pg8000_connection.py b/tests/system/test_pg8000_connection.py index a1b237f0..b56a8e82 100644 --- a/tests/system/test_pg8000_connection.py +++ b/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"] diff --git a/tests/system/test_pg8000_iam_auth.py b/tests/system/test_pg8000_iam_auth.py index 60d2974f..9a8607bc 100644 --- a/tests/system/test_pg8000_iam_auth.py +++ b/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"] From 8adf3e4c6f7f85023f7d8a682212cb213e55256b Mon Sep 17 00:00:00 2001 From: kgala2 Date: Wed, 19 Feb 2025 14:34:05 -0800 Subject: [PATCH 4/9] chore(csql): edit pg iam user --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e710138f..d3938d3b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB 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_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME From d8e698025443fb8db8b6d822f6eb0d37fc0464b2 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Wed, 19 Feb 2025 14:50:46 -0800 Subject: [PATCH 5/9] chore(csql): update iam user as impersonated user --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d3938d3b..ac626e5e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB 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 + POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/IMPERSONATED_USER POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME From ea332fde15339fa265ec62734e9f51797faedec2 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Wed, 19 Feb 2025 14:52:40 -0800 Subject: [PATCH 6/9] chore(csql): update pg iam user --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ac626e5e..d9e8cb03 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB 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 }}/IMPERSONATED_USER + POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_GO POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME From 93810cdb1bfe56f06b794c59ea5262014208de92 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Thu, 20 Feb 2025 10:20:36 -0800 Subject: [PATCH 7/9] chore(csl): update iam user to pg python iam user --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9e8cb03..e710138f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB 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_GO + POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_PYTHON POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB POSTGRES_CAS_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CAS_CONNECTION_NAME From c8de1d53a66d2182050f24834b10e9eab010eb18 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Fri, 21 Feb 2025 10:39:51 -0800 Subject: [PATCH 8/9] chore(csql): remove duplicate export statements for iam connections --- CONTRIBUTING.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 59966376..33eae3b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,9 +61,6 @@ export MYSQL_CONNECTION_NAME="::" export MYSQL_USER="db_user" export MYSQL_PASS="db_pass" export MYSQL_DB="db_name" -# MySQL instance with IAM authentication enabled -# (can be same as MYSQL_CONNECTION_NAME) -export MYSQL_IAM_CONNECTION_NAME="::" # IAM Principal of ADC sourced credentials (truncated) export MYSQL_IAM_USER="test-user@gmail.com" @@ -71,9 +68,6 @@ export POSTGRES_CONNECTION_NAME="::" export POSTGRES_USER="db_user" 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_CONNECTION_NAME="::" # IAM Principal of ADC sourced credentials export POSTGRES_IAM_USER="test-user@gmail.com" From 3cadfdc6dc9e30a77314d65d586aa35104d9dab3 Mon Sep 17 00:00:00 2001 From: kgala2 Date: Mon, 24 Feb 2025 14:10:24 -0800 Subject: [PATCH 9/9] chore: update instance connection name comment --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 33eae3b7..43ece895 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,7 @@ To run all integration tests against real Cloud SQL instances 1. Once created, set the following environment variables: ```sh +# MySQL instance with IAM authentication enabled export MYSQL_CONNECTION_NAME="::" export MYSQL_USER="db_user" export MYSQL_PASS="db_pass" @@ -64,6 +65,7 @@ export MYSQL_DB="db_name" # IAM Principal of ADC sourced credentials (truncated) export MYSQL_IAM_USER="test-user@gmail.com" +# Postgres instance with IAM authentication enabled export POSTGRES_CONNECTION_NAME="::" export POSTGRES_USER="db_user" export POSTGRES_PASS="db_pass"