Skip to content

Commit 4eb0fc9

Browse files
Benjosh95Benjosh95
committed
adjust all commands of ske service to use validate project function
1 parent 47e2954 commit 4eb0fc9

File tree

7 files changed

+48
-44
lines changed

7 files changed

+48
-44
lines changed

‎internal/cmd/ske/cluster/create/create.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
17-
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1817
serviceEnablementClient "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
1918
serviceEnablementUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
2019
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/client"
2120
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/utils"
2221
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
2322
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
23+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
2424
"github.com/stackitcloud/stackit-sdk-go/services/ske"
2525
"github.com/stackitcloud/stackit-sdk-go/services/ske/wait"
2626
)
@@ -70,16 +70,16 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
7070
return err
7171
}
7272

73-
// Configure API client
74-
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
73+
// Validate project ID (exists and user has access)
74+
projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
7575
if err != nil {
7676
return err
7777
}
7878

79-
projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
79+
// Configure API client
80+
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
8081
if err != nil {
81-
params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
82-
projectLabel = model.ProjectId
82+
return err
8383
}
8484

8585
if !model.AssumeYes {
@@ -159,9 +159,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
159159
clusterName := inputArgs[0]
160160

161161
globalFlags := globalflags.Parse(p, cmd)
162-
if globalFlags.ProjectId == "" {
163-
return nil, &errors.ProjectIdError{}
164-
}
165162

166163
payloadValue := flags.FlagToStringPointer(p, cmd, payloadFlag)
167164
var payload *ske.CreateOrUpdateClusterPayload

‎internal/cmd/ske/cluster/delete/delete.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66

77
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
109
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
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/services/ske/client"
1413
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
14+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
1515

1616
"github.com/spf13/cobra"
1717
"github.com/stackitcloud/stackit-sdk-go/services/ske"
@@ -45,6 +45,12 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4545
return err
4646
}
4747

48+
// Validate project ID (exists and user has access)
49+
_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
50+
if err != nil {
51+
return err
52+
}
53+
4854
// Configure API client
4955
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
5056
if err != nil {
@@ -92,9 +98,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9298
clusterName := inputArgs[0]
9399

94100
globalFlags := globalflags.Parse(p, cmd)
95-
if globalFlags.ProjectId == "" {
96-
return nil, &errors.ProjectIdError{}
97-
}
98101

99102
model := inputModel{
100103
GlobalFlagModel: globalFlags,

‎internal/cmd/ske/cluster/describe/describe.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
13-
"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/ske/client"
1817
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
1918
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
19+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
2020
"github.com/stackitcloud/stackit-sdk-go/services/ske"
2121
)
2222

@@ -49,6 +49,13 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4949
if err != nil {
5050
return err
5151
}
52+
53+
// Validate project ID (exists and user has access)
54+
_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
55+
if err != nil {
56+
return err
57+
}
58+
5259
// Configure API client
5360
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
5461
if err != nil {
@@ -72,9 +79,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
7279
clusterName := inputArgs[0]
7380

7481
globalFlags := globalflags.Parse(p, cmd)
75-
if globalFlags.ProjectId == "" {
76-
return nil, &errors.ProjectIdError{}
77-
}
7882

7983
model := inputModel{
8084
GlobalFlagModel: globalFlags,

‎internal/cmd/ske/describe/describe.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
"github.com/spf13/cobra"
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
12-
"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/service-enablement/client"
1716
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
1817
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
1918
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
19+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
2020
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
2121
)
2222

@@ -41,6 +41,13 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4141
if err != nil {
4242
return err
4343
}
44+
45+
// Validate project ID (exists and user has access)
46+
_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
47+
if err != nil {
48+
return err
49+
}
50+
4451
// Configure API client
4552
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
4653
if err != nil {
@@ -62,9 +69,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6269

6370
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
6471
globalFlags := globalflags.Parse(p, cmd)
65-
if globalFlags.ProjectId == "" {
66-
return nil, &errors.ProjectIdError{}
67-
}
6872

6973
model := inputModel{
7074
GlobalFlagModel: globalFlags,

‎internal/cmd/ske/disable/disable.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import (
66

77
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
109
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13-
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1412
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
1513
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
1614
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
15+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
1716

1817
"github.com/spf13/cobra"
1918
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
@@ -42,16 +41,16 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4241
return err
4342
}
4443

45-
// Configure API client
46-
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
44+
// Validate project ID (exists and user has access)
45+
projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
4746
if err != nil {
4847
return err
4948
}
5049

51-
projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
50+
// Configure API client
51+
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
5252
if err != nil {
53-
params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
54-
projectLabel = model.ProjectId
53+
return err
5554
}
5655

5756
if !model.AssumeYes {
@@ -93,9 +92,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
9392

9493
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
9594
globalFlags := globalflags.Parse(p, cmd)
96-
if globalFlags.ProjectId == "" {
97-
return nil, &errors.ProjectIdError{}
98-
}
9995

10096
model := inputModel{
10197
GlobalFlagModel: globalFlags,

‎internal/cmd/ske/enable/enable.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import (
66

77
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
109
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
1110
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1211
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13-
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
1412
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/client"
1513
"github.com/stackitcloud/stackit-cli/internal/pkg/services/service-enablement/utils"
1614
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
15+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
1716

1817
"github.com/spf13/cobra"
1918
"github.com/stackitcloud/stackit-sdk-go/services/serviceenablement"
@@ -42,16 +41,16 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
4241
return err
4342
}
4443

45-
// Configure API client
46-
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
44+
// Validate project ID (exists and user has access)
45+
projectLabel, err := validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
4746
if err != nil {
4847
return err
4948
}
5049

51-
projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
50+
// Configure API client
51+
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
5252
if err != nil {
53-
params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
54-
projectLabel = model.ProjectId
53+
return err
5554
}
5655

5756
if !model.AssumeYes {
@@ -93,9 +92,6 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
9392

9493
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
9594
globalFlags := globalflags.Parse(p, cmd)
96-
if globalFlags.ProjectId == "" {
97-
return nil, &errors.ProjectIdError{}
98-
}
9995

10096
model := inputModel{
10197
GlobalFlagModel: globalFlags,

‎internal/cmd/ske/kubeconfig/create/create.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/client"
1717
skeUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/ske/utils"
1818
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
19+
"github.com/stackitcloud/stackit-cli/internal/pkg/validation"
1920

2021
"github.com/spf13/cobra"
2122
"github.com/stackitcloud/stackit-sdk-go/services/ske"
@@ -83,6 +84,12 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
8384
return err
8485
}
8586

87+
// Validate project ID (exists and user has access)
88+
_, err = validation.ValidateProject(ctx, params.Printer, params.CliVersion, cmd, model.ProjectId)
89+
if err != nil {
90+
return err
91+
}
92+
8693
// Configure API client
8794
apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
8895
if err != nil {
@@ -180,9 +187,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
180187
clusterName := inputArgs[0]
181188

182189
globalFlags := globalflags.Parse(p, cmd)
183-
if globalFlags.ProjectId == "" {
184-
return nil, &errors.ProjectIdError{}
185-
}
186190

187191
expTime := flags.FlagToStringPointer(p, cmd, expirationFlag)
188192

0 commit comments

Comments
 (0)