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

marceljk · web-flow · commit 566ed85156a3 · 2025-02-20T13:13:39.000+01:00
* add nil pointer checks
* add tests for the outputResult functions within the public-ip commands
diff --git a/internal/cmd/beta/public-ip/associate/associate.go b/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 {
diff --git a/internal/cmd/beta/public-ip/create/create.go b/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 {
diff --git a/internal/cmd/beta/public-ip/create/create_test.go b/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)
+			}
+		})
+	}
+}
diff --git a/internal/cmd/beta/public-ip/delete/delete.go b/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
 		},
 	}
diff --git a/internal/cmd/beta/public-ip/describe/describe.go b/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, "", "  ")
diff --git a/internal/cmd/beta/public-ip/describe/describe_test.go b/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)
+			}
+		})
+	}
+}
diff --git a/internal/cmd/beta/public-ip/disassociate/disassociate.go b/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 {
diff --git a/internal/cmd/beta/public-ip/list/list.go b/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
diff --git a/internal/cmd/beta/public-ip/list/list_test.go b/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)
+			}
+		})
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ func NewCmd(p print.Printer) cobra.Command {`
`59`	`59`	`if err != nil {`
`60`	`60`	`p.Debug(print.ErrorLevel, "get public IP: %v", err)`
`61`	`61`	`publicIpLabel = model.PublicIpId`
	`62`	`+ } else if publicIpLabel == "" {`
	`63`	`+ publicIpLabel = model.PublicIpId`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`if !model.AssumeYes {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ func NewCmd(p print.Printer) cobra.Command {`
`67`	`67`	`if err != nil {`
`68`	`68`	`p.Debug(print.ErrorLevel, "get project name: %v", err)`
`69`	`69`	`projectLabel = model.ProjectId`
	`70`	`+ } else if projectLabel == "" {`
	`71`	`+ projectLabel = model.ProjectId`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`if !model.AssumeYes {`
`@@ -84,7 +86,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`84`	`86`	`return fmt.Errorf("create public IP: %w", err)`
`85`	`87`	`}`
`86`	`88`
`87`		`- return outputResult(p, model, projectLabel, resp)`
	`89`	`+ return outputResult(p, model.OutputFormat, projectLabel, *resp)`
`88`	`90`	`},`
`89`	`91`	`}`
`90`	`92`	`configureFlags(cmd)`
`@@ -140,8 +142,8 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`140`	`142`	`return req.CreatePublicIPPayload(payload)`
`141`	`143`	`}`
`142`	`144`
`143`		`-func outputResult(p print.Printer, model inputModel, projectLabel string, publicIp *iaas.PublicIp) error {`
`144`		`- switch model.OutputFormat {`
	`145`	`+func outputResult(p *print.Printer, outputFormat, projectLabel string, publicIp iaas.PublicIp) error {`
	`146`	`+ switch outputFormat {`
`145`	`147`	`case print.JSONOutputFormat:`
`146`	`148`	`details, err := json.MarshalIndent(publicIp, "", " ")`
`147`	`149`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ func NewCmd(p print.Printer) cobra.Command {`
`57`	`57`	`if err != nil {`
`58`	`58`	`p.Debug(print.ErrorLevel, "get public IP: %v", err)`
`59`	`59`	`publicIpLabel = model.PublicIpId`
	`60`	`+ } else if publicIpLabel == "" {`
	`61`	`+ publicIpLabel = model.PublicIpId`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`if !model.AssumeYes {`
`@@ -74,7 +76,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`74`	`76`	`return fmt.Errorf("delete public IP: %w", err)`
`75`	`77`	`}`
`76`	`78`
`77`		`- p.Info("Deleted public IP %q\n", model.PublicIpId)`
	`79`	`+ p.Info("Deleted public IP %q\n", publicIpLabel)`
`78`	`80`	`return nil`
`79`	`81`	`},`
`80`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func NewCmd(p print.Printer) cobra.Command {`
`66`	`66`	`return fmt.Errorf("read public IP: %w", err)`
`67`	`67`	`}`
`68`	`68`
`69`		`- return outputResult(p, model.OutputFormat, resp)`
	`69`	`+ return outputResult(p, model.OutputFormat, *resp)`
`70`	`70`	`},`
`71`	`71`	`}`
`72`	`72`	`return cmd`
`@@ -101,7 +101,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`101`	`101`	`return apiClient.GetPublicIP(ctx, model.ProjectId, model.PublicIpId)`
`102`	`102`	`}`
`103`	`103`
`104`		`-func outputResult(p print.Printer, outputFormat string, publicIp iaas.PublicIp) error {`
	`104`	`+func outputResult(p *print.Printer, outputFormat string, publicIp iaas.PublicIp) error {`
`105`	`105`	`switch outputFormat {`
`106`	`106`	`case print.JSONOutputFormat:`
`107`	`107`	`details, err := json.MarshalIndent(publicIp, "", " ")`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ func NewCmd(p print.Printer) cobra.Command {`
`55`	`55`	`if err != nil {`
`56`	`56`	`p.Debug(print.ErrorLevel, "get public IP: %v", err)`
`57`	`57`	`publicIpLabel = model.PublicIpId`
	`58`	`+ } else if publicIpLabel == "" {`
	`59`	`+ publicIpLabel = model.PublicIpId`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`if !model.AssumeYes {`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ func NewCmd(p print.Printer) cobra.Command {`
`81`	`81`	`if err != nil {`
`82`	`82`	`p.Debug(print.ErrorLevel, "get project name: %v", err)`
`83`	`83`	`projectLabel = model.ProjectId`
	`84`	`+ } else if projectLabel == "" {`
	`85`	`+ projectLabel = model.ProjectId`
`84`	`86`	`}`
`85`	`87`	`p.Info("No public IPs found for project %q\n", projectLabel)`
`86`	`88`	`return nil`