Skip to content

test: update ip types for e2e tests #2427

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

Merged
kgala2 merged 16 commits into from
Apr 17, 2025
Merged

test: update ip types for e2e tests #2427

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e3bfd70
chore: update ip type for e2e tests
kgala2 Apr 14, 2025
3f6c8fa
chore: add cloudbuild.yaml
kgala2 Apr 14, 2025
b7022f2
chore: skip fuse tests for private and psc types
kgala2 Apr 14, 2025
0fa3c0a
chore: conditionally run the fuse tests
kgala2 Apr 14, 2025
8925eb8
chore: update lint for fuse_test file
kgala2 Apr 14, 2025
8218f20
chore: update credential tests
kgala2 Apr 14, 2025
3b49f48
chore: rearrange credential tests
kgala2 Apr 14, 2025
149e1ee
chore: update ipType to *ipType
kgala2 Apr 14, 2025
2df5e52
chore: update credential tests
kgala2 Apr 15, 2025
0578d56
chore: add gcloud sdk to path
kgala2 Apr 15, 2025
0577658
chore: install gcloud sdk
kgala2 Apr 15, 2025
89241d2
chore: update env path
kgala2 Apr 15, 2025
6e97e0e
chore: use prexisiting gcloud sdk
kgala2 Apr 16, 2025
1b1a471
chore: update gcloud tests for private IP
kgala2 Apr 16, 2025
5120ca0
chore: remove cloudbuild.yaml
kgala2 Apr 16, 2025
863146e
chore: reformat tests
kgala2 Apr 16, 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
3 changes: 3 additions & 0 deletions tests/connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ func removeAuthEnvVar(t *testing.T) (*oauth2.Token, string, func()) {
if err != nil {
t.Errorf("failed to get token: %v", err)
}
if *ipType != "public" {
return tok, "", func() {}
}
path, ok := os.LookupEnv("GOOGLE_APPLICATION_CREDENTIALS")
if !ok {
t.Fatalf("GOOGLE_APPLICATION_CREDENTIALS was not set in the environment")
Expand Down
3 changes: 3 additions & 0 deletions tests/fuse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import (
)

func TestPostgresFUSEConnect(t *testing.T) {
if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
t.Skipf("skipping test because IP_TYPE is set to %v", v)
}
if testing.Short() {
t.Skip("skipping Postgres integration tests")
}
Expand Down
118 changes: 87 additions & 31 deletions tests/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ var (
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 {
if v := os.Getenv("IP_TYPE"); v != "" {
return v
}
return "public"
}(), "IP type of the instance to connect to, can be public, private or psc")
)

func requireMySQLVars(t *testing.T) {
Expand Down Expand Up @@ -56,12 +62,33 @@ func mysqlDSN() string {
return cfg.FormatDSN()
}

// addIPTypeFlag appends the correct flag based on the ipType variable.
func addIPTypeFlag(args []string) []string {
switch *ipType {
case "private":
return append(args, "--private-ip")
case "psc":
return append(args, "--psc")
// "public" is the default and doesn't require a flag
case "public":
return args
default:
// Or handle unknown ipType values as needed, maybe log a warning?
return args
}
}

func TestMySQLTCP(t *testing.T) {
if testing.Short() {
t.Skip("skipping MySQL integration tests")
}
requireMySQLVars(t)
proxyConnTest(t, []string{*mysqlConnName}, "mysql", mysqlDSN())
// Prepare the initial arguments
args := []string{*mysqlConnName}
// Add the IP type flag using the helper
args = addIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "mysql", mysqlDSN())
}

func TestMySQLUnix(t *testing.T) {
Expand All @@ -82,8 +109,12 @@ func TestMySQLUnix(t *testing.T) {
Addr: proxy.UnixAddress(tmpDir, *mysqlConnName),
Net: "unix",
}
proxyConnTest(t,
[]string{"--unix-socket", tmpDir, *mysqlConnName}, "mysql", cfg.FormatDSN())
// Prepare the initial arguments
args := []string{"--unix-socket", tmpDir, *mysqlConnName}
// 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) {
Expand All @@ -92,10 +123,15 @@ func TestMySQLImpersonation(t *testing.T) {
}
requireMySQLVars(t)

proxyConnTest(t, []string{
// Prepare the initial arguments
args := []string{
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName},
"mysql", mysqlDSN())
*mysqlConnName,
}
// Add the IP type flag using the helper
args = addIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "mysql", mysqlDSN())
}

func TestMySQLAuthentication(t *testing.T) {
Expand All @@ -104,7 +140,10 @@ func TestMySQLAuthentication(t *testing.T) {
}
requireMySQLVars(t)

creds := keyfile(t)
var creds string
if *ipType == "public" {
creds = keyfile(t)
}
tok, path, cleanup := removeAuthEnvVar(t)
defer cleanup()

Expand All @@ -123,32 +162,44 @@ func TestMySQLAuthentication(t *testing.T) {
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName},
},
{
desc: "with credentials file",
args: []string{"--credentials-file", path, *mysqlConnName},
},
{
desc: "with credentials file and impersonation",
args: []string{
"--credentials-file", path,
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName},
},
{
desc: "with credentials JSON",
args: []string{"--json-credentials", string(creds), *mysqlConnName},
},
{
desc: "with credentials JSON and impersonation",
args: []string{
"--json-credentials", string(creds),
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName},
},
}
if *ipType == "public" {
additionaTcs := []struct {
desc string
args []string
}{
{
desc: "with credentials file",
args: []string{"--credentials-file", path, *mysqlConnName},
},
{
desc: "with credentials file and impersonation",
args: []string{
"--credentials-file", path,
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName,
},
},
{
desc: "with credentials JSON",
args: []string{"--json-credentials", string(creds), *mysqlConnName},
},
{
desc: "with credentials JSON and impersonation",
args: []string{
"--json-credentials", string(creds),
"--impersonate-service-account", *impersonatedUser,
*mysqlConnName,
},
},
}
tcs = append(tcs, additionaTcs...)
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "mysql", mysqlDSN())
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "mysql", mysqlDSN())
})
}
}
Expand All @@ -157,6 +208,9 @@ func TestMySQLGcloudAuth(t *testing.T) {
if testing.Short() {
t.Skip("skipping MySQL integration tests")
}
if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
t.Skipf("skipping test because IP_TYPE is set to %v", v)
}
requireMySQLVars(t)

