Revert Instance changes to original

Author: hwadekar-nv

api/pkg/api/handler/instance.go

@@ -4585,15 +4585,15 @@ func (dih DeleteInstanceHandler) Handle(c echo.Context) error {
 		}
 
 		// This is for enhanced break-fix flow:
-		if apiRequest.HealthIssue != nil {
+		if apiRequest.MachineHealthIssue != nil {
 			releaseInstanceRequest.Issue = &cwssaws.Issue{
-				Category: cwssaws.IssueCategory(model.MachineIssueCategoriesFromAPIToProtobuf[apiRequest.HealthIssue.Category]),
+				Category: cwssaws.IssueCategory(model.MachineIssueCategoriesFromAPIToProtobuf[apiRequest.MachineHealthIssue.Category]),
 			}
-			if apiRequest.HealthIssue.Summary != nil {
-				releaseInstanceRequest.Issue.Summary = *apiRequest.HealthIssue.Summary
+			if apiRequest.MachineHealthIssue.Summary != nil {
+				releaseInstanceRequest.Issue.Summary = *apiRequest.MachineHealthIssue.Summary
 			}
-			if apiRequest.HealthIssue.Details != nil {
-				releaseInstanceRequest.Issue.Details = *apiRequest.HealthIssue.Details
+			if apiRequest.MachineHealthIssue.Details != nil {
+				releaseInstanceRequest.Issue.Details = *apiRequest.MachineHealthIssue.Details
 			}
 		}
 		// if caller attempt to set IsRepairTenant then it must be a tenant with targetedInstanceCreation capability

api/pkg/api/handler/instance_test.go

@@ -8836,15 +8836,15 @@ func TestDeleteInstanceHandler_Handle(t *testing.T) {
 		verifyChildSpanner bool
 	}{
 		{
-			name: "test Instance delete API endpoint with HealthIssue passes issue to workflow with success",
+			name: "test Instance delete API endpoint with MachineHealthIssue passes issue to workflow with success",
 			fields: fields{
 				dbSession: dbSession,
 				tc:        tc,
 				scp:       scp,
 				cfg:       cfg,
 			},
 			args: args{
-				reqData: &model.APIInstanceDeleteRequest{HealthIssue: &model.APIHealthIssueReport{
+				reqData: &model.APIInstanceDeleteRequest{MachineHealthIssue: &model.APIMachineHealthIssueReport{
 					Category: "Hardware", Summary: cdb.GetStrPtr("Some summary"), Details: cdb.GetStrPtr("Some details"),
 				}},
 				reqInstance: inst1.ID.String(),
@@ -8856,15 +8856,15 @@ func TestDeleteInstanceHandler_Handle(t *testing.T) {
 			verifyChildSpanner: true,
 		},
 		{
-			name: "test Instance delete API endpoint failure due to HealthIssue with unspecified category",
+			name: "test Instance delete API endpoint failure due to MachineHealthIssue with unspecified category",
 			fields: fields{
 				dbSession: dbSession,
 				tc:        tc,
 				scp:       scp,
 				cfg:       cfg,
 			},
 			args: args{
-				reqData: &model.APIInstanceDeleteRequest{HealthIssue: &model.APIHealthIssueReport{
+				reqData: &model.APIInstanceDeleteRequest{MachineHealthIssue: &model.APIMachineHealthIssueReport{
 					Category: "UNSPECIFIED", Summary: cdb.GetStrPtr("Some summary"), Details: cdb.GetStrPtr("Some details"),
 				}},
 				reqInstance: inst1.ID.String(),

api/pkg/api/handler/machine.go

@@ -1480,22 +1480,22 @@ func (umh UpdateMachineHandler) Handle(c echo.Context) error {
 
 			we, err := stc.ExecuteWorkflow(wfCtx, wfOpts, "ApplyMachineHealthReportOverride", insReq)
 			if err != nil {
-				logger.Error().Err(err).Msg("failed to start Temporal workflow for online repair health override")
-				return cutil.NewAPIErrorResponse(c, http.StatusInternalServerError, fmt.Sprintf("Failed to start online repair workflow on Site: %s", err), nil)
+				logger.Error().Err(err).Msg("failed to start Temporal workflow for applying online repair health override")
+				return cutil.NewAPIErrorResponse(c, http.StatusInternalServerError, fmt.Sprintf("Failed to start applying online repair health override workflow on Site: %s", err), nil)
 			}
 			wid := we.GetID()
-			logger.Info().Str("Workflow ID", wid).Msg("executed synchronous ApplyMachineHealthReportOverride workflow")
+			logger.Info().Str("Workflow ID", wid).Msg("executed synchronous applying online repair health override workflow")
 			err = we.Get(wfCtx, nil)
 			if err != nil {
 				var timeoutErr *tp.TimeoutError
 				if errors.As(err, &timeoutErr) || err == context.DeadlineExceeded || wfCtx.Err() != nil || ctx.Err() != nil {
 					return common.TerminateWorkflowOnTimeOut(c, logger, stc, wid, err, "Machine", "ApplyMachineHealthReportOverride")
 				}
 				code, werr := common.UnwrapWorkflowError(err)
-				logger.Error().Err(werr).Msg("online repair health override workflow failed")
-				return cutil.NewAPIErrorResponse(c, code, fmt.Sprintf("Failed to execute online repair workflow on Site: %s", werr), nil)
+				logger.Error().Err(werr).Msg("applying online repair health override workflow failed")
+				return cutil.NewAPIErrorResponse(c, code, fmt.Sprintf("Failed to execute applying online repair health override workflow on Site: %s", werr), nil)
 			}
-			logger.Info().Str("Workflow ID", wid).Msg("completed synchronous ApplyMachineHealthReportOverride workflow")
+			logger.Info().Str("Workflow ID", wid).Msg("completed synchronous applying online repair health override workflow")
 		} else {
 			if inst.Status != cdbm.InstanceStatusRepairing {
 				return cutil.NewAPIErrorResponse(c, http.StatusBadRequest, fmt.Sprintf("Instance must be in Repairing state to exit online repair (current state: %s)", inst.Status), nil)
@@ -1590,7 +1590,7 @@ func buildOnlineRepairHealthInsertRequest(machineID string, req *model.APIMachin
 		TenantMessage: cdb.GetStrPtr(fmt.Sprintf("TenantReportedIssue: %s", mhi.Summary)),
 		Classifications: []string{
 			"PreventAllocations",
-			"PreventDeletion",
+			"PreventInstanceDeletion",
 			"SuppressExternalAlerting",
 		},
 	}

api/pkg/api/model/instance.go

@@ -75,18 +75,6 @@ var (
 		MachineIssueCategoryNetwork:     int32(cwssaws.IssueCategory_NETWORK),
 		MachineIssueCategoryPerformance: int32(cwssaws.IssueCategory_PERFORMANCE),
 		MachineIssueCategoryOther:       int32(cwssaws.IssueCategory_OTHER),
-		"HARDWARE":                      int32(cwssaws.IssueCategory_HARDWARE),
-		"NETWORK":                       int32(cwssaws.IssueCategory_NETWORK),
-		"PERFORMANCE":                   int32(cwssaws.IssueCategory_PERFORMANCE),
-		"OTHER":                         int32(cwssaws.IssueCategory_OTHER),
-		// Proto IssueCategory has no distinct values for storage/software; treat as OTHER.
-		"STORAGE":  int32(cwssaws.IssueCategory_OTHER),
-		"SOFTWARE": int32(cwssaws.IssueCategory_OTHER),
-	}
-
-	instanceDeleteHealthIssueCategories = []string{
-		MachineIssueCategoryHardware, MachineIssueCategoryNetwork, MachineIssueCategoryPerformance, MachineIssueCategoryOther,
-		"HARDWARE", "NETWORK", "PERFORMANCE", "STORAGE", "SOFTWARE", "OTHER",
 	}
 )
 
@@ -1508,23 +1496,14 @@ func (idr APIInstanceDeleteRequest) Validate() error {
 		err := validation.ValidateStruct(idr.MachineHealthIssue,
 			validation.Field(&idr.MachineHealthIssue.Category,
 				validation.Required,
-				validation.By(func(value any) error {
-					s, ok := value.(string)
-					if !ok {
-						return fmt.Errorf("category must be a string")
-					}
-					if !slices.Contains(instanceDeleteHealthIssueCategories, s) {
-						return fmt.Errorf("category must be one of %v", instanceDeleteHealthIssueCategories)
-					}
-					return nil
-				}),
+				validation.In(MachineIssueCategoryHardware, MachineIssueCategoryNetwork, MachineIssueCategoryPerformance, MachineIssueCategoryOther),
 			),
 			validation.Field(&idr.MachineHealthIssue.Summary,
 				validation.Required,
-				validation.Length(1, 512).Error(validationErrorStringLength)),
+				validation.Length(0, 1024).Error(validationErrorStringLength)),
+			// TODO: what are the constrains on Summary and Details? For now limiting to 1024..
 			validation.Field(&idr.MachineHealthIssue.Details,
-				validation.Required,
-				validation.Length(1, 8192).Error(validationErrorStringLength)),
+				validation.Length(0, 1024).Error(validationErrorStringLength)),
 		)
 
 		if err != nil {

api/pkg/api/model/instance_test.go

@@ -2356,17 +2356,6 @@ func TestAPIInstanceDeleteRequest_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
-		{
-			name: "test invalid Instance delete request - required machine health issue details",
-			fields: fields{
-				MachineHealthIssue: &APIMachineHealthIssueReport{
-					Category: "Hardware",
-					Summary:  cdb.GetStrPtr("Test summary"),
-				},
-				IsRepairTenant: cdb.GetBoolPtr(true),
-			},
-			wantErr: true,
-		},
 		{
 			name: "test invalid Instance delete request - invalid category",
 			fields: fields{