Bump Intake OpenAPI to 0.2.0 and address update fixes

Author: Yago Carlos Fernandez Gou

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1
 	github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1
 	github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0
-	github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1
+	github.com/stackitcloud/stackit-sdk-go/services/intake v0.2.0
 	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2
 	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1
 	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.1

go.sum

@@ -579,6 +579,8 @@ github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.0 h1:IhswZoEHqkBW60w
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.0/go.mod h1:vRnT3zxWJ1k7wbAk8JmO0xFmPhmeos5HTIWdsVAAoKU=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1 h1:qKAGtRfnB89vXom5mIwctMHFeznMQWXJd3cqQBURIK8=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.1.1/go.mod h1:jOArPjNRkwv4487+9ab3dRG+lM09leu5FiRohbQs9Z4=
+github.com/stackitcloud/stackit-sdk-go/services/intake v0.2.0 h1:p/zi4VPoCQWk7/2ubi3hxsqiaye41x/Pl3GXYbPkYOY=
+github.com/stackitcloud/stackit-sdk-go/services/intake v0.2.0/go.mod h1:jOArPjNRkwv4487+9ab3dRG+lM09leu5FiRohbQs9Z4=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1 h1:OdJEs8eOfrzn9tCBDLxIyP8hX50zPfcXNYnRoQX+chs=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1/go.mod h1:11uzaOPCF9SeDHXEGOPMlHDD3J5r2TnvCGUwW9Igq9c=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1 h1:hv5WrRU9rN6Jx4OwdOGJRyaQrfA9p1tzEoQK6/CDyoA=

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

@@ -2,7 +2,10 @@ package update
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"github.com/goccy/go-yaml"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 
 	"github.com/spf13/cobra"
 
@@ -70,14 +73,20 @@ func NewUpdateCmd(p *params.CmdParams) *cobra.Command {
 				return err
 			}
 
+			projectLabel, err := projectname.GetProjectName(ctx, p.Printer, p.CliVersion, cmd)
+			if err != nil {
+				p.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
+				projectLabel = model.ProjectId
+			}
+
 			// Call API
 			req := buildRequest(ctx, model, apiClient)
-			if err := req.Execute(); err != nil {
+			resp, err := req.Execute()
+			if err != nil {
 				return fmt.Errorf("update Intake Runner: %w", err)
 			}
 
-			p.Printer.Info("Update request for Intake Runner %q sent successfully.\n", model.RunnerId)
-			return nil
+			return outputResult(p.Printer, model.OutputFormat, projectLabel, resp)
 		},
 	}
 	configureFlags(cmd)
@@ -149,3 +158,27 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *intake.APIC
 	req = req.UpdateIntakeRunnerPayload(payload)
 	return req
 }
+
+func outputResult(p *print.Printer, outputFormat, projectLabel string, resp *intake.IntakeRunnerResponse) error {
+	switch outputFormat {
+	case print.JSONOutputFormat:
+		details, err := json.MarshalIndent(resp, "", "  ")
+		if err != nil {
+			return fmt.Errorf("marshal instance: %w", err)
+		}
+		p.Outputln(string(details))
+
+		return nil
+	case print.YAMLOutputFormat:
+		details, err := yaml.MarshalWithOptions(resp, yaml.IndentSequence(true), yaml.UseJSONMarshaler())
+		if err != nil {
+			return fmt.Errorf("marshal instance: %w", err)
+		}
+		p.Outputln(string(details))
+
+		return nil
+	default:
+		p.Outputf("Updated Intake Runner for project %q. Runner ID: %s\n", projectLabel, utils.PtrString(resp.Id))
+		return nil
+	}
+}

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

@@ -247,3 +247,47 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		projectLabel string
+		runnerId     string
+		resp         *intake.IntakeRunnerResponse
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "default output",
+			args:    args{outputFormat: "default", projectLabel: "my-project", runnerId: "runner-id-123", resp: &intake.IntakeRunnerResponse{}},
+			wantErr: false,
+		},
+		{
+			name:    "json output",
+			args:    args{outputFormat: print.JSONOutputFormat, resp: &intake.IntakeRunnerResponse{Id: utils.Ptr("runner-id-123")}},
+			wantErr: false,
+		},
+		{
+			name:    "yaml output",
+			args:    args{outputFormat: print.YAMLOutputFormat, resp: &intake.IntakeRunnerResponse{Id: utils.Ptr("runner-id-123")}},
+			wantErr: false,
+		},
+		{
+			name:    "nil response",
+			args:    args{outputFormat: print.JSONOutputFormat, resp: nil},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewUpdateCmd(&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.resp); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}