Skip to content

Commit 732eff1

Browse files
author
Yago Carlos Fernandez Gou
committed
remove option for clearing labels
1 parent 6b4fa65 commit 732eff1

File tree

9 files changed

+12
-164
lines changed

9 files changed

+12
-164
lines changed

‎docs/stackit_intake_runner_update.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ stackit intake runner update RUNNER_ID [flags]
2929
--description string Description
3030
--display-name string Display name
3131
-h, --help Help for "stackit intake runner update"
32-
--labels string Labels in key=value format. To clear all labels, provide an empty string, e.g. --labels ""
32+
--labels stringToString Labels in key=value format. To clear all labels, provide an empty string, e.g. --labels "" (default [])
3333
--max-message-size-kib int Maximum message size in KiB. Note: Overall message capacity cannot be decreased.
3434
--max-messages-per-hour int Maximum number of messages per hour. Note: Overall message capacity cannot be decreased.
3535
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1
2222
github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1
2323
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0
24-
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.0
24+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1
2525
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2
2626
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1
2727
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.1

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0 h1:01+noyCSadNH3ALH
577577
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0/go.mod h1:854gnLR92NvAbJAA1xZEumrtNh1DoBP1FXTMvhwYA6w=
578578
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.0 h1:IhswZoEHqkBW60wEmRaeoSrW68PGLQKrWVmMPMzwYrY=
579579
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.0/go.mod h1:vRnT3zxWJ1k7wbAk8JmO0xFmPhmeos5HTIWdsVAAoKU=
580+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1 h1:qKAGtRfnB89vXom5mIwctMHFeznMQWXJd3cqQBURIK8=
581+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1/go.mod h1:jOArPjNRkwv4487+9ab3dRG+lM09leu5FiRohbQs9Z4=
580582
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1 h1:OdJEs8eOfrzn9tCBDLxIyP8hX50zPfcXNYnRoQX+chs=
581583
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1/go.mod h1:11uzaOPCF9SeDHXEGOPMlHDD3J5r2TnvCGUwW9Igq9c=
582584
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1 h1:hv5WrRU9rN6Jx4OwdOGJRyaQrfA9p1tzEoQK6/CDyoA=

‎internal/cmd/intake/common/util.go‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎internal/cmd/intake/common/util_test.go‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎internal/cmd/intake/runner/create/create.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const (
2626
maxMessageSizeKiBFlag = "max-message-size-kib"
2727
maxMessagesPerHourFlag = "max-messages-per-hour"
2828
descriptionFlag = "description"
29-
labelsFlag = "labels"
29+
labelFlag = "labels"
3030
)
3131

3232
// inputModel struct holds all the input parameters for the command
@@ -99,7 +99,7 @@ func configureFlags(cmd *cobra.Command) {
9999
cmd.Flags().Int64(maxMessageSizeKiBFlag, 0, "Maximum message size in KiB")
100100
cmd.Flags().Int64(maxMessagesPerHourFlag, 0, "Maximum number of messages per hour")
101101
cmd.Flags().String(descriptionFlag, "", "Description")
102-
cmd.Flags().StringToString(labelsFlag, nil, "Labels in key=value format, separated by commas. Example: --labels \"key1=value1,key2=value2\"")
102+
cmd.Flags().StringToString(labelFlag, nil, "Labels in key=value format, separated by commas. Example: --labels \"key1=value1,key2=value2\"")
103103

104104
err := flags.MarkFlagsRequired(cmd, displayNameFlag, maxMessageSizeKiBFlag, maxMessagesPerHourFlag)
105105
cobra.CheckErr(err)
@@ -117,7 +117,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
117117
MaxMessageSizeKiB: flags.FlagToInt64Pointer(p, cmd, maxMessageSizeKiBFlag),
118118
MaxMessagesPerHour: flags.FlagToInt64Pointer(p, cmd, maxMessagesPerHourFlag),
119119
Description: flags.FlagToStringPointer(p, cmd, descriptionFlag),
120-
Labels: flags.FlagToStringToStringPointer(p, cmd, labelsFlag),
120+
Labels: flags.FlagToStringToStringPointer(p, cmd, labelFlag),
121121
}
122122

