refactor(git): fix tests & removed redundant checks

Author: s-inter

internal/cmd/git/instance/create/create.go

@@ -15,7 +15,6 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/git/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/git"
 	"github.com/stackitcloud/stackit-sdk-go/services/git/wait"
 )
@@ -93,7 +92,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				s.Stop()
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, model.Async, model.Name, model.Id, result)
+			return outputResult(params.Printer, model.OutputFormat, model.Async, model.Name, *model.Id, result)
 		},
 	}
 
@@ -143,21 +142,17 @@ func createPayload(model *inputModel) git.CreateInstancePayload {
 	}
 }
 
-func outputResult(p *print.Printer, outputFormat string, async bool, instanceName string, modelId *string, resp *git.Instance) error {
+func outputResult(p *print.Printer, outputFormat string, async bool, instanceName, modelId string, resp *git.Instance) error {
 	if resp == nil {
 		return fmt.Errorf("API resp is nil")
 	}
-	id := utils.PtrString(modelId)
-	if resp.Id != nil {
-		id = *resp.Id
-	}
 
 	return p.OutputResult(outputFormat, resp, func() error {
 		operationState := "Created"
 		if async {
 			operationState = "Triggered creation of"
 		}
-		p.Outputf("%s instance %q with id %s\n", operationState, instanceName, id)
+		p.Outputf("%s instance %q with id %s\n", operationState, instanceName, modelId)
 		return nil
 	})
 }

internal/cmd/git/instance/create/create_test.go

@@ -175,39 +175,47 @@ func TestBuildRequest(t *testing.T) {
 
 func TestOutputResult(t *testing.T) {
 	type args struct {
-		model *inputModel
-		resp  *git.Instance
+		outputFormat string
+		async        bool
+		instanceName string
+		modelId      string
+		resp         *git.Instance
 	}
 	tests := []struct {
 		name    string
 		args    args
 		wantErr bool
 	}{
 		{
-			name: "nil",
+			name: "nil response",
 			args: args{
-				model: nil,
-				resp:  nil,
+				outputFormat: "",
+				async:        false,
+				instanceName: "",
+				modelId:      "",
+				resp:         nil,
 			},
 			wantErr: true,
 		},
 		{
 			name: "empty input",
 			args: args{
-				model: fixtureInputModel(),
-				resp:  &git.Instance{},
+				outputFormat: "",
+				async:        false,
+				instanceName: "",
+				modelId:      "",
+				resp:         &git.Instance{},
 			},
 			wantErr: false,
 		},
 		{
 			name: "output json",
 			args: args{
-				model: &inputModel{
-					GlobalFlagModel: &globalflags.GlobalFlagModel{
-						OutputFormat: print.JSONOutputFormat,
-					},
-				},
-				resp: nil,
+				outputFormat: print.JSONOutputFormat,
+				async:        true,
+				instanceName: testName,
+				modelId:      uuid.NewString(),
+				resp:         &git.Instance{},
 			},
 			wantErr: false,
 		},
@@ -216,7 +224,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.model, tt.args.resp); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.async, tt.args.instanceName, tt.args.modelId, tt.args.resp); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})