address review comments

Author: Yago Carlos Fernandez Gou

internal/cmd/intake/common/util_test.go

@@ -0,0 +1,95 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestParseLabels(t *testing.T) {
+	tests := []struct {
+		description string
+		input       string
+		expectedMap map[string]string
+		expectError bool
+	}{
+		{
+			description: "single label",
+			input:       "key1=val1",
+			expectedMap: map[string]string{"key1": "val1"},
+			expectError: false,
+		},
+		{
+			description: "multiple labels",
+			input:       "key1=val1,key2=val2",
+			expectedMap: map[string]string{"key1": "val1", "key2": "val2"},
+			expectError: false,
+		},
+		{
+			description: "empty value",
+			input:       "key1=",
+			expectedMap: map[string]string{"key1": ""},
+			expectError: false,
+		},
+		{
+			description: "value with equals sign",
+			input:       "key1=value=with=equals",
+			expectedMap: map[string]string{"key1": "value=with=equals"},
+			expectError: false,
+		},
+		{
+			description: "special case: empty string to clear labels",
+			input:       "",
+			expectedMap: map[string]string{}, // Should be an empty map, not nil
+			expectError: false,
+		},
+		{
+			description: "invalid format - no equals",
+			input:       "key1val1",
+			expectedMap: nil,
+			expectError: true,
+		},
+		{
+			description: "invalid format - empty key",
+			input:       "=val1",
+			expectedMap: nil,
+			expectError: true,
+		},
+		{
+			description: "mixed valid and invalid pair",
+			input:       "key1=val1,key2",
+			expectedMap: nil,
+			expectError: true,
+		},
+		{
+			description: "invalid format - leading comma",
+			input:       ",key1=val1",
+			expectedMap: nil,
+			expectError: true,
+		},
+		{
+			description: "invalid format - trailing comma",
+			input:       "key1=val1,",
+			expectedMap: nil,
+			expectError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.description, func(t *testing.T) {
+			parsedMap, err := ParseLabels(tt.input)
+
+			if !tt.expectError && err != nil {
+				t.Fatalf("did not expect an error, but got: %v", err)
+			}
+
+			if tt.expectError && err == nil {
+				t.Fatalf("expected an error, but got nil")
+			}
+
+			if diff := cmp.Diff(tt.expectedMap, parsedMap); diff != "" {
+				t.Errorf("map mismatch (-want +got):\n%s", diff)
+			}
+		})
+	}
+}

internal/cmd/intake/intake.go

@@ -5,27 +5,22 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/cmd/intake/runner"
 	"github.com/stackitcloud/stackit-cli/internal/cmd/params"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 )
 
 // NewCmd creates the 'stackit intake' command
 func NewCmd(params *params.CmdParams) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "intake",
-		Short: "Provides functionality for STACKIT Intake",
-		Long:  "Provides functionality for STACKIT Intake.",
+		Short: "Provides functionality for intake",
+		Long:  "Provides functionality for intake.",
 		Args:  args.NoArgs,
-		Example: examples.Build(
-			examples.NewExample(
-				``,
-				"$ stackit intake"),
-		),
-		Run: utils.CmdHelp,
+		Run:   utils.CmdHelp,
 	}
+	addSubcommands(cmd, params)
+	return cmd
+}
 
-	// Sub-commands
+func addSubcommands(cmd *cobra.Command, params *params.CmdParams) {
 	cmd.AddCommand(runner.NewCmd(params))
-
-	return cmd
 }

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

@@ -18,6 +18,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/intake/client"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 )
 
 const (
@@ -85,9 +86,8 @@ func NewCreateCmd(p *params.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create Intake Runner: %w", err)
 			}
-			runnerId := *resp.Id
 
-			return outputResult(p.Printer, model.OutputFormat, projectLabel, runnerId, resp)
+			return outputResult(p.Printer, model.OutputFormat, projectLabel, resp)
 		},
 	}
 	configureFlags(cmd)
@@ -150,7 +150,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *intake.APIC
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat, projectLabel, runnerId string, resp *intake.IntakeRunnerResponse) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, resp *intake.IntakeRunnerResponse) error {
 	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(resp, "", "  ")
@@ -169,7 +169,7 @@ func outputResult(p *print.Printer, outputFormat, projectLabel, runnerId string,
 
 		return nil
 	default:
-		p.Outputf("Created Intake Runner for project %q. Runner ID: %s\n", projectLabel, runnerId)
+		p.Outputf("Created Intake Runner for project %q. Runner ID: %s\n", projectLabel, utils.PtrString(resp.Id))
 		return nil
 	}
 }

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

@@ -289,7 +289,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCreateCmd(&params.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.runnerId, tt.args.resp); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.resp); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/intake/runner/delete/delete.go

@@ -65,7 +65,7 @@ func NewDeleteCmd(p *params.CmdParams) *cobra.Command {
 				return fmt.Errorf("delete Intake Runner: %w", err)
 			}
 
-			p.Printer.Info("Deletion request for Intake Runner %q sent successfully.\n", model.RunnerId)
+			p.Printer.Outputf("Deletion request for Intake Runner %q sent successfully.\n", model.RunnerId)
 			return nil
 		},
 	}

internal/cmd/intake/runner/list/list.go

@@ -74,7 +74,7 @@ func NewListCmd(p *params.CmdParams) *cobra.Command {
 					p.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
 					projectLabel = model.ProjectId
 				}
-				p.Printer.Info("No Intake Runners found for project %q\n", projectLabel)
+				p.Printer.Outputf("No Intake Runners found for project %q\n", projectLabel)
 				return nil
 			}
 

internal/cmd/intake/runner/list/list_test.go

@@ -208,6 +208,13 @@ func TestOutputResult(t *testing.T) {
 			args:    args{runners: nil},
 			wantErr: false,
 		},
+		{
+			name: "empty intake runner in slice",
+			args: args{
+				runners: []intake.IntakeRunnerResponse{{}},
+			},
+			wantErr: false,
+		},
 	}
 	p := print.NewPrinter()
 	p.Cmd = NewListCmd(&params.CmdParams{Printer: p})