diff --git a/.ci/cloudbuild.yaml b/.ci/cloudbuild.yaml index e31e8bebb..37b12b1e0 100644 --- a/.ci/cloudbuild.yaml +++ b/.ci/cloudbuild.yaml @@ -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", @@ -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" @@ -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 \ No newline at end of file diff --git a/tests/system/test_pymysql_connection.py b/tests/system/test_pymysql_connection.py index f5dd8a1eb..ac8bd342f 100644 --- a/tests/system/test_pymysql_connection.py +++ b/tests/system/test_pymysql_connection.py @@ -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 )