Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
109 changes: 68 additions & 41 deletions .ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,58 +16,85 @@ steps:
- id: run integration tests
name: python:${_VERSION}
entrypoint: bash
env:
env:
- "IP_TYPE=${_IP_TYPE}"
secretEnv: ["MYSQL_CONNECTION_NAME", "MYSQL_USER", "MYSQL_IAM_USER", "MYSQL_PASS", "MYSQL_DB", "POSTGRES_CONNECTION_NAME", "POSTGRES_USER", "POSTGRES_IAM_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CAS_CONNECTION_NAME", "POSTGRES_CAS_PASS", "POSTGRES_CUSTOMER_CAS_CONNECTION_NAME", "POSTGRES_CUSTOMER_CAS_PASS", "POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME","SQLSERVER_CONNECTION_NAME", "SQLSERVER_USER", "SQLSERVER_PASS", "SQLSERVER_DB"]
secretEnv:
[
"MYSQL_CONNECTION_NAME",
"MYSQL_USER",
"MYSQL_IAM_USER",
"MYSQL_PASS",
"MYSQL_DB",
"MYSQL_MCP_CONNECTION_NAME",
"MYSQL_MCP_PASS",
"POSTGRES_CONNECTION_NAME",
"POSTGRES_USER",
"POSTGRES_IAM_USER",
"POSTGRES_PASS",
"POSTGRES_DB",
"POSTGRES_CAS_CONNECTION_NAME",
"POSTGRES_CAS_PASS",
"POSTGRES_CUSTOMER_CAS_CONNECTION_NAME",
"POSTGRES_CUSTOMER_CAS_PASS",
"POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME",
"SQLSERVER_CONNECTION_NAME",
"SQLSERVER_USER",
"SQLSERVER_PASS",
"SQLSERVER_DB",
]
args:
- "-c"
- |
pip install nox
nox -s system-${_VERSION}
availableSecrets:
secretManager:
- versionName: 'projects/$PROJECT_ID/secrets/MYSQL_CONNECTION_NAME/versions/latest'
env: 'MYSQL_CONNECTION_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/MYSQL_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'
env: 'MYSQL_PASS'
- versionName: 'projects/$PROJECT_ID/secrets/MYSQL_DB/versions/latest'
env: 'MYSQL_DB'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CONNECTION_NAME/versions/latest'
env: 'POSTGRES_CONNECTION_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_USER/versions/latest'
env: 'POSTGRES_USER'
- versionName: 'projects/$PROJECT_ID/secrets/CLOUD_BUILD_POSTGRES_IAM_USER/versions/latest'
env: 'POSTGRES_IAM_USER'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_PASS/versions/latest'
env: 'POSTGRES_PASS'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_DB/versions/latest'
env: 'POSTGRES_DB'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CAS_CONNECTION_NAME/versions/latest'
env: 'POSTGRES_CAS_CONNECTION_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CAS_PASS/versions/latest'
env: 'POSTGRES_CAS_PASS'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_CONNECTION_NAME/versions/latest'
env: 'POSTGRES_CUSTOMER_CAS_CONNECTION_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS/versions/latest'
env: 'POSTGRES_CUSTOMER_CAS_PASS'
- versionName: 'projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME/versions/latest'
env: 'POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_CONNECTION_NAME/versions/latest'
env: 'SQLSERVER_CONNECTION_NAME'
- versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_USER/versions/latest'
env: 'SQLSERVER_USER'
- versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_PASS/versions/latest'
env: 'SQLSERVER_PASS'
- versionName: 'projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest'
env: 'SQLSERVER_DB'
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_CONNECTION_NAME/versions/latest"
env: "MYSQL_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_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"
env: "MYSQL_PASS"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_DB/versions/latest"
env: "MYSQL_DB"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_MCP_CONNECTION_NAME/versions/latest"
env: "MYSQL_MCP_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/MYSQL_MCP_PASS/versions/latest"
env: "MYSQL_MCP_PASS"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CONNECTION_NAME/versions/latest"
env: "POSTGRES_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_USER/versions/latest"
env: "POSTGRES_USER"
- versionName: "projects/$PROJECT_ID/secrets/CLOUD_BUILD_POSTGRES_IAM_USER/versions/latest"
env: "POSTGRES_IAM_USER"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_PASS/versions/latest"
env: "POSTGRES_PASS"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_DB/versions/latest"
env: "POSTGRES_DB"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CAS_CONNECTION_NAME/versions/latest"
env: "POSTGRES_CAS_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CAS_PASS/versions/latest"
env: "POSTGRES_CAS_PASS"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_CONNECTION_NAME/versions/latest"
env: "POSTGRES_CUSTOMER_CAS_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS/versions/latest"
env: "POSTGRES_CUSTOMER_CAS_PASS"
- versionName: "projects/$PROJECT_ID/secrets/POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME/versions/latest"
env: "POSTGRES_CUSTOMER_CAS_PASS_VALID_DOMAIN_NAME"
- versionName: "projects/$PROJECT_ID/secrets/SQLSERVER_CONNECTION_NAME/versions/latest"
env: "SQLSERVER_CONNECTION_NAME"
- versionName: "projects/$PROJECT_ID/secrets/SQLSERVER_USER/versions/latest"
env: "SQLSERVER_USER"
- versionName: "projects/$PROJECT_ID/secrets/SQLSERVER_PASS/versions/latest"
env: "SQLSERVER_PASS"
- versionName: "projects/$PROJECT_ID/secrets/SQLSERVER_DB/versions/latest"
env: "SQLSERVER_DB"
substitutions:
_VERSION: ${_VERSION}
_IP_TYPE: ${_IP_TYPE}

