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

internal/cmd/affinity-groups/list/list.go

@@ -18,6 +18,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/iaas/client"
 )
 
@@ -63,16 +64,19 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("list affinity groups: %w", err)
 			}
+			items := result.GetItems()
 
-			if items := result.Items; items != nil {
-				if model.Limit != nil && len(*items) > int(*model.Limit) {
-					*items = (*items)[:*model.Limit]
-				}
-				return outputResult(params.Printer, *model, *items)
+			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.Outputln("No affinity groups found")
-			return nil
+			// Truncate Output
+			if model.Limit != nil && len(items) > int(*model.Limit) {
+				items = items[:*model.Limit]
+			}
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, items)
 		},
 	}
 	configureFlags(cmd)
@@ -110,13 +114,12 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	return &model, nil
 }
 
-func outputResult(p *print.Printer, model inputModel, items []iaas.AffinityGroup) error {
-	var outputFormat string
-	if model.GlobalFlagModel != nil {
-		outputFormat = model.OutputFormat
-	}
-
+func outputResult(p *print.Printer, outputFormat, projectLabel string, items []iaas.AffinityGroup) error {
 	return p.OutputResult(outputFormat, items, func() error {
+		if len(items) == 0 {
+			p.Outputf("No affinity groups found for project %q\n", projectLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "POLICY")
 		for _, item := range items {

internal/cmd/affinity-groups/list/list_test.go

@@ -142,24 +142,27 @@ func TestBuildRequest(t *testing.T) {
 }
 
 func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		projectLabel string
+		instances    []iaas.AffinityGroup
+	}
 	tests := []struct {
 		description string
-		model       inputModel
-		response    []iaas.AffinityGroup
+		args        args
 		isValid     bool
 	}{
 		{
 			description: "empty",
-			model:       inputModel{},
-			response:    []iaas.AffinityGroup{},
+			args:        args{},
 			isValid:     true,
 		},
 	}
 	p := print.NewPrinter()
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			err := outputResult(p, tt.model, tt.response)
+			err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.instances)
 			if err != nil {
 				if !tt.isValid {
 					return

internal/cmd/image/list/list.go

@@ -81,21 +81,18 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 
 			// Call API
 			request := buildRequest(ctx, model, apiClient)
-
 			response, err := request.Execute()
 			if err != nil {
 				return fmt.Errorf("list images: %w", err)
 			}
+			items := response.GetItems()
 
-			if items := response.GetItems(); len(items) == 0 {
-				params.Printer.Info("No images found for project %q", projectLabel)
-			} else {
-				if model.Limit != nil && len(items) > int(*model.Limit) {
-					items = (items)[:*model.Limit]
-				}
-				if err := outputResult(params.Printer, model.OutputFormat, items); err != nil {
-					return fmt.Errorf("output images: %w", err)
-				}
+			// Truncate output
+			if model.Limit != nil && len(items) > int(*model.Limit) {
+				items = (items)[:*model.Limit]
+			}
+			if err := outputResult(params.Printer, model.OutputFormat, projectLabel, items); err != nil {
+				return fmt.Errorf("output images: %w", err)
 			}
 
 			return nil
@@ -149,8 +146,12 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return request
 }
 
-func outputResult(p *print.Printer, outputFormat string, items []iaas.Image) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, items []iaas.Image) error {
 	return p.OutputResult(outputFormat, items, func() error {
+		if len(items) == 0 {
+			p.Outputf("No images found for project %q\n", projectLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetHeader("ID", "NAME", "OS", "ARCHITECTURE", "DISTRIBUTION", "VERSION", "SCOPE", "OWNER", "LABELS")
 		for i := range items {

internal/cmd/image/list/list_test.go

@@ -189,6 +189,7 @@ func TestBuildRequest(t *testing.T) {
 func Test_outputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		items        []iaas.Image
 	}
 	tests := []struct {
@@ -217,7 +218,7 @@ func Test_outputResult(t *testing.T) {
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.args.outputFormat, tt.args.items); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.items); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/key-pair/list/list.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/types"
 
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
@@ -77,17 +78,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list key pairs: %w", err)
 			}
 
-			if resp.Items == nil || len(*resp.Items) == 0 {
-				params.Printer.Info("No key pairs found\n")
-				return nil
+			items := resp.GetItems()
+
+			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
 			}
 
-			items := *resp.Items
+			// Truncate output
 			if model.Limit != nil && len(items) > int(*model.Limit) {
 				items = items[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, items)
+			return outputResult(params.Printer, model.OutputFormat, projectLabel, items)
 		},
 	}
 	configureFlags(cmd)
@@ -128,8 +132,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, keyPairs []iaas.Keypair) error {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, keyPairs []iaas.Keypair) error {
 	return p.OutputResult(outputFormat, keyPairs, func() error {
+		if len(keyPairs) == 0 {
+			p.Outputf("No key pairs found for project %q\n", projectLabel)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("KEY PAIR NAME", "LABELS", "FINGERPRINT", "CREATED AT", "UPDATED AT")
 

internal/cmd/key-pair/list/list_test.go

@@ -155,6 +155,7 @@ func TestBuildRequest(t *testing.T) {
 func Test_outputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		projectLabel string
 		keyPairs     []iaas.Keypair
 	}
 	tests := []struct {
@@ -179,7 +180,7 @@ func Test_outputResult(t *testing.T) {
 			p := print.NewPrinter()
 			p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 
-			if err := outputResult(p, tt.args.outputFormat, tt.args.keyPairs); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.projectLabel, tt.args.keyPairs); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/network-area/list/list.go

@@ -80,31 +80,30 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list network areas: %w", err)
 			}
 
-			if resp.Items == nil || len(*resp.Items) == 0 {
-				var orgLabel string
-				rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
-				if err == nil {
-					orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, *model.OrganizationId)
-					if err != nil {
-						params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
-						orgLabel = *model.OrganizationId
-					} else if orgLabel == "" {
-						orgLabel = *model.OrganizationId
-					}
-				} else {
-					params.Printer.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
+			items := resp.GetItems()
+
+			var orgLabel string
+			rmApiClient, err := rmClient.ConfigureClient(params.Printer, params.CliVersion)
+			if err == nil {
+				orgLabel, err = rmUtils.GetOrganizationName(ctx, rmApiClient, *model.OrganizationId)
+				if err != nil {
+					params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
+					orgLabel = *model.OrganizationId
 				}
-				params.Printer.Info("No STACKIT Network Areas found for organization %q\n", orgLabel)
-				return nil
+			} else {
+				params.Printer.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
+			}
+
+			if orgLabel == "" {
+				orgLabel = *model.OrganizationId
 			}
 
 			// Truncate output
-			items := *resp.Items
 			if model.Limit != nil && len(items) > int(*model.Limit) {
 				items = items[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, items)
+			return outputResult(params.Printer, model.OutputFormat, orgLabel, items)
 		},
 	}
 	configureFlags(cmd)
@@ -149,8 +148,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, networkAreas []iaas.NetworkArea) error {
+func outputResult(p *print.Printer, outputFormat, orgLabel string, networkAreas []iaas.NetworkArea) error {
 	return p.OutputResult(outputFormat, networkAreas, func() error {
+		if len(networkAreas) == 0 {
+			p.Outputf("No STACKIT Network Areas found for organization %q\n", orgLabel)
+			return nil
+		}
+
 		table := tables.NewTable()
 		table.SetHeader("ID", "Name", "# Attached Projects")
 

internal/cmd/network-area/list/list_test.go

@@ -169,6 +169,7 @@ func TestBuildRequest(t *testing.T) {
 func TestOutputResult(t *testing.T) {
 	type args struct {
 		outputFormat string
+		orgLabel     string
 		networkAreas []iaas.NetworkArea
 	}
 	tests := []struct {
@@ -200,7 +201,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.args.outputFormat, tt.args.networkAreas); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.orgLabel, tt.args.networkAreas); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/cmd/network-area/network-range/list/list.go

@@ -75,24 +75,21 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("list network ranges: %w", err)
 			}
 
-			if resp.Items == nil || len(*resp.Items) == 0 {
-				var networkAreaLabel string
-				networkAreaLabel, err = iaasUtils.GetNetworkAreaName(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId)
-				if err != nil {
-					params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
-					networkAreaLabel = *model.NetworkAreaId
-				}
-				params.Printer.Info("No network ranges found for SNA %q\n", networkAreaLabel)
-				return nil
+			items := resp.GetItems()
+
+			var networkAreaLabel string
+			networkAreaLabel, err = iaasUtils.GetNetworkAreaName(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId)
+			if err != nil {
+				params.Printer.Debug(print.ErrorLevel, "get organization name: %v", err)
+				networkAreaLabel = *model.NetworkAreaId
 			}
 
 			// Truncate output
-			items := *resp.Items
 			if model.Limit != nil && len(items) > int(*model.Limit) {
 				items = items[:*model.Limit]
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, items)
+			return outputResult(params.Printer, model.OutputFormat, networkAreaLabel, items)
 		},
 	}
 	configureFlags(cmd)
@@ -133,8 +130,12 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return apiClient.ListNetworkAreaRanges(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region)
 }
 
-func outputResult(p *print.Printer, outputFormat string, networkRanges []iaas.NetworkRange) error {
+func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, networkRanges []iaas.NetworkRange) error {
 	return p.OutputResult(outputFormat, networkRanges, func() error {
+		if len(networkRanges) == 0 {
+			p.Outputf("No network ranges found for SNA %q\n", networkAreaLabel)
+			return nil
+		}
 		table := tables.NewTable()
 		table.SetHeader("ID", "Network Range")
 

internal/cmd/network-area/network-range/list/list_test.go

@@ -185,8 +185,9 @@ func TestBuildRequest(t *testing.T) {
 
 func TestOutputResult(t *testing.T) {
 	type args struct {
-		outputFormat  string
-		networkRanges []iaas.NetworkRange
+		outputFormat     string
+		networkAreaLabel string
+		networkRanges    []iaas.NetworkRange
 	}
 	tests := []struct {
 		name    string
@@ -217,7 +218,7 @@ func TestOutputResult(t *testing.T) {
 	p.Cmd = NewCmd(&types.CmdParams{Printer: p})
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(p, tt.args.outputFormat, tt.args.networkRanges); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.networkAreaLabel, tt.args.networkRanges); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})