Skip to content

Commit e2748e4

Browse files
ManuelvaasManuelvaas
committed
reduced variables in tests
1 parent dcbe5ba commit e2748e4

7 files changed

Lines changed: 31 additions & 51 deletions

File tree

‎internal/cmd/beta/vpn/gateway/create/create_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import (
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1616
)
1717

18-
var projectIdFlag = globalflags.ProjectIdFlag
19-
var regionFlag = globalflags.RegionFlag
20-
2118
type testCtxKey struct{}
2219

2320
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -36,8 +33,8 @@ var testBgpOverrideAdvertisedRoutes = "10.10.10.10/32"
3633

3734
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3835
flagValues := map[string]string{
39-
projectIdFlag: testProjectId,
40-
regionFlag: testRegion,
36+
globalflags.ProjectIdFlag: testProjectId,
37+
globalflags.RegionFlag: testRegion,
4138

4239
availabilityZoneTunnel1Flag: testAvailabilityZoneTunnel1,
4340
availabilityZoneTunnel2Flag: testAvailabilityZoneTunnel2,

‎internal/cmd/beta/vpn/gateway/delete/delete_test.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import (
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1414
)
1515

16-
var projectIdFlag = globalflags.ProjectIdFlag
17-
var regionFlag = globalflags.RegionFlag
18-
1916
type testCtxKey struct{}
2017

2118
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -27,8 +24,8 @@ var testGatewayId = uuid.NewString()
2724

2825
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2926
flagValues := map[string]string{
30-
projectIdFlag: testProjectId,
31-
regionFlag: testRegion,
27+
globalflags.ProjectIdFlag: testProjectId,
28+
globalflags.RegionFlag: testRegion,
3229
}
3330
for _, mod := range mods {
3431
mod(flagValues)
@@ -106,23 +103,23 @@ func TestParseInput(t *testing.T) {
106103
description: "project id missing",
107104
argValues: fixtureArgValues(),
108105
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
109-
delete(flagValues, projectIdFlag)
106+
delete(flagValues, globalflags.ProjectIdFlag)
110107
}),
111108
isValid: false,
112109
},
113110
{
114111
description: "project id invalid 1",
115112
argValues: fixtureArgValues(),
116113
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
117-
flagValues[projectIdFlag] = ""
114+
flagValues[globalflags.ProjectIdFlag] = ""
118115
}),
119116
isValid: false,
120117
},
121118
{
122119
description: "project id invalid 2",
123120
argValues: fixtureArgValues(),
124121
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
125-
flagValues[projectIdFlag] = "invalid-uuid"
122+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
126123
}),
127124
isValid: false,
128125
},

‎internal/cmd/beta/vpn/gateway/describe/describe_test.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import (
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1515
)
1616

17-
var projectIdFlag = globalflags.ProjectIdFlag
18-
var regionFlag = globalflags.RegionFlag
19-
2017
type testCtxKey struct{}
2118

2219
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -29,8 +26,8 @@ var testGatewayId = uuid.NewString()
2926

3027
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3128
flagValues := map[string]string{
32-
projectIdFlag: testProjectId,
33-
regionFlag: testRegion,
29+
globalflags.ProjectIdFlag: testProjectId,
30+
globalflags.RegionFlag: testRegion,
3431
}
3532
for _, mod := range mods {
3633
mod(flagValues)
@@ -108,23 +105,23 @@ func TestParseInput(t *testing.T) {
108105
description: "project id missing",
109106
argValues: fixtureArgValues(),
110107
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
111-
delete(flagValues, projectIdFlag)
108+
delete(flagValues, globalflags.ProjectIdFlag)
112109
}),
113110
isValid: false,
114111
},
115112
{
116113
description: "project id invalid 1",
117114
argValues: fixtureArgValues(),
118115
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
119-
flagValues[projectIdFlag] = ""
116+
flagValues[globalflags.ProjectIdFlag] = ""
120117
}),
121118
isValid: false,
122119
},
123120
{
124121
description: "project id invalid 2",
125122
argValues: fixtureArgValues(),
126123
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
127-
flagValues[projectIdFlag] = "invalid-uuid"
124+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
128125
}),
129126
isValid: false,
130127
},

‎internal/cmd/beta/vpn/gateway/list/list_test.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import (
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1717
)
1818

19-
var projectIdFlag = globalflags.ProjectIdFlag
20-
var regionFlag = globalflags.RegionFlag
21-
2219
type testCtxKey struct{}
2320

2421
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -31,9 +28,9 @@ var testLimit int64 = 10
3128

