Skip to content

Commit c95fa6d

Browse files
alexTiuganalexTiugan
committed
refactor(ufw):
- fixed lint errors
1 parent f573dc2 commit c95fa6d

11 files changed

Lines changed: 38 additions & 32 deletions

File tree

‎internal/cmd/ufw/rules/create/create.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/spf13/cobra"
7+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
8+
89
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
910
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1011
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -14,11 +15,13 @@ import (
1415
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1516
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1617
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
17-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
18+
19+
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
1820

1921
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
2022
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ufw/client"
21-
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
23+
24+
"github.com/spf13/cobra"
2225
)
2326

2427
const (
@@ -65,7 +68,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6568
),
6669
RunE: func(cmd *cobra.Command, args []string) error {
6770
ctx := context.Background()
68-
model, err := parseInput(params.Printer, cmd)
71+
model, err := parseInput(params.Printer, cmd, args)
6972
if err != nil {
7073
return err
7174
}
@@ -138,7 +141,7 @@ func configureFlags(cmd *cobra.Command) {
138141
cobra.CheckErr(err)
139142
}
140143

141-
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
144+
func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
142145
globalFlags := globalflags.Parse(p, cmd)
143146
if globalFlags.ProjectId == "" {
144147
return nil, &errors.ProjectIdError{}

‎internal/cmd/ufw/rules/create/create_test.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/spf13/cobra"
10+
11+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
12+
1113
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
12-
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1314
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1415
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
15-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
1616
)
1717

1818
type testCtxKey struct{}
@@ -172,10 +172,7 @@ func TestParseInput(t *testing.T) {
172172

173173
for _, tt := range tests {
174174
t.Run(tt.description, func(t *testing.T) {
175-
parseInputWrapper := func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
176-
return parseInput(p, cmd)
177-
}
178-
testutils.TestParseInput(t, NewCmd, parseInputWrapper, tt.expectedModel, nil, tt.flagValues, tt.isValid)
175+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, nil, tt.flagValues, tt.isValid)
179176
})
180177
}
181178
}

‎internal/cmd/ufw/rules/delete/delete.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import (
55
"fmt"
66

77
"github.com/spf13/cobra"
8+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
9+
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
10+
811
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
912
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1013
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -14,8 +17,6 @@ import (
1417
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1518
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1619
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
17-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
18-
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
1920
)
2021

2122
const (

‎internal/cmd/ufw/rules/describe/describe.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"fmt"
66

77
"github.com/spf13/cobra"
8+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
9+
810
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
911
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1012
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -14,7 +16,6 @@ import (
1416
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
1517
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1618
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
17-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
1819
)
1920

2021
const (

‎internal/cmd/ufw/rules/list/list.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import (
44
"context"
55
"fmt"
66

7+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
8+
79
serviceEnablementClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
810
serviceEnablementUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
911
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
10-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
1112

1213
"github.com/spf13/cobra"
14+
1315
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1416
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1517
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"

‎internal/cmd/ufw/rules/list/list_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
11+
1012
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1113
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1214
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
13-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
1415
)
1516

1617
type testCtxKey struct{}

‎internal/cmd/ufw/rules/rules.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package rules
22

33
import (
4-
"github.com/spf13/cobra"
54
"github.com/stackitcloud/stackit-cli/internal/cmd/ufw/rules/create"
65
"github.com/stackitcloud/stackit-cli/internal/cmd/ufw/rules/delete"
76
"github.com/stackitcloud/stackit-cli/internal/cmd/ufw/rules/describe"
@@ -10,6 +9,8 @@ import (
109
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
12+
13+
"github.com/spf13/cobra"
1314
)
1415

1516
func NewCmd(params *types.CmdParams) *cobra.Command {

‎internal/cmd/ufw/rules/update/update.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import (
55
"fmt"
66

77
"github.com/spf13/cobra"
8+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
9+
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
10+
811
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
912
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1013
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -15,8 +18,6 @@ import (
1518
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1619
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1720
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
18-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
19-
"github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api/wait"
2021

2122
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
2223
)
@@ -57,7 +58,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
5758
),
5859
RunE: func(cmd *cobra.Command, args []string) error {
5960
ctx := context.Background()
60-
model, err := parseInput(params.Printer, cmd)
61+
model, err := parseInput(params.Printer, cmd, args)
6162
if err != nil {
6263
return err
6364
}
@@ -116,7 +117,7 @@ func configureFlags(cmd *cobra.Command) {
116117
cobra.CheckErr(err)
117118
}
118119

119-
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
120+
func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
120121
globalFlags := globalflags.Parse(p, cmd)
121122
if globalFlags.ProjectId == "" {
122123
return nil, &errors.ProjectIdError{}

‎internal/cmd/ufw/rules/update/update_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/spf13/cobra"
10+
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
11+
1112
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
12-
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
15-
ufw "github.com/stackitcloud/stackit-sdk-go/services/ufw/v1api"
1615
)
1716

1817
type testCtxKey struct{}
@@ -181,10 +180,7 @@ func TestParseInput(t *testing.T) {
181180

182181
for _, tt := range tests {
183182
t.Run(tt.description, func(t *testing.T) {
184-
parseInputWrapper := func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
185-
return parseInput(p, cmd)
186-
}
187-
testutils.TestParseInput(t, NewCmd, parseInputWrapper, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
183+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
188184
})
189185
}
190186
}

‎internal/cmd/ufw/ufw.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package ufw
22

33
import (
4-
"github.com/spf13/cobra"
54
"github.com/stackitcloud/stackit-cli/internal/cmd/ufw/rules"
65
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
76
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
87
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
8+
9+
"github.com/spf13/cobra"
910
)
1011

1112
func NewCmd(params *types.CmdParams) *cobra.Command {

0 commit comments

Comments
 (0)