Skip to content

Commit fffc3db

Browse files
author
Yago Carlos Fernandez Gou
committed
Lint, use moved package and update branch
1 parent eb9f803 commit fffc3db

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed

‎internal/cmd/beta/intake/instance/create/create.go‎

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

77
"github.com/spf13/cobra"
8-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
98
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
109
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -15,6 +14,7 @@ import (
1514
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1615
"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
1716
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
17+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1818
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1919
"github.com/stackitcloud/stackit-sdk-go/services/intake"
2020
"github.com/stackitcloud/stackit-sdk-go/services/intake/wait"
@@ -60,7 +60,7 @@ type inputModel struct {
6060
DremioToken *string
6161
}
6262

63-
func NewCmd(p *params.CmdParams) *cobra.Command {
63+
func NewCmd(p *types.CmdParams) *cobra.Command {
6464
cmd := &cobra.Command{
6565
Use: "create",
6666
Short: "Creates a new Intake",

‎internal/cmd/beta/intake/instance/create/create_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
1010
"github.com/spf13/cobra"
11-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
14+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1616
"github.com/stackitcloud/stackit-sdk-go/services/intake"
1717
)
@@ -215,7 +215,7 @@ func TestParseInput(t *testing.T) {
215215

216216
for _, tt := range tests {
217217
t.Run(tt.description, func(t *testing.T) {
218-
testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, args []string) (*inputModel, error) {
218+
testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
219219
return parseInput(p, cmd)
220220
}, tt.expectedModel, nil, tt.flagValues, tt.isValid)
221221
})
@@ -350,7 +350,7 @@ func TestOutputResult(t *testing.T) {
350350
},
351351
}
352352
p := print.NewPrinter()
353-
p.Cmd = NewCmd(&params.CmdParams{Printer: p})
353+
p.Cmd = NewCmd(&types.CmdParams{Printer: p})
354354
for _, tt := range tests {
355355
t.Run(tt.name, func(t *testing.T) {
356356
if err := outputResult(p, tt.args.model, tt.args.projectLabel, tt.args.resp); (err != nil) != tt.wantErr {

‎internal/cmd/beta/intake/instance/delete/delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"github.com/spf13/cobra"
88
"github.com/stackitcloud/stackit-sdk-go/services/intake/wait"
99

10-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1211
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1514
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1615
"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
1716
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
17+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1818
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1919
"github.com/stackitcloud/stackit-sdk-go/services/intake"
2020
)
@@ -30,7 +30,7 @@ type inputModel struct {
3030
}
3131

3232
// NewCmd creates a new cobra command for deleting an Intake
33-
func NewCmd(p *params.CmdParams) *cobra.Command {
33+
func NewCmd(p *types.CmdParams) *cobra.Command {
3434
cmd := &cobra.Command{
3535
Use: fmt.Sprintf("delete %s", intakeIdArg),
3636
Short: "Deletes an Intake",

‎internal/cmd/beta/intake/instance/describe/describe.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88
"github.com/spf13/cobra"
99
"github.com/stackitcloud/stackit-sdk-go/services/intake"
1010

11-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1312
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
1514
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1615
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1716
"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
1817
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
18+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1919
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
2020
)
2121

@@ -28,7 +28,7 @@ type inputModel struct {
2828
IntakeId string
2929
}
3030

31-
func NewCmd(p *params.CmdParams) *cobra.Command {
31+
func NewCmd(p *types.CmdParams) *cobra.Command {
3232
cmd := &cobra.Command{
3333
Use: fmt.Sprintf("describe %s", intakeIdArg),
3434
Short: "Shows details of an Intake",
@@ -90,38 +90,38 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *intake.APIC
9090
return req
9191
}
9292

93-
func outputResult(p *print.Printer, outputFormat string, intake *intake.IntakeResponse) error {
94-
if intake == nil {
93+
func outputResult(p *print.Printer, outputFormat string, intk *intake.IntakeResponse) error {
94+
if intk == nil {
9595
return fmt.Errorf("received nil response, could not display details")
9696
}
9797

98-
return p.OutputResult(outputFormat, intake, func() error {
98+
return p.OutputResult(outputFormat, intk, func() error {
9999
table := tables.NewTable()
100100
table.SetHeader("Attribute", "Value")
101101

102-
table.AddRow("ID", intake.GetId())
103-
table.AddRow("Name", intake.GetDisplayName())
104-
table.AddRow("State", intake.GetState())
105-
table.AddRow("Runner ID", intake.GetIntakeRunnerId())
106-
table.AddRow("Created", intake.GetCreateTime())
107-
table.AddRow("Labels", intake.GetLabels())
102+
table.AddRow("ID", intk.GetId())
103+
table.AddRow("Name", intk.GetDisplayName())
104+
table.AddRow("State", intk.GetState())
105+
table.AddRow("Runner ID", intk.GetIntakeRunnerId())
106+
table.AddRow("Created", intk.GetCreateTime())
107+
table.AddRow("Labels", intk.GetLabels())
108108

109-
if description := intake.GetDescription(); description != "" {
109+
if description := intk.GetDescription(); description != "" {
110110
table.AddRow("Description", description)
111111
}
112112

113-
if failureMessage := intake.GetFailureMessage(); failureMessage != "" {
113+
if failureMessage := intk.GetFailureMessage(); failureMessage != "" {
114114
table.AddRow("Failure Message", failureMessage)
115115
}
116116

117117
table.AddSeparator()
118-
table.AddRow("Ingestion URI", intake.GetUri())
119-
table.AddRow("Topic", intake.GetTopic())
120-
table.AddRow("Dead Letter Topic", intake.GetDeadLetterTopic())
121-
table.AddRow("Undelivered Messages", intake.GetUndeliveredMessageCount())
118+
table.AddRow("Ingestion URI", intk.GetUri())
119+
table.AddRow("Topic", intk.GetTopic())
120+
table.AddRow("Dead Letter Topic", intk.GetDeadLetterTopic())
121+
table.AddRow("Undelivered Messages", intk.GetUndeliveredMessageCount())
122122

123123
table.AddSeparator()
124-
catalog := intake.GetCatalog()
124+
catalog := intk.GetCatalog()
125125
table.AddRow("Catalog URI", catalog.GetUri())
126126
table.AddRow("Catalog Warehouse", catalog.GetWarehouse())
127127
if namespace := catalog.GetNamespace(); namespace != "" {

‎internal/cmd/beta/intake/instance/describe/describe_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1414
"github.com/stackitcloud/stackit-sdk-go/services/intake"
1515
)
1616

@@ -181,7 +181,7 @@ func TestOutputResult(t *testing.T) {
181181
},
182182
}
183183
p := print.NewPrinter()
184-
p.Cmd = NewCmd(&params.CmdParams{Printer: p})
184+
p.Cmd = NewCmd(&types.CmdParams{Printer: p})
185185
for _, tt := range tests {
186186
t.Run(tt.name, func(t *testing.T) {
187187
if err := outputResult(p, tt.args.outputFormat, tt.args.intakeResp); (err != nil) != tt.wantErr {

‎internal/cmd/beta/intake/instance/list/list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/spf13/cobra"
88
"github.com/stackitcloud/stackit-sdk-go/services/intake"
99

10-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1211
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -17,6 +16,7 @@ import (
1716
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1817
"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
1918
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
19+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
2020
)
2121

2222
const (
@@ -30,7 +30,7 @@ type inputModel struct {
3030
}
3131

3232
// NewCmd creates a new cobra command for listing Intakes
33-
func NewCmd(p *params.CmdParams) *cobra.Command {
33+
func NewCmd(p *types.CmdParams) *cobra.Command {
3434
cmd := &cobra.Command{
3535
Use: "list",
3636
Short: "Lists all Intakes",

‎internal/cmd/beta/intake/instance/list/list_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"github.com/google/go-cmp/cmp/cmpopts"
1010
"github.com/google/uuid"
1111
"github.com/spf13/cobra"
12-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1514
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
15+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1717
"github.com/stackitcloud/stackit-sdk-go/services/intake"
1818
)
@@ -111,7 +111,7 @@ func TestParseInput(t *testing.T) {
111111

112112
for _, tt := range tests {
113113
t.Run(tt.description, func(t *testing.T) {
114-
testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, args []string) (*inputModel, error) {
114+
testutils.TestParseInput(t, NewCmd, func(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
115115
return parseInput(p, cmd)
116116
}, tt.expectedModel, nil, tt.flagValues, tt.isValid)
117117
})
@@ -194,7 +194,7 @@ func TestOutputResult(t *testing.T) {
194194
},
195195
}
196196
p := print.NewPrinter()
197-
p.Cmd = NewCmd(&params.CmdParams{Printer: p})
197+
p.Cmd = NewCmd(&types.CmdParams{Printer: p})
198198
for _, tt := range tests {
199199
t.Run(tt.name, func(t *testing.T) {
200200
if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.intakes); (err != nil) != tt.wantErr {

‎internal/cmd/beta/intake/instance/update/update.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/stackitcloud/stackit-sdk-go/services/intake"
99
"github.com/stackitcloud/stackit-sdk-go/services/intake/wait"
1010

11-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1312
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -18,6 +17,7 @@ import (
1817
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1918
"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
2019
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
20+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
2121
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
2222
)
2323

@@ -64,7 +64,7 @@ type inputModel struct {
6464
DremioToken *string
6565
}
6666

67-
func NewCmd(p *params.CmdParams) *cobra.Command {
67+
func NewCmd(p *types.CmdParams) *cobra.Command {
6868
cmd := &cobra.Command{
6969
Use: fmt.Sprintf("update %s", intakeIdArg),
7070
Short: "Updates an Intake",

‎internal/cmd/beta/intake/instance/update/update_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
1312
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1515
"github.com/stackitcloud/stackit-sdk-go/services/intake"
1616
)
@@ -272,7 +272,7 @@ func TestOutputResult(t *testing.T) {
272272
},
273273
}
274274
p := print.NewPrinter()
275-
p.Cmd = NewCmd(&params.CmdParams{Printer: p})
275+
p.Cmd = NewCmd(&types.CmdParams{Printer: p})
276276
for _, tt := range tests {
277277
t.Run(tt.name, func(t *testing.T) {
278278
if err := outputResult(p, &inputModel{GlobalFlagModel: &globalflags.GlobalFlagModel{OutputFormat: tt.args.outputFormat}}, tt.args.projectLabel, tt.args.resp); (err != nil) != tt.wantErr {

0 commit comments

Comments
 (0)