Skip to content

Commit 9ba226e

Browse files
committed
chore(csql): audit test csql instances
1 parent d55ce10 commit 9ba226e

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ jobs:
6868
with:
6969
secrets: |-
7070
MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME
71-
MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_IAM_CONNECTION_NAME
7271
MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
7372
MYSQL_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_PYTHON
7473
MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS
7574
MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB
76-
POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME
7775
POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME
7876
POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER
7977
POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_PYTHON
@@ -91,12 +89,10 @@ jobs:
9189
- name: Run tests
9290
env:
9391
MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}"
94-
MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}"
9592
MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}"
9693
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
9794
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
9895
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
99-
POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}"
10096
POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}"
10197
POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}"
10298
POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}"

tests/system/test_asyncpg_connection.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ async def getconn(
151151

152152
async def test_sqlalchemy_connection_with_asyncpg() -> None:
153153
"""Basic test to get time from database."""
154-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
154+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
155155
user = os.environ["POSTGRES_USER"]
156156
password = os.environ["POSTGRES_PASS"]
157157
db = os.environ["POSTGRES_DB"]
@@ -167,7 +167,7 @@ async def test_sqlalchemy_connection_with_asyncpg() -> None:
167167

168168
async def test_lazy_sqlalchemy_connection_with_asyncpg() -> None:
169169
"""Basic test to get time from database."""
170-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
170+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
171171
user = os.environ["POSTGRES_USER"]
172172
password = os.environ["POSTGRES_PASS"]
173173
db = os.environ["POSTGRES_DB"]
@@ -185,7 +185,7 @@ async def test_lazy_sqlalchemy_connection_with_asyncpg() -> None:
185185

186186
async def test_connection_with_asyncpg() -> None:
187187
"""Basic test to get time from database."""
188-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
188+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
189189
user = os.environ["POSTGRES_USER"]
190190
password = os.environ["POSTGRES_PASS"]
191191
db = os.environ["POSTGRES_DB"]
@@ -201,7 +201,7 @@ async def test_connection_with_asyncpg() -> None:
201201

202202
async def test_lazy_connection_with_asyncpg() -> None:
203203
"""Basic test to get time from database."""
204-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
204+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
205205
user = os.environ["POSTGRES_USER"]
206206
password = os.environ["POSTGRES_PASS"]
207207
db = os.environ["POSTGRES_DB"]

tests/system/test_pg8000_connection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def getconn() -> pg8000.dbapi.Connection:
9191

9292
def test_pg8000_connection() -> None:
9393
"""Basic test to get time from database."""
94-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
94+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
9595
user = os.environ["POSTGRES_USER"]
9696
password = os.environ["POSTGRES_PASS"]
9797
db = os.environ["POSTGRES_DB"]
@@ -107,7 +107,7 @@ def test_pg8000_connection() -> None:
107107

108108
def test_lazy_pg8000_connection() -> None:
109109
"""Basic test to get time from database."""
110-
inst_conn_name = os.environ["POSTGRES_CONNECTION_NAME"]
110+
inst_conn_name = os.environ["POSTGRES_IAM_CONNECTION_NAME"]
111111
user = os.environ["POSTGRES_USER"]
112112
password = os.environ["POSTGRES_PASS"]
113113
db = os.environ["POSTGRES_DB"]

tests/system/test_pymysql_iam_auth.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def getconn() -> pymysql.Connection:
8484

8585
def test_pymysql_iam_authn_connection() -> None:
8686
"""Basic test to get time from database."""
87-
inst_conn_name = os.environ["MYSQL_IAM_CONNECTION_NAME"]
87+
inst_conn_name = os.environ["MYSQL_CONNECTION_NAME"]
8888
user = os.environ["MYSQL_IAM_USER"]
8989
db = os.environ["MYSQL_DB"]
9090

@@ -99,7 +99,7 @@ def test_pymysql_iam_authn_connection() -> None:
9999

100100
def test_lazy_pymysql_iam_authn_connection() -> None:
101101
"""Basic test to get time from database."""
102-
inst_conn_name = os.environ["MYSQL_IAM_CONNECTION_NAME"]
102+
inst_conn_name = os.environ["MYSQL_CONNECTION_NAME"]
103103
user = os.environ["MYSQL_IAM_USER"]
104104
db = os.environ["MYSQL_DB"]
105105

0 commit comments

Comments
 (0)