tcs := []struct {
Expand All @@ -177,7 +231,9 @@ func TestMySQLGcloudAuth(t *testing.T) {
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "mysql", mysqlDSN())
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "mysql", mysqlDSN())
})
}
}
Expand Down
106 changes: 71 additions & 35 deletions tests/postgres_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ func TestPostgresTCP(t *testing.T) {
t.Skip("skipping Postgres integration tests")
}
requirePostgresVars(t)

proxyConnTest(t, []string{*postgresConnName}, "pgx", postgresDSN())
// Prepare the initial arguments
args := []string{*postgresConnName}
// Add the IP type flag using the helper
args = addIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "pgx", postgresDSN())
}

func TestPostgresUnix(t *testing.T) {
Expand All @@ -78,8 +82,12 @@ func TestPostgresUnix(t *testing.T) {
proxy.UnixAddress(tmpDir, *postgresConnName),
*postgresUser, *postgresPass, *postgresDB)

proxyConnTest(t,
[]string{"--unix-socket", tmpDir, *postgresConnName}, "pgx", dsn)
// Prepare the initial arguments
args := []string{"--unix-socket", tmpDir, *postgresConnName}
// Add the IP type flag using the helper
args = addIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "pgx", dsn)
}

func createTempDir(t *testing.T) (string, func()) {
Expand All @@ -99,11 +107,15 @@ func TestPostgresImpersonation(t *testing.T) {
t.Skip("skipping Postgres integration tests")
}
requirePostgresVars(t)

proxyConnTest(t, []string{
// Prepare the initial arguments
args := []string{
"--impersonate-service-account", *impersonatedUser,
*postgresConnName},
"pgx", postgresDSN())
*postgresConnName,
}
// Add the IP type flag using the helper
args = addIPTypeFlag(args)
// Run the test
proxyConnTest(t, args, "pgx", postgresDSN())
}

func TestPostgresAuthentication(t *testing.T) {
Expand All @@ -112,7 +124,10 @@ func TestPostgresAuthentication(t *testing.T) {
}
requirePostgresVars(t)

creds := keyfile(t)
var creds string
if *ipType == "public" {
creds = keyfile(t)
}
tok, path, cleanup := removeAuthEnvVar(t)
defer cleanup()

Expand All @@ -131,32 +146,44 @@ func TestPostgresAuthentication(t *testing.T) {
"--impersonate-service-account", *impersonatedUser,
*postgresConnName},
},
{
desc: "with credentials file",
args: []string{"--credentials-file", path, *postgresConnName},
},
{
desc: "with credentials file and impersonation",
args: []string{
"--credentials-file", path,
"--impersonate-service-account", *impersonatedUser,
*postgresConnName},
},
{
desc: "with credentials JSON",
args: []string{"--json-credentials", string(creds), *postgresConnName},
},
{
desc: "with credentials JSON and impersonation",
args: []string{
"--json-credentials", string(creds),
"--impersonate-service-account", *impersonatedUser,
*postgresConnName},
},
}
if *ipType == "public" {
additionalTcs := []struct {
desc string
args []string
}{
{
desc: "with credentials file",
args: []string{"--credentials-file", path, *postgresConnName},
},
{
desc: "with credentials file and impersonation",
args: []string{
"--credentials-file", path,
"--impersonate-service-account", *impersonatedUser,
*postgresConnName,
},
},
{
desc: "with credentials JSON",
args: []string{"--json-credentials", string(creds), *postgresConnName},
},
{
desc: "with credentials JSON and impersonation",
args: []string{
"--json-credentials", string(creds),
"--impersonate-service-account", *impersonatedUser,
*postgresConnName,
},
},
}
tcs = append(tcs, additionalTcs...)
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "pgx", postgresDSN())
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "pgx", postgresDSN())
})
}
}
Expand All @@ -165,6 +192,9 @@ func TestPostgresGcloudAuth(t *testing.T) {
if testing.Short() {
t.Skip("skipping Postgres integration tests")
}
if v := os.Getenv("IP_TYPE"); v == "private" || v == "psc" {
t.Skipf("skipping test because IP_TYPE is set to %v", v)
}
requirePostgresVars(t)

tcs := []struct {
Expand All @@ -185,7 +215,9 @@ func TestPostgresGcloudAuth(t *testing.T) {
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "pgx", postgresDSN())
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "pgx", postgresDSN())
})
}

Expand Down Expand Up @@ -231,7 +263,9 @@ func TestPostgresIAMDBAuthn(t *testing.T) {
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "pgx", tc.dsn)
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "pgx", tc.dsn)
})
}
}
Expand Down Expand Up @@ -272,7 +306,9 @@ func TestPostgresCustomerCAS(t *testing.T) {
}
for _, tc := range tcs {
t.Run(tc.desc, func(t *testing.T) {
proxyConnTest(t, tc.args, "pgx", tc.dsn)
// Add the IP type flag using the helper
argsWithIPType := addIPTypeFlag(tc.args)
proxyConnTest(t, argsWithIPType, "pgx", tc.dsn)
})
}
}
Expand Down
Loading
Loading