minor updates

microsoft · Dec 15, 2023 · 6ccd188 · 6ccd188
1 parent f9e255e
commit 6ccd188
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/api/orchestration.go b/api/orchestration.go
@@ -26,22 +26,22 @@ var (
 type CreateOrchestrationAction = protos.CreateOrchestrationAction
 
 const (
-	ERROR     CreateOrchestrationAction = 0
-	IGNORE    CreateOrchestrationAction = 1
-	TERMINATE CreateOrchestrationAction = 2
+	ERROR     CreateOrchestrationAction = protos.CreateOrchestrationAction_ERROR
+	IGNORE    CreateOrchestrationAction = protos.CreateOrchestrationAction_IGNORE
+	TERMINATE CreateOrchestrationAction = protos.CreateOrchestrationAction_TERMINATE
 )
 
 type OrchestrationStatus = protos.OrchestrationStatus
 
 const (
-	RUNNING          OrchestrationStatus = 0
-	COMPLETED        OrchestrationStatus = 1
-	CONTINUED_AS_NEW OrchestrationStatus = 2
-	FAILED           OrchestrationStatus = 3
-	CANCELED         OrchestrationStatus = 4
-	TERMINATED       OrchestrationStatus = 5
-	PENDING          OrchestrationStatus = 6
-	SUSPENDED        OrchestrationStatus = 7
+	RUNNING          OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_RUNNING
+	COMPLETED        OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_COMPLETED
+	CONTINUED_AS_NEW OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_CONTINUED_AS_NEW
+	FAILED           OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_FAILED
+	CANCELED         OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_CANCELED
+	TERMINATED       OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_TERMINATED
+	PENDING          OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_PENDING
+	SUSPENDED        OrchestrationStatus = protos.OrchestrationStatus_ORCHESTRATION_STATUS_SUSPENDED
 )
 
 type OrchestrationIdReusePolicy = protos.OrchestrationIdReusePolicy

diff --git a/backend/backend.go b/backend/backend.go
@@ -122,11 +122,3 @@ func UnmarshalHistoryEvent(bytes []byte) (*HistoryEvent, error) {
 	}
 	return e, nil
 }
-
-func BuildStatusSet(statuses []api.OrchestrationStatus) map[api.OrchestrationStatus]struct{} {
-	statusSet := make(map[api.OrchestrationStatus]struct{}, len(statuses))
-	for _, status := range statuses {
-		statusSet[status] = struct{}{}
-	}
-	return statusSet
-}
diff --git a/backend/sqlite/sqlite.go b/backend/sqlite/sqlite.go
@@ -512,7 +512,7 @@ func (be *sqliteBackend) handleInstanceExists(ctx context.Context, tx *sql.Tx, s
 	}
 
 	// instance already exists
-	targetStatusValues := backend.BuildStatusSet(policy.OperationStatus)
+	targetStatusValues := buildStatusSet(policy.OperationStatus)
 	// status not match, return instance duplicate error
 	if _, ok := targetStatusValues[helpers.FromRuntimeStatusString(*runtimeStatus)]; !ok {
 		return api.ErrDuplicateInstance
@@ -545,6 +545,14 @@ func (be *sqliteBackend) handleInstanceExists(ctx context.Context, tx *sql.Tx, s
 	return api.ErrDuplicateInstance
 }
 
+func buildStatusSet(statuses []api.OrchestrationStatus) map[api.OrchestrationStatus]struct{} {
+	statusSet := make(map[api.OrchestrationStatus]struct{}, len(statuses))
+	for _, status := range statuses {
+		statusSet[status] = struct{}{}
+	}
+	return statusSet
+}
+
 func (be *sqliteBackend) cleanupOrchestrationStateInternal(ctx context.Context, tx *sql.Tx, id api.InstanceID, requireCompleted bool) error {
 	row := tx.QueryRowContext(ctx, "SELECT 1 FROM Instances WHERE [InstanceID] = ?", string(id))
 	if err := row.Err(); err != nil {