Skip to content

Commit 1a7cdcb

Browse files
committed
chore(edge): fix review comments
relates to STACKITCLI-357
1 parent 4362107 commit 1a7cdcb

7 files changed

Lines changed: 3 additions & 53 deletions

File tree

internal/cmd/beta/edge/instance/create/create.go

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

11-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
12-
1311
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1412
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1513
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -120,10 +118,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
120118

121119
displayNameValue := flags.FlagToStringValue(p, cmd, displayNameFlag)
122120
planIdValue := flags.FlagToStringValue(p, cmd, planIdFlag)
123-
err := utils.ValidateUUID(planIdValue)
124-
if err != nil {
125-
return nil, err
126-
}
127121
descriptionValue := flags.FlagToStringPointer(p, cmd, descriptionFlag)
128122

129123
model := inputModel{

internal/cmd/beta/edge/instance/update/update.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import (
66

77
"github.com/spf13/cobra"
88

9-
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
10-
119
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1210
cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors"
1311
"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
@@ -137,15 +135,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
137135
return nil, &cliErr.ProjectIdError{}
138136
}
139137

140-
planIdValue := flags.FlagToStringValue(p, cmd, planIdFlag)
141-
err := utils.ValidateUUID(planIdValue)
142-
if err != nil {
143-
return nil, err
144-
}
145-
146138
model := inputModel{
147139
GlobalFlagModel: globalFlags,
148-
PlanId: &planIdValue,
140+
PlanId: flags.FlagToStringPointer(p, cmd, planIdFlag),
149141
InstanceId: instanceId,
150142
Description: flags.FlagToStringPointer(p, cmd, descriptionFlag),
151143
}

internal/cmd/beta/edge/instance/update/update_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,6 @@ func TestParseInput(t *testing.T) {
154154
flagValues: fixtureFlagValues(),
155155
isValid: false,
156156
},
157-
{
158-
description: "plan id invalid",
159-
argValues: fixtureArgValues(),
160-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
161-
flagValues[planIdFlag] = "invalid-uuid"
162-
}),
163-
isValid: false,
164-
},
165157
}
166158

167159
for _, tt := range tests {

internal/cmd/beta/edge/kubeconfig/create/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
150150
}
151151

152152
func configureFlags(cmd *cobra.Command) {
153-
cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "Edge Cloud instance ID")
153+
cmd.Flags().String(instanceIdFlag, "", "Edge Cloud instance ID")
154154
cmd.Flags().Bool(disableWritingFlag, false, "Disable writing the kubeconfig to a file.")
155155
cmd.Flags().StringP(filepathFlag, "f", "", "Path to the kubeconfig file. A default is chosen by Kubernetes if not set.")
156156
cmd.Flags().StringP(expirationFlag, "e", "", "Expiration time for the kubeconfig, e.g. 5d. By default, the token is valid for 1h.")

internal/cmd/beta/edge/kubeconfig/create/create_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,20 +160,6 @@ func TestParseInput(t *testing.T) {
160160
}),
161161
isValid: false,
162162
},
163-
{
164-
description: "instance id invalid 1",
165-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
166-
flagValues[instanceIdFlag] = ""
167-
}),
168-
isValid: false,
169-
},
170-
{
171-
description: "instance id invalid 2",
172-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
173-
flagValues[instanceIdFlag] = "invalid-uuid"
174-
}),
175-
isValid: false,
176-
},
177163
{
178164
description: "disable writing and invalid output format",
179165
flagValues: fixtureFlagValues(func(flagValues map[string]string) {

internal/cmd/beta/edge/token/create/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
122122
}
123123

124124
func configureFlags(cmd *cobra.Command) {
125-
cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "Edge Cloud instance ID")
125+
cmd.Flags().String(instanceIdFlag, "", "Edge Cloud instance ID")
126126
cmd.Flags().StringP(expirationFlag, "e", "", "Expiration time for the token, e.g. 5d. By default, the token is valid for 1h.")
127127

128128
err := flags.MarkFlagsRequired(cmd, instanceIdFlag)

internal/cmd/beta/edge/token/create/create_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,6 @@ func TestParseInput(t *testing.T) {
132132
}),
133133
isValid: false,
134134
},
135-
{
136-
description: "instance id invalid 1",
137-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
138-
flagValues[instanceIdFlag] = ""
139-
}),
140-
isValid: false,
141-
},
142-
{
143-
description: "instance id invalid 2",
144-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
145-
flagValues[instanceIdFlag] = "invalid-uuid"
146-
}),
147-
isValid: false,
148-
},
149135
{
150136
description: "invalid expiration format",
151137
isValid: false,

0 commit comments

Comments
 (0)