Merge pull request #516 from serverlessworkflow/fix-workflow-routing

cdavernas · web-flow · commit 7d86e63be981 · 2025-07-21T12:13:09.000+02:00
Fixed the operator to ignore workflows and workflow instances marked with mismatching `synapse.io/operator` labels
diff --git a/src/operator/Synapse.Operator/Services/WorkflowController.cs b/src/operator/Synapse.Operator/Services/WorkflowController.cs
@@ -95,7 +95,7 @@ protected virtual async Task<bool> TryClaimAsync(Workflow workflow, Cancellation
     {
         ArgumentNullException.ThrowIfNull(workflow);
         if (this.Operator == null) throw new Exception("The controller must be started before attempting any operation");
-        if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;
+        if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();
         try
         {
             var originalResource = workflow.Clone();
@@ -120,7 +120,7 @@ protected virtual async Task<bool> TryClaimAsync(Workflow workflow, Cancellation
     protected virtual async Task<bool> TryReleaseAsync(Workflow workflow, CancellationToken cancellationToken)
     {
         ArgumentNullException.ThrowIfNull(workflow);
-        if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;
+        if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();
         try
         {
             var originalResource = workflow.Clone();
diff --git a/src/operator/Synapse.Operator/Services/WorkflowInstanceController.cs b/src/operator/Synapse.Operator/Services/WorkflowInstanceController.cs
@@ -87,7 +87,7 @@ protected virtual async Task<WorkflowInstanceHandler> CreateWorkflowInstanceHand
     protected virtual async Task<bool> TryClaimAsync(WorkflowInstance resource, CancellationToken cancellationToken)
     {
         ArgumentNullException.ThrowIfNull(resource);
-        if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;
+        if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();
         try
         {
             var originalResource = resource.Clone();
@@ -112,7 +112,7 @@ protected virtual async Task<bool> TryClaimAsync(WorkflowInstance resource, Canc
     protected virtual async Task<bool> TryReleaseAsync(WorkflowInstance resource, CancellationToken cancellationToken)
     {
         ArgumentNullException.ThrowIfNull(resource);
-        if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;
+        if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();
         try
         {
             var originalResource = resource.Clone();

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected virtual async Task<bool> TryClaimAsync(Workflow workflow, Cancellation`
`95`	`95`	`{`
`96`	`96`	`ArgumentNullException.ThrowIfNull(workflow);`
`97`	`97`	`if (this.Operator == null) throw new Exception("The controller must be started before attempting any operation");`
`98`		`- if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;`
	`98`	`+ if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();`
`99`	`99`	`try`
`100`	`100`	`{`
`101`	`101`	`var originalResource = workflow.Clone();`
`@@ -120,7 +120,7 @@ protected virtual async Task<bool> TryClaimAsync(Workflow workflow, Cancellation`
`120`	`120`	`protected virtual async Task<bool> TryReleaseAsync(Workflow workflow, CancellationToken cancellationToken)`
`121`	`121`	`{`
`122`	`122`	`ArgumentNullException.ThrowIfNull(workflow);`
`123`		`- if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;`
	`123`	`+ if (workflow.Metadata.Labels != null && workflow.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();`
`124`	`124`	`try`
`125`	`125`	`{`
`126`	`126`	`var originalResource = workflow.Clone();`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ protected virtual async Task<WorkflowInstanceHandler> CreateWorkflowInstanceHand`
`87`	`87`	`protected virtual async Task<bool> TryClaimAsync(WorkflowInstance resource, CancellationToken cancellationToken)`
`88`	`88`	`{`
`89`	`89`	`ArgumentNullException.ThrowIfNull(resource);`
`90`		`- if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;`
	`90`	`+ if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();`
`91`	`91`	`try`
`92`	`92`	`{`
`93`	`93`	`var originalResource = resource.Clone();`
`@@ -112,7 +112,7 @@ protected virtual async Task<bool> TryClaimAsync(WorkflowInstance resource, Canc`
`112`	`112`	`protected virtual async Task<bool> TryReleaseAsync(WorkflowInstance resource, CancellationToken cancellationToken)`
`113`	`113`	`{`
`114`	`114`	`ArgumentNullException.ThrowIfNull(resource);`
`115`		`- if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName) && operatorQualifiedName == this.Operator.Resource.GetQualifiedName()) return true;`
	`115`	`+ if (resource.Metadata.Labels != null && resource.Metadata.Labels.TryGetValue(SynapseDefaults.Resources.Labels.Operator, out var operatorQualifiedName)) return operatorQualifiedName == this.Operator.Resource.GetQualifiedName();`
`116`	`116`	`try`
`117`	`117`	`{`
`118`	`118`	`var originalResource = resource.Clone();`