chore: update mysql ip types

Author: kgala2

.ci/cloudbuild.yaml

@@ -51,13 +51,13 @@ steps:
         nox -s system-${_VERSION}
 availableSecrets:
   secretManager:
-    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_CONNECTION_NAME/versions/latest"
+    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_CONNECTION_NAME/versions/latest"
       env: "MYSQL_CONNECTION_NAME"
-    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_USER/versions/latest"
+    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_USER/versions/latest"
       env: "MYSQL_USER"
     - versionName: "projects/$PROJECT_ID/secrets/CLOUD_BUILD_MYSQL_IAM_USER/versions/latest"
       env: "MYSQL_IAM_USER"
-    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_PASS/versions/latest"
+    - versionName: "projects/$PROJECT_ID/secrets/MYSQL_PSA_PASS/versions/latest"
       env: "MYSQL_PASS"
     - versionName: "projects/$PROJECT_ID/secrets/MYSQL_DB/versions/latest"
       env: "MYSQL_DB"

tests/system/test_pymysql_connection.py

@@ -96,6 +96,9 @@ def test_pymysql_connection() -> None:
     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
     )
@@ -115,6 +118,9 @@ def test_lazy_pymysql_connection() -> None:
     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, "lazy"
     )

tests/system/test_pymysql_iam_auth.py

@@ -88,6 +88,9 @@ def test_pymysql_iam_authn_connection() -> None:
     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, db, ip_type)
     with engine.connect() as conn:
         time = conn.execute(sqlalchemy.text("SELECT NOW()")).fetchone()
@@ -104,6 +107,9 @@ def test_lazy_pymysql_iam_authn_connection() -> None:
     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, db, ip_type, "lazy"
     )