Clean up reset reapply default value (#2938)

temporalio · Jun 3, 2022 · c3d172d · c3d172d
1 parent 4c11b96
commit c3d172d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/common/enums/defaults.go b/common/enums/defaults.go
@@ -63,3 +63,9 @@ func SetDefaultContinueAsNewInitiator(f *enumspb.ContinueAsNewInitiator) {
 		*f = enumspb.CONTINUE_AS_NEW_INITIATOR_WORKFLOW
 	}
 }
+
+func SetDefaultResetReapplyType(f *enumspb.ResetReapplyType) {
+	if *f == enumspb.RESET_REAPPLY_TYPE_UNSPECIFIED {
+		*f = enumspb.RESET_REAPPLY_TYPE_SIGNAL
+	}
+}
diff --git a/service/frontend/workflowHandler.go b/service/frontend/workflowHandler.go
@@ -2154,15 +2154,9 @@ func (wh *WorkflowHandler) ResetWorkflowExecution(ctx context.Context, request *
 		return nil, err
 	}
 
-	switch request.GetResetReapplyType() {
-	case enumspb.RESET_REAPPLY_TYPE_UNSPECIFIED:
-		request.ResetReapplyType = enumspb.RESET_REAPPLY_TYPE_SIGNAL
-	case enumspb.RESET_REAPPLY_TYPE_SIGNAL:
-		// noop
-	case enumspb.RESET_REAPPLY_TYPE_NONE:
-		// noop
-	default:
-		return nil, serviceerror.NewInternal("unknown reset type")
+	enums.SetDefaultResetReapplyType(&request.ResetReapplyType)
+	if _, validType := enumspb.ResetReapplyType_name[int32(request.GetResetReapplyType())]; !validType {
+		return nil, serviceerror.NewInternal(fmt.Sprintf("unknown reset reapply type: %v", request.GetResetReapplyType()))
 	}
 
 	namespaceID, err := wh.namespaceRegistry.GetNamespaceID(namespace.Name(request.GetNamespace()))

diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -2359,17 +2359,6 @@ func (e *historyEngineImpl) ResetWorkflowExecution(
 		return nil, serviceerror.NewInvalidArgument("Workflow task finish ID must be > 1 && <= workflow last event ID.")
 	}
 
-	switch request.GetResetReapplyType() {
-	case enumspb.RESET_REAPPLY_TYPE_UNSPECIFIED:
-		return nil, serviceerror.NewInvalidArgument("reset type not set")
-	case enumspb.RESET_REAPPLY_TYPE_SIGNAL:
-		// noop
-	case enumspb.RESET_REAPPLY_TYPE_NONE:
-		// noop
-	default:
-		return nil, serviceerror.NewInternal("unknown reset type")
-	}
-
 	// also load the current run of the workflow, it can be different from the base runID
 	currentRunID, err := e.workflowConsistencyChecker.GetCurrentRunID(
 		ctx,

diff --git a/service/history/workflowResetter.go b/service/history/workflowResetter.go
@@ -331,7 +331,7 @@ func (r *workflowResetterImpl) reapplyEventsToResetWorkflow(
 	case enumspb.RESET_REAPPLY_TYPE_NONE:
 		// noop
 	default:
-		panic(fmt.Sprintf("unknown reset type: %v", resetReapplyType))
+		panic(fmt.Sprintf("unknown reset reapply type: %v", resetReapplyType))
 	}
 
 	if err := r.reapplyEvents(resetMutableState, additionalReapplyEvents); err != nil {