- add nil pointer checks

- add tests for the outputResult functions within the network-area commands

internal/cmd/beta/network-area/create/create.go

@@ -84,6 +84,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 					p.Debug(print.ErrorLevel, "get organization name: %v", err)
 					orgLabel = *model.OrganizationId
 				}
+				if orgLabel == "" {
+					orgLabel = *model.OrganizationId
+				}
 			} else {
 				p.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
 			}
@@ -103,7 +106,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("create network area: %w", err)
 			}
 
-			return outputResult(p, model, orgLabel, resp)
+			return outputResult(p, model.OutputFormat, orgLabel, resp)
 		},
 	}
 	configureFlags(cmd)
@@ -178,8 +181,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req.CreateNetworkAreaPayload(payload)
 }
 
-func outputResult(p *print.Printer, model *inputModel, orgLabel string, networkArea *iaas.NetworkArea) error {
-	switch model.OutputFormat {
+func outputResult(p *print.Printer, outputFormat, orgLabel string, networkArea *iaas.NetworkArea) error {
+	if networkArea == nil {
+		return fmt.Errorf("network area is nil")
+	}
+	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(networkArea, "", "  ")
 		if err != nil {

internal/cmd/beta/network-area/create/create_test.go

@@ -246,3 +246,38 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func Test_outputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		orgLabel     string
+		networkArea  *iaas.NetworkArea
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: true,
+		},
+		{
+			name: "set empty network area",
+			args: args{
+				networkArea: &iaas.NetworkArea{},
+			},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(p)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.orgLabel, tt.args.networkArea); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/network-area/delete/delete.go

@@ -63,6 +63,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get network area name: %v", err)
 				networkAreaLabel = model.AreaId
 			}
+			if networkAreaLabel == "" {
+				networkAreaLabel = model.AreaId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to delete network area %q?", networkAreaLabel)

internal/cmd/beta/network-area/describe/describe.go

@@ -127,6 +127,9 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 }
 
 func outputResult(p *print.Printer, outputFormat string, networkArea *iaas.NetworkArea, attachedProjects []string) error {
+	if networkArea == nil {
+		return fmt.Errorf("network area is nil")
+	}
 	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(networkArea, "", "  ")
@@ -146,16 +149,19 @@ func outputResult(p *print.Printer, outputFormat string, networkArea *iaas.Netwo
 		return nil
 	default:
 		var routes []string
-		if networkArea.Ipv4.Routes != nil {
-			for _, route := range *networkArea.Ipv4.Routes {
-				routes = append(routes, fmt.Sprintf("next hop: %s\nprefix: %s", *route.Nexthop, *route.Prefix))
+		var networkRanges []string
+
+		if networkArea.Ipv4 != nil {
+			if networkArea.Ipv4.Routes != nil {
+				for _, route := range *networkArea.Ipv4.Routes {
+					routes = append(routes, fmt.Sprintf("next hop: %s\nprefix: %s", *route.Nexthop, *route.Prefix))
+				}
 			}
-		}
 
-		var networkRanges []string
-		if networkArea.Ipv4.NetworkRanges != nil {
-			for _, networkRange := range *networkArea.Ipv4.NetworkRanges {
-				networkRanges = append(networkRanges, *networkRange.Prefix)
+			if networkArea.Ipv4.NetworkRanges != nil {
+				for _, networkRange := range *networkArea.Ipv4.NetworkRanges {
+					networkRanges = append(networkRanges, *networkRange.Prefix)
+				}
 			}
 		}
 

internal/cmd/beta/network-area/describe/describe_test.go

@@ -227,3 +227,38 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat     string
+		networkArea      *iaas.NetworkArea
+		attachedProjects []string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: true,
+		},
+		{
+			name: "set networkArea",
+			args: args{
+				networkArea: &iaas.NetworkArea{},
+			},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(p)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.networkArea, tt.args.attachedProjects); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

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

@@ -81,6 +81,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 						p.Debug(print.ErrorLevel, "get organization name: %v", err)
 						orgLabel = *model.OrganizationId
 					}
+					if orgLabel == "" {
+						orgLabel = *model.OrganizationId
+					}
 				} else {
 					p.Debug(print.ErrorLevel, "configure resource manager client: %v", err)
 				}

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

@@ -186,3 +186,30 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		networkAreas []iaas.NetworkArea
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(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 {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/network-area/network-range/create/create.go

@@ -88,7 +88,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			return outputResult(p, model, networkAreaLabel, networkRange)
+			return outputResult(p, model.OutputFormat, networkAreaLabel, networkRange)
 		},
 	}
 	configureFlags(cmd)
@@ -138,8 +138,8 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req.CreateNetworkAreaRangePayload(payload)
 }
 
-func outputResult(p *print.Printer, model *inputModel, networkAreaLabel string, networkRange iaas.NetworkRange) error {
-	switch model.OutputFormat {
+func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, networkRange iaas.NetworkRange) error {
+	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(networkRange, "", "  ")
 		if err != nil {

internal/cmd/beta/network-area/network-range/create/create_test.go

@@ -215,3 +215,31 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat     string
+		networkAreaLabel string
+		networkRange     iaas.NetworkRange
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(p)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.networkAreaLabel, tt.args.networkRange); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/network-area/network-range/delete/delete.go

@@ -61,11 +61,17 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get network area name: %v", err)
 				networkAreaLabel = *model.NetworkAreaId
 			}
+			if networkAreaLabel == "" {
+				networkAreaLabel = *model.NetworkAreaId
+			}
 			networkRangeLabel, err := iaasUtils.GetNetworkRangePrefix(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId, model.NetworkRangeId)
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get network range prefix: %v", err)
 				networkRangeLabel = model.NetworkRangeId
 			}
+			if networkRangeLabel == "" {
+				networkRangeLabel = model.NetworkRangeId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to delete network range %q on STACKIT Network Area (SNA) %q?", networkRangeLabel, networkAreaLabel)

internal/cmd/beta/network-area/network-range/describe/describe.go

@@ -109,6 +109,9 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 }
 
 func outputResult(p *print.Printer, outputFormat string, networkRange *iaas.NetworkRange) error {
+	if networkRange == nil {
+		return fmt.Errorf("network range is nil")
+	}
 	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(networkRange, "", "  ")

internal/cmd/beta/network-area/network-range/describe/describe_test.go

@@ -234,3 +234,37 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		networkRange *iaas.NetworkRange
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: true,
+		},
+		{
+			name: "set networkRange",
+			args: args{
+				networkRange: &iaas.NetworkRange{},
+			},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(p)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.networkRange); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

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

@@ -80,6 +80,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 					p.Debug(print.ErrorLevel, "get organization name: %v", err)
 					networkAreaLabel = *model.NetworkAreaId
 				}
+				if networkAreaLabel == "" {
+					networkAreaLabel = *model.NetworkAreaId
+				}
 				p.Info("No network ranges found for SNA %q\n", networkAreaLabel)
 				return nil
 			}

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

@@ -210,3 +210,30 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat  string
+		networkRanges []iaas.NetworkRange
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name:    "empty",
+			args:    args{},
+			wantErr: false,
+		},
+	}
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(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 {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/network-area/route/create/create.go

@@ -74,6 +74,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				p.Debug(print.ErrorLevel, "get network area name: %v", err)
 				networkAreaLabel = *model.NetworkAreaId
 			}
+			if networkAreaLabel == "" {
+				networkAreaLabel = *model.NetworkAreaId
+			}
 
 			if !model.AssumeYes {
 				prompt := fmt.Sprintf("Are you sure you want to create a static route for STACKIT Network Area (SNA) %q?", networkAreaLabel)
@@ -99,7 +102,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return err
 			}
 
-			return outputResult(p, model, networkAreaLabel, route)
+			return outputResult(p, model.OutputFormat, networkAreaLabel, route)
 		},
 	}
 	configureFlags(cmd)
@@ -165,8 +168,8 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req.CreateNetworkAreaRoutePayload(payload)
 }
 
-func outputResult(p *print.Printer, model *inputModel, networkAreaLabel string, route iaas.Route) error {
-	switch model.OutputFormat {
+func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, route iaas.Route) error {
+	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(route, "", "  ")
 		if err != nil {