internal/plugin: fix setting WorkflowIDConflictPolicy from proto option

CHANGELOG.md

@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 ### Fixed
-
+- [#117](https://github.com/cludden/protoc-gen-go-temporal/pull/117) fix for code generation when `workflow_id_conflict_policy` proto option is set
 
 
 # [1.17.2](https://github.com/cludden/protoc-gen-go-temporal/releases/tag/v1.17.2) - 2025-08-02

internal/plugin/client.go

@@ -2384,9 +2384,23 @@ func (m *Manifest) genWorkflowOptions(f *j.File, workflow protoreflect.FullName,
 
 			// set WorkflowIDConflictPolicy
 			if !child {
-				g.If(j.Id("v").Op(":=").Id("o").Dot("workflowIdConflictPolicy"), j.Id("v").Op("!=").Qual(enumsPkg, "WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED")).Block(
+				idConflictPolicy := g.If(j.Id("v").Op(":=").Id("o").Dot("workflowIdConflictPolicy"), j.Id("v").Op("!=").Qual(enumsPkg, "WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED")).Block(
 					j.Id("opts").Dot("WorkflowIDConflictPolicy").Op("=").Id("v"),
 				)
+				if p := opts.GetWorkflowIdConflictPolicy(); p != enums.WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED {
+					idConflictPolicy.Else().If(j.Id("opts").Dot("WorkflowIDConflictPolicy").Op("==").Qual(enumsPkg, "WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED")).BlockFunc(func(g *j.Group) {
+						var policy string
+						switch p {
+						case enums.WORKFLOW_ID_CONFLICT_POLICY_FAIL:
+							policy = "WORKFLOW_ID_CONFLICT_POLICY_FAIL"
+						case enums.WORKFLOW_ID_CONFLICT_POLICY_TERMINATE_EXISTING:
+							policy = "WORKFLOW_ID_CONFLICT_POLICY_TERMINATE_EXISTING"
+						case enums.WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING:
+							policy = "WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING"
+						}
+						g.Id("opts").Dot("WorkflowIDConflictPolicy").Op("=").Qual(enumsPkg, policy)
+					})
+				}
 			}
 
 			// set TaskQueue
@@ -2574,21 +2588,6 @@ func (m *Manifest) genWorkflowOptions(f *j.File, workflow protoreflect.FullName,
 				}
 			}
 
-			if p := opts.GetWorkflowIdConflictPolicy(); p != enums.WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED {
-				g.If(j.Id("opts").Dot("workflowIdConflictPolicy").Op("!=").Qual(enumsPkg, "WORKFLOW_ID_CONFLICT_POLICY_UNSPECIFIED")).BlockFunc(func(g *j.Group) {
-					var policy string
-					switch p {
-					case enums.WORKFLOW_ID_CONFLICT_POLICY_FAIL:
-						policy = "WORKFLOW_ID_CONFLICT_POLICY_FAIL"
-					case enums.WORKFLOW_ID_CONFLICT_POLICY_TERMINATE_EXISTING:
-						policy = "WORKFLOW_ID_CONFLICT_POLICY_TERMINATE_EXISTING"
-					case enums.WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING:
-						policy = "WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING"
-					}
-					g.Id("opts").Dot("WorkflowIdConflictPolicy").Op("=").Qual(enumsPkg, policy)
-				})
-			}
-
 			g.Return(j.Id("opts"), j.Nil())
 		})
 

test/option/main_test.go

@@ -215,10 +215,11 @@ func (s *OptionSuite) TestChildWorkflowOptions() {
 				SearchAttributes: map[string]any{
 					"name": "foo",
 				},
-				TaskQueue:                "option-v2",
-				WaitForCancellation:      true,
-				WorkflowID:               "workflow-with-input:foo",
-				WorkflowIDReusePolicy:    enums.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE_FAILED_ONLY,
+				TaskQueue:             "option-v2",
+				WaitForCancellation:   true,
+				WorkflowID:            "workflow-with-input:foo",
+				WorkflowIDReusePolicy: enums.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE_FAILED_ONLY,
+
 				WorkflowExecutionTimeout: time.Second * 600,
 				WorkflowRunTimeout:       time.Second * 300,
 				WorkflowTaskTimeout:      time.Second * 10,
@@ -538,6 +539,7 @@ func (s *OptionSuite) TestWorkflowOptions() {
 					"name": "foo",
 				},
 				TaskQueue:                "option-v2",
+				WorkflowIDConflictPolicy: enums.WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING,
 				WorkflowIDReusePolicy:    enums.WORKFLOW_ID_REUSE_POLICY_ALLOW_DUPLICATE_FAILED_ONLY,
 				WorkflowExecutionTimeout: time.Second * 600,
 				WorkflowRunTimeout:       time.Second * 300,
@@ -561,6 +563,7 @@ func (s *OptionSuite) TestWorkflowOptions() {
 				},
 				TaskQueue:                "option-v2",
 				WorkflowIDReusePolicy:    enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
+				WorkflowIDConflictPolicy: enums.WORKFLOW_ID_CONFLICT_POLICY_FAIL,
 				WorkflowExecutionTimeout: time.Second * 599,
 				WorkflowRunTimeout:       time.Second * 299,
 				WorkflowTaskTimeout:      time.Second * 9,
@@ -577,13 +580,15 @@ func (s *OptionSuite) TestWorkflowOptions() {
 						},
 						TaskQueue:                "option-v2",
 						WorkflowIDReusePolicy:    enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE,
+						WorkflowIDConflictPolicy: enums.WORKFLOW_ID_CONFLICT_POLICY_FAIL,
 						WorkflowExecutionTimeout: time.Second * 599,
 						WorkflowRunTimeout:       time.Second * 299,
 						WorkflowTaskTimeout:      time.Second * 9,
 					}),
 				optionv1.NewWorkflowWithInputOptions().
 					WithExecutionTimeout(time.Second * 599).
 					WithID("foo").
+					WithWorkflowIdConflictPolicy(enums.WORKFLOW_ID_CONFLICT_POLICY_FAIL).
 					WithIDReusePolicy(enums.WORKFLOW_ID_REUSE_POLICY_REJECT_DUPLICATE).
 					WithRetryPolicy(&temporal.RetryPolicy{
 						MaximumAttempts: 4,

test/option/proto/test/option/v1/option.proto

@@ -42,6 +42,7 @@ service Test {
       task_queue: "option-v2"
       task_timeout: {seconds: 10}
       wait_for_cancellation: true
+      workflow_id_conflict_policy: WORKFLOW_ID_CONFLICT_POLICY_USE_EXISTING
 
       update: {ref: 'UpdateWithInput'}
     };