Skip to content

chore: update mysql ip types #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
+20 −7
Draft

chore: update mysql ip types #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e69980d
chore: update mysql ip types
kgala2 Apr 23, 2025
0ca0653
chore: test psa on psc instance
kgala2 Apr 23, 2025
06da368
chore: update test_pymysql_conn to psc ip type
kgala2 Apr 23, 2025
83fbfca
chore: test PSC enabled instance
kgala2 Apr 23, 2025
b70ad04
chore: update cb file
kgala2 Apr 23, 2025
322d17c
chore: update substitutions
kgala2 Apr 24, 2025
b28a045
chore: add more comments in 'dig command'
kgala2 Apr 24, 2025
a836016
chore: update DNS zone steps
kgala2 Apr 25, 2025
0cd1a78
Merge branch 'main' into integrate-psc-tests
kgala2 Sep 3, 2025
5e29b76
chore: update test psc instance credentials
kgala2 Sep 3, 2025
84fd3fb
chore: update pool and python version for test
kgala2 Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .ci/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@

steps:
- id: run integration tests
name: python:${_VERSION}
name: python:3.13
entrypoint: bash
env:
- "IP_TYPE=${_IP_TYPE}"
secretEnv:
[
"MYSQL_PSA_CONNECTION_NAME",
"MYSQL_PSA_USER",
"MYSQL_PSA_PASS",
"MYSQL_CONNECTION_NAME",
"MYSQL_USER",
"MYSQL_IAM_USER",
Expand Down Expand Up @@ -59,6 +62,12 @@ availableSecrets:
env: "MYSQL_IAM_USER"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_PASS/versions/latest"
env: "MYSQL_PASS"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_CONNECTION_NAME/versions/latest"
env: "MYSQL_PSA_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_USER/versions/latest"
env: "MYSQL_PSA_USER"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_PASS/versions/latest"
env: "MYSQL_PSA_PASS"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_DB/versions/latest"
env: "MYSQL_DB"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_MCP_CONNECTION_NAME/versions/latest"
Expand Down Expand Up @@ -98,11 +107,10 @@ availableSecrets:
- versionName: "projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest"
env: "SQLSERVER_DB"
substitutions:
_VERSION: ${_VERSION}
_IP_TYPE: ${_IP_TYPE}

options:
dynamicSubstitutions: true
pool:
name: ${_POOL_NAME}
logging: CLOUD_LOGGING_ONLY
name: ${_POOL_NAME_2}
logging: CLOUD_LOGGING_ONLY
11 changes: 8 additions & 3 deletions tests/system/test_pymysql_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,17 @@ def create_sqlalchemy_engine(

def test_pymysql_connection() -> None:
"""Basic test to get time from database."""
inst_conn_name = os.environ["MYSQL_CONNECTION_NAME"]
user = os.environ["MYSQL_USER"]
password = os.environ["MYSQL_PASS"]
inst_conn_name = os.environ.get(
"MYSQL_PSA_CONNECTION_NAME", os.environ["MYSQL_CONNECTION_NAME"]
)
user = os.environ.get("MYSQL_PSA_USER", os.environ["MYSQL_USER"])
password = os.environ.get("MYSQL_PSA_PASS", os.environ["MYSQL_PASS"])
db = os.environ["MYSQL_DB"]
ip_type = os.environ.get("IP_TYPE", "public")

if ip_type == "private":
ip_type = "PSC"

engine, connector = create_sqlalchemy_engine(
inst_conn_name, user, password, db, ip_type
)
Expand Down
Loading