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
6 changes: 6 additions & 0 deletions .ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ steps:
"MYSQL_USER",
"MYSQL_PASS",
"MYSQL_DB",
"MYSQL_MCP_CONNECTION_NAME",
"MYSQL_MCP_PASS",
"POSTGRES_CONNECTION_NAME",
"POSTGRES_USER",
"POSTGRES_USER_IAM",
Expand Down Expand Up @@ -64,6 +66,10 @@ availableSecrets:
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"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ jobs:
MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER
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_USER_IAM:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM
Expand Down Expand Up @@ -115,6 +117,8 @@ jobs:
MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_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_USER_IAM: "${{ steps.secrets.outputs.POSTGRES_USER_IAM }}"
Expand Down
42 changes: 37 additions & 5 deletions tests/mysql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ import (
)

var (
mysqlConnName = flag.String("mysql_conn_name", os.Getenv("MYSQL_CONNECTION_NAME"), "Cloud SQL MYSQL instance connection name, in the form of 'project:region:instance'.")
mysqlUser = flag.String("mysql_user", os.Getenv("MYSQL_USER"), "Name of database user.")
mysqlPass = flag.String("mysql_pass", os.Getenv("MYSQL_PASS"), "Password for the database user; be careful when entering a password on the command line (it may go into your terminal's history).")
mysqlDB = flag.String("mysql_db", os.Getenv("MYSQL_DB"), "Name of the database to connect to.")
ipType = flag.String("ip_type", func() string {
mysqlConnName = flag.String("mysql_conn_name", os.Getenv("MYSQL_CONNECTION_NAME"), "Cloud SQL MYSQL instance connection name, in the form of 'project:region:instance'.")
mysqlUser = flag.String("mysql_user", os.Getenv("MYSQL_USER"), "Name of database user.")
mysqlPass = flag.String("mysql_pass", os.Getenv("MYSQL_PASS"), "Password for the database user; be careful when entering a password on the command line (it may go into your terminal's history).")
mysqlDB = flag.String("mysql_db", os.Getenv("MYSQL_DB"), "Name of the database to connect to.")
mysqlMCPConnName = flag.String("mysql_mcp_conn_name", os.Getenv("MYSQL_MCP_CONNECTION_NAME"), "Cloud SQL MCP MYSQL instance connection name, in the form of 'project:region:instance'.")
mysqlMCPPass = flag.String("mysql_mcp_pass", os.Getenv("MYSQL_MCP_PASS"), "Password for the database user; be careful when entering a password on the command line (it may go into your terminal's history).")
ipType = flag.String("ip_type", func() string {
if v := os.Getenv("IP_TYPE"); v != "" {
return v
}
Expand All @@ -47,6 +49,10 @@ func requireMySQLVars(t *testing.T) {
t.Fatal("'mysql_pass' not set")
case *mysqlDB:
t.Fatal("'mysql_db' not set")
case *mysqlMCPConnName:
t.Fatal("'mysql_mcp_conn_name' not set")
case *mysqlMCPPass:
t.Fatal("'mysql_mcp_pass' not set")
}
}

Expand Down Expand Up @@ -113,6 +119,32 @@ func TestMySQLUnix(t *testing.T) {
proxyConnTest(t, args, "mysql", cfg.FormatDSN())
}

func TestMySQLMCPUnix(t *testing.T) {
if testing.Short() {
t.Skip("skipping MySQL integration tests")
}
requireMySQLVars(t)
tmpDir, cleanup := createTempDir(t)
defer cleanup()

cfg := mysql.Config{
User: *mysqlUser,
Passwd: *mysqlMCPPass,
DBName: *mysqlDB,
AllowNativePasswords: true,
// re-use utility function to determine the Unix address in a
// Windows-friendly way.
Addr: proxy.UnixAddress(tmpDir, *mysqlMCPConnName),
Net: "unix",
}
// Prepare the initial arguments
args := []string{"--unix-socket", tmpDir, *mysqlMCPConnName}
// Add the IP type flag using the helper
args = AddIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "mysql", cfg.FormatDSN())
}

func TestMySQLImpersonation(t *testing.T) {
if testing.Short() {
t.Skip("skipping MySQL integration tests")
Expand Down
Loading