Skip to content

Commit 8218f20

Browse files
kgala2kgala2
committed
chore: update credential tests
1 parent 8925eb8 commit 8218f20

4 files changed

Lines changed: 108 additions & 69 deletions

File tree

‎tests/connection_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ func removeAuthEnvVar(t *testing.T) (*oauth2.Token, string, func()) {
4343
if err != nil {
4444
t.Errorf("failed to get token: %v", err)
4545
}
46+
if ipType != "public" {
47+
return tok, "", func() {}
48+
}
4649
path, ok := os.LookupEnv("GOOGLE_APPLICATION_CREDENTIALS")
4750
if !ok {
4851
t.Fatalf("GOOGLE_APPLICATION_CREDENTIALS was not set in the environment")

‎tests/mysql_test.go‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ func TestMySQLAuthentication(t *testing.T) {
140140
}
141141
requireMySQLVars(t)
142142

143-
creds := keyfile(t)
143+
var creds string
144+
if ipType == "public" {
145+
creds = keyfile(t)
146+
}
144147
tok, path, cleanup := removeAuthEnvVar(t)
145148
defer cleanup()
146149

@@ -159,28 +162,37 @@ func TestMySQLAuthentication(t *testing.T) {
159162
"--impersonate-service-account", *impersonatedUser,
160163
*mysqlConnName},
161164
},
162-
{
163-
desc: "with credentials file",
164-
args: []string{"--credentials-file", path, *mysqlConnName},
165-
},
166-
{
167-
desc: "with credentials file and impersonation",
168-
args: []string{
169-
"--credentials-file", path,
170-
"--impersonate-service-account", *impersonatedUser,
171-
*mysqlConnName},
172-
},
173-
{
174-
desc: "with credentials JSON",
175-
args: []string{"--json-credentials", string(creds), *mysqlConnName},
176-
},
177-
{
178-
desc: "with credentials JSON and impersonation",
179-
args: []string{
180-
"--json-credentials", string(creds),
181-
"--impersonate-service-account", *impersonatedUser,
182-
*mysqlConnName},
183-
},
165+
}
166+
if ipType == "public" {
167+
tcs = append(tcs,
168+
[]struct {
169+
desc string
170+
args []string
171+
}{
172+
{
173+
desc: "with credentials file",
174+
args: []string{"--credentials-file", path, *mysqlConnName},
175+
},
176+
{
177+
desc: "with credentials file and impersonation",
178+
args: []string{
179+
"--credentials-file", path,
180+
"--impersonate-service-account", *impersonatedUser,
181+
*mysqlConnName},
182+
},
183+
{
184+
desc: "with credentials JSON",
185+
args: []string{"--json-credentials", string(creds), *mysqlConnName},
186+
},
187+
{
188+
desc: "with credentials JSON and impersonation",
189+
args: []string{
190+
"--json-credentials", string(creds),
191+
"--impersonate-service-account", *impersonatedUser,
192+
*mysqlConnName},
193+
},
194+
}
195+
)
184196
}
185197
for _, tc := range tcs {
186198
t.Run(tc.desc, func(t *testing.T) {

‎tests/postgres_test.go‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ func TestPostgresAuthentication(t *testing.T) {
124124
}
125125
requirePostgresVars(t)
126126

127-
creds := keyfile(t)
127+
var creds string
128+
if ipType == "public" {
129+
creds = keyfile(t)
130+
}
128131
tok, path, cleanup := removeAuthEnvVar(t)
129132
defer cleanup()
130133

@@ -143,28 +146,37 @@ func TestPostgresAuthentication(t *testing.T) {
143146
"--impersonate-service-account", *impersonatedUser,
144147
*postgresConnName},
145148
},
146-
{
147-
desc: "with credentials file",
148-
args: []string{"--credentials-file", path, *postgresConnName},
149-
},
150-
{
151-
desc: "with credentials file and impersonation",
152-
args: []string{
153-
"--credentials-file", path,
154-
"--impersonate-service-account", *impersonatedUser,
155-
*postgresConnName},
156-
},
157-
{
158-
desc: "with credentials JSON",
159-
args: []string{"--json-credentials", string(creds), *postgresConnName},
160-
},
161-
{
162-
desc: "with credentials JSON and impersonation",
163-
args: []string{
164-
"--json-credentials", string(creds),
165-
"--impersonate-service-account", *impersonatedUser,
166-
*postgresConnName},
167-
},
149+
}
150+
if ipType == "public" {
151+
tcs = append(tcs,
152+
[]struct {
153+
desc string
154+
args []string
155+
}{
156+
{
157+
desc: "with credentials file",
158+
args: []string{"--credentials-file", path, *postgresConnName},
159+
},
160+
{
161+
desc: "with credentials file and impersonation",
162+
args: []string{
163+
"--credentials-file", path,
164+
"--impersonate-service-account", *impersonatedUser,
165+
*postgresConnName},
166+
},
167+
{
168+
desc: "with credentials JSON",
169+
args: []string{"--json-credentials", string(creds), *postgresConnName},
170+
},
171+
{
172+
desc: "with credentials JSON and impersonation",
173+
args: []string{
174+
"--json-credentials", string(creds),
175+
"--impersonate-service-account", *impersonatedUser,
176+
*postgresConnName},
177+
},
178+
}
179+
)
168180
}
169181
for _, tc := range tcs {
170182
t.Run(tc.desc, func(t *testing.T) {

‎tests/sqlserver_test.go‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ func TestSQLServerAuthentication(t *testing.T) {
8484
}
8585
requireSQLServerVars(t)
8686

87-
creds := keyfile(t)
87+
var creds string
88+
if ipType == "public" {
89+
creds = keyfile(t)
90+
}
8891
tok, path, cleanup := removeAuthEnvVar(t)
8992
defer cleanup()
9093

@@ -103,28 +106,37 @@ func TestSQLServerAuthentication(t *testing.T) {
103106
"--impersonate-service-account", *impersonatedUser,
104107
*sqlserverConnName},
105108
},
106-
{
107-
desc: "with credentials file",
108-
args: []string{"--credentials-file", path, *sqlserverConnName},
109-
},
110-
{
111-
desc: "with credentials file and impersonation",
112-
args: []string{
113-
"--credentials-file", path,
114-
"--impersonate-service-account", *impersonatedUser,
115-
*sqlserverConnName},
116-
},
117-
{
118-
desc: "with credentials JSON",
119-
args: []string{"--json-credentials", string(creds), *sqlserverConnName},
120-
},
121-
{
122-
desc: "with credentials JSON and impersonation",
123-
args: []string{
124-
"--json-credentials", string(creds),
125-
"--impersonate-service-account", *impersonatedUser,
126-
*sqlserverConnName},
127-
},
109+
}
110+
if ipType == "public" {
111+
tcs = append(tcs,
112+
[]struct {
113+
desc string
114+
args []string
115+
}{
116+
{
117+
desc: "with credentials file",
118+
args: []string{"--credentials-file", path, *sqlserverConnName},
119+
},
120+
{
121+
desc: "with credentials file and impersonation",
122+
args: []string{
123+
"--credentials-file", path,
124+
"--impersonate-service-account", *impersonatedUser,
125+
*sqlserverConnName},
126+
},
127+
{
128+
desc: "with credentials JSON",
129+
args: []string{"--json-credentials", string(creds), *sqlserverConnName},
130+
},
131+
{
132+
desc: "with credentials JSON and impersonation",
133+
args: []string{
134+
"--json-credentials", string(creds),
135+
"--impersonate-service-account", *impersonatedUser,
136+
*sqlserverConnName},
137+
},
138+
}
139+
)
128140
}
129141
for _, tc := range tcs {
130142
t.Run(tc.desc, func(t *testing.T) {

0 commit comments

Comments
 (0)