Skip to content

Commit 3b49f48

Browse files
kgala2kgala2
committed
chore: rearrange credential tests
1 parent 8218f20 commit 3b49f48

3 files changed

Lines changed: 91 additions & 70 deletions

File tree

‎tests/mysql_test.go‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,33 +165,40 @@ func TestMySQLAuthentication(t *testing.T) {
165165
}
166166
if ipType == "public" {
167167
tcs = append(tcs,
168-
[]struct {
168+
struct {
169169
desc string
170170
args []string
171171
}{
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-
}
172+
desc: "with credentials file",
173+
args: []string{"--credentials-file", path, *mysqlConnName},
174+
},
175+
struct {
176+
desc string
177+
args []string
178+
}{
179+
desc: "with credentials file and impersonation",
180+
args: []string{
181+
"--credentials-file", path,
182+
"--impersonate-service-account", *impersonatedUser,
183+
*mysqlConnName},
184+
},
185+
struct {
186+
desc string
187+
args []string
188+
}{
189+
desc: "with credentials JSON",
190+
args: []string{"--json-credentials", string(creds), *mysqlConnName},
191+
},
192+
struct {
193+
desc string
194+
args []string
195+
}{
196+
desc: "with credentials JSON and impersonation",
197+
args: []string{
198+
"--json-credentials", string(creds),
199+
"--impersonate-service-account", *impersonatedUser,
200+
*mysqlConnName},
201+
},
195202
)
196203
}
197204
for _, tc := range tcs {

‎tests/postgres_test.go‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -153,29 +153,36 @@ func TestPostgresAuthentication(t *testing.T) {
153153
desc string
154154
args []string
155155
}{
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-
}
156+
desc: "with credentials file",
157+
args: []string{"--credentials-file", path, *postgresConnName},
158+
},
159+
struct {
160+
desc string
161+
args []string
162+
}{
163+
desc: "with credentials file and impersonation",
164+
args: []string{
165+
"--credentials-file", path,
166+
"--impersonate-service-account", *impersonatedUser,
167+
*postgresConnName},
168+
},
169+
struct {
170+
desc string
171+
args []string
172+
}{
173+
desc: "with credentials JSON",
174+
args: []string{"--json-credentials", string(creds), *postgresConnName},
175+
},
176+
struct {
177+
desc string
178+
args []string
179+
}{
180+
desc: "with credentials JSON and impersonation",
181+
args: []string{
182+
"--json-credentials", string(creds),
183+
"--impersonate-service-account", *impersonatedUser,
184+
*postgresConnName},
185+
},
179186
)
180187
}
181188
for _, tc := range tcs {

‎tests/sqlserver_test.go‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -113,29 +113,36 @@ func TestSQLServerAuthentication(t *testing.T) {
113113
desc string
114114
args []string
115115
}{
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-
}
116+
desc: "with credentials file",
117+
args: []string{"--credentials-file", path, *sqlserverConnName},
118+
},
119+
struct {
120+
desc string
121+
args []string
122+
}{
123+
desc: "with credentials file and impersonation",
124+
args: []string{
125+
"--credentials-file", path,
126+
"--impersonate-service-account", *impersonatedUser,
127+
*sqlserverConnName},
128+
},
129+
struct {
130+
desc string
131+
args []string
132+
}{
133+
desc: "with credentials JSON",
134+
args: []string{"--json-credentials", string(creds), *sqlserverConnName},
135+
},
136+
struct {
137+
desc string
138+
args []string
139+
}{
140+
desc: "with credentials JSON and impersonation",
141+
args: []string{
142+
"--json-credentials", string(creds),
143+
"--impersonate-service-account", *impersonatedUser,
144+
*sqlserverConnName},
145+
},
139146
)
140147
}
141148
for _, tc := range tcs {

0 commit comments

Comments
 (0)