3229
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3330
flagValues := map[string]string{
34-
projectIdFlag: testProjectId,
35-
regionFlag: testRegion,
36-
limitFlag: strconv.FormatInt(testLimit, 10),
31+
globalflags.ProjectIdFlag: testProjectId,
32+
globalflags.RegionFlag: testRegion,
33+
limitFlag: strconv.FormatInt(testLimit, 10),
3734
}
3835
for _, mod := range mods {
3936
mod(flagValues)
@@ -86,21 +83,21 @@ func TestParseInput(t *testing.T) {
8683
{
8784
description: "project id missing",
8885
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
89-
delete(flagValues, projectIdFlag)
86+
delete(flagValues, globalflags.ProjectIdFlag)
9087
}),
9188
isValid: false,
9289
},
9390
{
9491
description: "project id invalid 1",
9592
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
96-
flagValues[projectIdFlag] = ""
93+
flagValues[globalflags.ProjectIdFlag] = ""
9794
}),
9895
isValid: false,
9996
},
10097
{
10198
description: "project id invalid 2",
10299
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
103-
flagValues[projectIdFlag] = "invalid-uuid"
100+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
104101
}),
105102
isValid: false,
106103
},

‎internal/cmd/beta/vpn/gateway/status/status_test.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import (
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1515
)
1616

17-
var projectIdFlag = globalflags.ProjectIdFlag
18-
var regionFlag = globalflags.RegionFlag
19-
2017
type testCtxKey struct{}
2118

2219
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -29,8 +26,8 @@ var testGatewayId = uuid.NewString()
2926

3027
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3128
flagValues := map[string]string{
32-
projectIdFlag: testProjectId,
33-
regionFlag: testRegion,
29+
globalflags.ProjectIdFlag: testProjectId,
30+
globalflags.RegionFlag: testRegion,
3431
}
3532
for _, mod := range mods {
3633
mod(flagValues)
@@ -108,23 +105,23 @@ func TestParseInput(t *testing.T) {
108105
description: "project id missing",
109106
argValues: fixtureArgValues(),
110107
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
111-
delete(flagValues, projectIdFlag)
108+
delete(flagValues, globalflags.ProjectIdFlag)
112109
}),
113110
isValid: false,
114111
},
115112
{
116113
description: "project id invalid 1",
117114
argValues: fixtureArgValues(),
118115
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
119-
flagValues[projectIdFlag] = ""
116+
flagValues[globalflags.ProjectIdFlag] = ""
120117
}),
121118
isValid: false,
122119
},
123120
{
124121
description: "project id invalid 2",
125122
argValues: fixtureArgValues(),
126123
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
127-
flagValues[projectIdFlag] = "invalid-uuid"
124+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
128125
}),
129126
isValid: false,
130127
},

‎internal/cmd/beta/vpn/plans/plans_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1616
)
1717

18-
var regionFlag = globalflags.RegionFlag
19-
2018
type testCtxKey struct{}
2119

2220
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -28,8 +26,8 @@ var testLimit int64 = 10
2826
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2927
flagValues := map[string]string{
3028
// Project ID is not necessary for this request
31-
regionFlag: testRegion,
32-
limitFlag: strconv.FormatInt(testLimit, 10),
29+
globalflags.RegionFlag: testRegion,
30+
limitFlag: strconv.FormatInt(testLimit, 10),
3331
}
3432
for _, mod := range mods {
3533
mod(flagValues)

‎internal/cmd/beta/vpn/quotas/quotas_test.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import (
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1717
)
1818

19-
var projectIdFlag = globalflags.ProjectIdFlag
20-
var regionFlag = globalflags.RegionFlag
21-
2219
type testCtxKey struct{}
2320

2421
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -31,9 +28,9 @@ var testLimit int64 = 10
3128

3229
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3330
flagValues := map[string]string{
34-
projectIdFlag: testProjectId,
35-
regionFlag: testRegion,
36-
limitFlag: strconv.FormatInt(testLimit, 10),
31+
globalflags.ProjectIdFlag: testProjectId,
32+
globalflags.RegionFlag: testRegion,
33+
limitFlag: strconv.FormatInt(testLimit, 10),
3734
}
3835
for _, mod := range mods {
3936
mod(flagValues)
@@ -86,21 +83,21 @@ func TestParseInput(t *testing.T) {
8683
{
8784
description: "project id missing",
8885
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
89-
delete(flagValues, projectIdFlag)
86+
delete(flagValues, globalflags.ProjectIdFlag)
9087
}),
9188
isValid: false,
9289
},
9390
{
9491
description: "project id invalid 1",
9592
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
96-
flagValues[projectIdFlag] = ""
93+
flagValues[globalflags.ProjectIdFlag] = ""
9794
}),
9895
isValid: false,
9996
},
10097
{
10198
description: "project id invalid 2",
10299
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
103-
flagValues[projectIdFlag] = "invalid-uuid"
100+
flagValues[globalflags.ProjectIdFlag] = "invalid-uuid"
104101
}),
105102
isValid: false,
106103
},

0 commit comments

Comments
 (0)