fix(git): print valid JSON/YAML output for list cmds

relates to STACKITCLI-265 / #893

Author: rubenhoenle

internal/cmd/git/flavor/list/list.go

@@ -60,19 +60,20 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("get STACKIT Git flavors: %w", err)
 			}
-			flavors := *resp.Flavors
-			if len(flavors) == 0 {
-				projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
-				if err != nil {
-					params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
-					projectLabel = model.ProjectId
-				}
-				params.Printer.Info("No flavors found for project %q\n", projectLabel)
-				return nil
-			} else if model.Limit != nil && len(flavors) > int(*model.Limit) {
+			flavors := resp.GetFlavors()
+
+			projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
+				projectLabel = model.ProjectId
+			}
+
+			// Truncate output
+			if model.Limit != nil && len(flavors) > int(*model.Limit) {
 				flavors = (flavors)[:*model.Limit]
 			}
-			return outputResult(params.Printer, model.OutputFormat, flavors)
+
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, flavors)
 		},
 	}
 	configureFlags(cmd)
@@ -110,8 +111,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *git.APIClie
 	return apiClient.ListFlavors(ctx, model.ProjectId)
 }
 
-func outputResult(p *print.Printer, outputFormat string, flavors []git.Flavor) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, flavors []git.Flavor) error {
 	return p.OutputResult(outputFormat, flavors, func() error {
+		if len(flavors) == 0 {
+			p.Outputf("No flavors found for project %q\n", projectLabel)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("ID", "DESCRIPTION", "DISPLAY_NAME", "AVAILABLE", "SKU")
 		for i := range flavors {

internal/cmd/git/flavor/list/list_test.go

@@ -161,6 +161,7 @@ func TestBuildRequest(t *testing.T) {
 func TestOutputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		flavors      []git.Flavor
 	}
 	tests := []struct {
@@ -192,7 +193,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&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.flavors); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.flavors); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/git/instance/list/list.go

@@ -61,19 +61,20 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("get STACKIT Git instances: %w", err)
 			}
-			instances := *resp.Instances
-			if len(instances) == 0 {
-				projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
-				if err != nil {
-					params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
-					projectLabel = model.ProjectId
-				}
-				params.Printer.Info("No instances found for project %q\n", projectLabel)
-				return nil
-			} else if model.Limit != nil && len(instances) > int(*model.Limit) {
+			instances := resp.GetInstances()
+
+			projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get project name: %v", err)
+				projectLabel = model.ProjectId
+			}
+
+			// Truncate output
+			if model.Limit != nil && len(instances) > int(*model.Limit) {
 				instances = (instances)[:*model.Limit]
 			}
-			return outputResult(params.Printer, model.OutputFormat, instances)
+
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, instances)
 		},
 	}
 	configureFlags(cmd)
@@ -111,8 +112,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *git.APIClie
 	return apiClient.ListInstances(ctx, model.ProjectId)
 }
 
-func outputResult(p *print.Printer, outputFormat string, instances []git.Instance) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, instances []git.Instance) error {
 	return p.OutputResult(outputFormat, instances, func() error {
+		if len(instances) == 0 {
+			p.Outputf("No instances found for project %q\n", projectLabel)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "URL", "VERSION", "STATE", "CREATED")
 		for i := range instances {

internal/cmd/git/instance/list/list_test.go

@@ -161,6 +161,7 @@ func TestBuildRequest(t *testing.T) {
 func TestOutputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		instances    []git.Instance
 	}
 	tests := []struct {
@@ -192,7 +193,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&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.instances); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.instances); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})