fix(git): remove Id from inputModel

Author: s-inter

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

@@ -27,7 +27,6 @@ const (
 
 type inputModel struct {
 	*globalflags.GlobalFlagModel
-	Id     *string
 	Name   string
 	Flavor string
 	Acl    []string
@@ -79,20 +78,19 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create stackit git instance: %w", err)
 			}
-			model.Id = result.Id
 
 			// Wait for async operation, if async mode not enabled
 			if !model.Async {
 				s := spinner.New(params.Printer)
 				s.Start("Creating stackit git instance")
-				_, err = wait.CreateGitInstanceWaitHandler(ctx, apiClient, model.ProjectId, *model.Id).WaitWithContext(ctx)
+				_, err = wait.CreateGitInstanceWaitHandler(ctx, apiClient, model.ProjectId, *result.Id).WaitWithContext(ctx)
 				if err != nil {
 					return fmt.Errorf("wait for stackit git Instance creation: %w", err)
 				}
 				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, result)
 		},
 	}
 
@@ -142,17 +140,20 @@ func createPayload(model *inputModel) git.CreateInstancePayload {
 	}
 }
 
-func outputResult(p *print.Printer, outputFormat string, async bool, instanceName, modelId string, resp *git.Instance) error {
+func outputResult(p *print.Printer, outputFormat string, async bool, instanceName string, resp *git.Instance) error {
 	if resp == nil {
 		return fmt.Errorf("API resp is nil")
 	}
+	if resp.Id == nil {
+		return fmt.Errorf("API resp is missing instance 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, modelId)
+		p.Outputf("%s instance %q with id %s\n", operationState, instanceName, *resp.Id)
 		return nil
 	})
 }

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

@@ -178,7 +178,6 @@ func TestOutputResult(t *testing.T) {
 		outputFormat string
 		async        bool
 		instanceName string
-		modelId      string
 		resp         *git.Instance
 	}
 	tests := []struct {
@@ -192,7 +191,6 @@ func TestOutputResult(t *testing.T) {
 				outputFormat: "",
 				async:        false,
 				instanceName: "",
-				modelId:      "",
 				resp:         nil,
 			},
 			wantErr: true,
@@ -203,8 +201,7 @@ func TestOutputResult(t *testing.T) {
 				outputFormat: "",
 				async:        false,
 				instanceName: "",
-				modelId:      "",
-				resp:         &git.Instance{},
+				resp:         &git.Instance{Id: utils.Ptr(uuid.NewString())},
 			},
 			wantErr: false,
 		},
@@ -214,8 +211,7 @@ func TestOutputResult(t *testing.T) {
 				outputFormat: print.JSONOutputFormat,
 				async:        true,
 				instanceName: testName,
-				modelId:      uuid.NewString(),
-				resp:         &git.Instance{},
+				resp:         &git.Instance{Id: utils.Ptr(uuid.NewString())},
 			},
 			wantErr: false,
 		},
@@ -224,7 +220,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.async, tt.args.instanceName, tt.args.modelId, tt.args.resp); (err != nil) != tt.wantErr {
+			if err := outputResult(p, tt.args.outputFormat, tt.args.async, tt.args.instanceName, tt.args.resp); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})