options:
dynamicSubstitutions: true
pool:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ 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
MYSQL_MCP_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_MCP_CONNECTION_NAME
MYSQL_MCP_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_MCP_PASS
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
Expand All @@ -94,6 +96,8 @@ jobs:
MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER }}"
MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}"
MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}"
MYSQL_MCP_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_MCP_CONNECTION_NAME }}"
MYSQL_MCP_PASS: "${{ steps.secrets.outputs.MYSQL_MCP_PASS }}"
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 }}"
Expand Down
19 changes: 19 additions & 0 deletions tests/system/test_pymysql_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,22 @@ def test_lazy_pymysql_connection() -> None:
curr_time = time[0]
assert type(curr_time) is datetime
connector.close()


def test_MCP_pymysql_connection() -> None:
"""Basic test to get time from database using MCP enabled instance."""
inst_conn_name = os.environ["MYSQL_MCP_CONNECTION_NAME"]
user = os.environ["MYSQL_USER"]
password = os.environ["MYSQL_MCP_PASS"]
db = os.environ["MYSQL_DB"]
ip_type = os.environ.get("IP_TYPE", "public")

engine, connector = create_sqlalchemy_engine(
inst_conn_name, user, password, db, ip_type
)
with engine.connect() as conn:
time = conn.execute(sqlalchemy.text("SELECT NOW()")).fetchone()
conn.commit()
curr_time = time[0]
assert type(curr_time) is datetime
connector.close()
16 changes: 16 additions & 0 deletions tests/system/test_pymysql_iam_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,19 @@ def test_lazy_pymysql_iam_authn_connection() -> None:
curr_time = time[0]
assert type(curr_time) is datetime
connector.close()


def test_MCP_pymysql_iam_authn_connection() -> None:
"""Basic test to get time from database using MCP enabled instance."""
inst_conn_name = os.environ["MYSQL_MCP_CONNECTION_NAME"]
user = os.environ["MYSQL_IAM_USER"]
db = os.environ["MYSQL_DB"]
ip_type = os.environ.get("IP_TYPE", "public")

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()
conn.commit()
curr_time = time[0]
assert type(curr_time) is datetime
connector.close()
Loading