123123
if p.IsVerbosityDebug() {

‎internal/cmd/intake/runner/create/create_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
4343
maxMessageSizeKiBFlag: "1024",
4444
maxMessagesPerHourFlag: "10000",
4545
descriptionFlag: testDescription,
46-
labelsFlag: testLabelsString,
46+
labelFlag: testLabelsString,
4747
}
4848
for _, mod := range mods {
4949
mod(flagValues)

‎internal/cmd/intake/runner/update/update.go‎

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

77
"github.com/spf13/cobra"
88

9-
"github.com/stackitcloud/stackit-cli/internal/cmd/intake/common"
109
"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"
@@ -28,7 +27,7 @@ const (
2827
maxMessageSizeKiBFlag = "max-message-size-kib"
2928
maxMessagesPerHourFlag = "max-messages-per-hour"
3029
descriptionFlag = "description"
31-
labelsFlag = "labels"
30+
labelFlag = "labels"
3231
)
3332

3433
type inputModel struct {
@@ -90,7 +89,7 @@ func configureFlags(cmd *cobra.Command) {
9089
cmd.Flags().Int64(maxMessageSizeKiBFlag, 0, "Maximum message size in KiB. Note: Overall message capacity cannot be decreased.")
9190
cmd.Flags().Int64(maxMessagesPerHourFlag, 0, "Maximum number of messages per hour. Note: Overall message capacity cannot be decreased.")
9291
cmd.Flags().String(descriptionFlag, "", "Description")
93-
cmd.Flags().String(labelsFlag, "", "Labels in key=value format. To clear all labels, provide an empty string, e.g. --labels \"\"")
92+
cmd.Flags().StringToString(labelFlag, nil, "Labels in key=value format. To clear all labels, provide an empty string, e.g. --labels \"\"")
9493
}
9594

9695
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
@@ -101,34 +100,14 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
101100
return nil, &cliErr.ProjectIdError{}
102101
}
103102

104-
var labels *map[string]string
105-
if cmd.Flags().Changed(labelsFlag) {
106-
labelsVal, err := cmd.Flags().GetString(labelsFlag)
107-
if err != nil {
108-
return nil, fmt.Errorf("could not parse --%s: %w", labelsFlag, err)
109-
}
110-
if labelsVal == "" {
111-
// User wants to clear labels
112-
labels = &map[string]string{}
113-
} else {
114-
// User provided labels, parse them
115-
parsedLabels, err := common.ParseLabels(labelsVal)
116-
if err != nil {
117-
return nil, err
118-
}
119-
120-
labels = &parsedLabels
121-
}
122-
}
123-
124103
model := inputModel{
125104
GlobalFlagModel: globalFlags,
126105
RunnerId: runnerId,
127106
DisplayName: flags.FlagToStringPointer(p, cmd, displayNameFlag),
128107
MaxMessageSizeKiB: flags.FlagToInt64Pointer(p, cmd, maxMessageSizeKiBFlag),
129108
MaxMessagesPerHour: flags.FlagToInt64Pointer(p, cmd, maxMessagesPerHourFlag),
130109
Description: flags.FlagToStringPointer(p, cmd, descriptionFlag),
131-
Labels: labels,
110+
Labels: flags.FlagToStringToStringPointer(p, cmd, labelFlag),
132111
}
133112

134113
if model.DisplayName == nil && model.MaxMessageSizeKiB == nil && model.MaxMessagesPerHour == nil && model.Description == nil && model.Labels == nil {

‎internal/cmd/intake/runner/update/update_test.go‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func TestParseInput(t *testing.T) {
105105
flagValues[maxMessageSizeKiBFlag] = "2048"
106106
flagValues[maxMessagesPerHourFlag] = "10000"
107107
flagValues[descriptionFlag] = "new description"
108-
flagValues[labelsFlag] = "env=prod,team=sre"
108+
flagValues[labelFlag] = "env=prod,team=sre"
109109
}),
110110
isValid: true,
111111
expectedModel: fixtureInputModel(func(model *inputModel) {
@@ -115,17 +115,6 @@ func TestParseInput(t *testing.T) {
115115
model.Labels = utils.Ptr(map[string]string{"env": "prod", "team": "sre"})
116116
}),
117117
},
118-
{
119-
description: "clear labels",
120-
argValues: fixtureArgValues(),
121-
flagValues: fixtureFlagValues(func(flagValues map[string]string) {
122-
flagValues[labelsFlag] = ""
123-
}),
124-
isValid: true,
125-
expectedModel: fixtureInputModel(func(model *inputModel) {
126-
model.Labels = utils.Ptr(map[string]string{})
127-
}),
128-
},
129118
{
130119
description: "no args",
131120
argValues: []string{},

0 commit comments

Comments
 (0)