fix: stackit beta public-ip commands - add nil pointer checks and tests for the outputResult functions (#609)

* add nil pointer checks
* add tests for the outputResult functions within the public-ip commands

Author: marceljk

internal/cmd/beta/public-ip/associate/associate.go

@@ -59,6 +59,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId
+			} else if publicIpLabel == "" {
+				publicIpLabel = model.PublicIpId
 			}
 
 			if !model.AssumeYes {

internal/cmd/beta/public-ip/create/create.go

@@ -67,6 +67,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get project name: %v", err)
 				projectLabel = model.ProjectId
+			} else if projectLabel == "" {
+				projectLabel = model.ProjectId
 			}
 
 			if !model.AssumeYes {
@@ -84,7 +86,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("create public IP: %w", err)
 			}
 
-			return outputResult(p, model, projectLabel, resp)
+			return outputResult(p, model.OutputFormat, projectLabel, *resp)
 		},
 	}
 	configureFlags(cmd)
@@ -140,8 +142,8 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req.CreatePublicIPPayload(payload)
 }
 
-func outputResult(p *print.Printer, model *inputModel, projectLabel string, publicIp *iaas.PublicIp) error {
-	switch model.OutputFormat {
+func outputResult(p *print.Printer, outputFormat, projectLabel string, publicIp iaas.PublicIp) error {
+	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(publicIp, "", "  ")
 		if err != nil {

internal/cmd/beta/public-ip/create/create_test.go

@@ -213,3 +213,31 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func Test_outputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		projectLabel string
+		publicIp     iaas.PublicIp
+	}
+	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.projectLabel, tt.args.publicIp); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/public-ip/delete/delete.go

@@ -57,6 +57,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId
+			} else if publicIpLabel == "" {
+				publicIpLabel = model.PublicIpId
 			}
 
 			if !model.AssumeYes {
@@ -74,7 +76,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("delete public IP: %w", err)
 			}
 
-			p.Info("Deleted public IP %q\n", model.PublicIpId)
+			p.Info("Deleted public IP %q\n", publicIpLabel)
 			return nil
 		},
 	}

internal/cmd/beta/public-ip/describe/describe.go

@@ -66,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				return fmt.Errorf("read public IP: %w", err)
 			}
 
-			return outputResult(p, model.OutputFormat, resp)
+			return outputResult(p, model.OutputFormat, *resp)
 		},
 	}
 	return cmd
@@ -101,7 +101,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return apiClient.GetPublicIP(ctx, model.ProjectId, model.PublicIpId)
 }
 
-func outputResult(p *print.Printer, outputFormat string, publicIp *iaas.PublicIp) error {
+func outputResult(p *print.Printer, outputFormat string, publicIp iaas.PublicIp) error {
 	switch outputFormat {
 	case print.JSONOutputFormat:
 		details, err := json.MarshalIndent(publicIp, "", "  ")

internal/cmd/beta/public-ip/describe/describe_test.go

@@ -216,3 +216,30 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		publicIp     iaas.PublicIp
+	}
+	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.publicIp); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/public-ip/disassociate/disassociate.go

@@ -55,6 +55,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if err != nil {
 				p.Debug(print.ErrorLevel, "get public IP: %v", err)
 				publicIpLabel = model.PublicIpId
+			} else if publicIpLabel == "" {
+				publicIpLabel = model.PublicIpId
 			}
 
 			if !model.AssumeYes {

internal/cmd/beta/public-ip/list/list.go

@@ -81,6 +81,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 				if err != nil {
 					p.Debug(print.ErrorLevel, "get project name: %v", err)
 					projectLabel = model.ProjectId
+				} else if projectLabel == "" {
+					projectLabel = model.ProjectId
 				}
 				p.Info("No public IPs found for project %q\n", projectLabel)
 				return nil

internal/cmd/beta/public-ip/list/list_test.go

@@ -202,3 +202,30 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	type args struct {
+		outputFormat string
+		publicIps    []iaas.PublicIp
+	}
+	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.publicIps); (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}