Add temporal.api.nexusoperation.v1.OnConflictOptions to start SANO request

Author: chrsmith

openapi/openapiv2.json

@@ -12460,6 +12460,10 @@
           "$ref": "#/definitions/v1NexusOperationIdConflictPolicy",
           "description": "Defines how to resolve an operation id conflict with a *running* operation.\nThe default policy is NEXUS_OPERATION_ID_CONFLICT_POLICY_FAIL."
         },
+        "onConflictOptions": {
+          "$ref": "#/definitions/apiNexusoperationV1OnConflictOptions",
+          "description": "Defines actions to be done to the existing running standalone Nexus when the conflict policy\nNEXUS_OPERATION_ID_CONFLICT_POLICY_USE_EXISTING is used. If not set or set to a empty object\n(all options with default value), it won't do modify running operation."
+        },
         "searchAttributes": {
           "$ref": "#/definitions/v1SearchAttributes",
           "description": "Search attributes for indexing."
@@ -13288,6 +13292,20 @@
         }
       }
     },
+    "apiNexusoperationV1OnConflictOptions": {
+      "type": "object",
+      "properties": {
+        "attachCompletionCallbacks": {
+          "type": "boolean",
+          "description": "Attaches the completion callbacks to the running operation."
+        },
+        "attachLinks": {
+          "type": "boolean",
+          "description": "Attaches the links to the WorkflowExecutionOptionsUpdatedEvent history event."
+        }
+      },
+      "description": "When StartNexusOperationExecutionRequest uses the conflict policy NEXUS_OPERATION_ID_CONFLICT_POLICY_USE_EXISTING\nand there is already an existing, running standalone Nexus operation, OnConflictOptions defines actions to be\ntaken."
+    },
     "apiWorkflowV1CallbackInfo": {
       "type": "object",
       "properties": {
@@ -14496,7 +14514,7 @@
         },
         "service": {
           "type": "string",
-          "description": "Target Nexus service, e.g. \"HTTPAdaptor\"."
+          "description": "Target Nexus service, e.g. \"HTTPAdapter\"."
         },
         "operation": {
           "type": "string",

openapi/openapiv3.yaml

@@ -10850,7 +10850,7 @@ components:
              NOTE: This is not a temporal.api.taskqueue.v1.TaskQueue to avoid a circular dependency.
         service:
           type: string
-          description: Target Nexus service, e.g. "HTTPAdaptor".
+          description: Target Nexus service, e.g. "HTTPAdapter".
         operation:
           type: string
           description: Target operation, e.g. "DeliverAsWebhook".
@@ -17114,6 +17114,13 @@ components:
             Defines how to resolve an operation id conflict with a *running* operation.
              The default policy is NEXUS_OPERATION_ID_CONFLICT_POLICY_FAIL.
           format: enum
+        onConflictOptions:
+          allOf:
+            - $ref: '#/components/schemas/OnConflictOptions'
+          description: |-
+            Defines actions to be done to the existing running standalone Nexus when the conflict policy
+             NEXUS_OPERATION_ID_CONFLICT_POLICY_USE_EXISTING is used. If not set or set to a empty object
+             (all options with default value), it won't do modify running operation.
         searchAttributes:
           allOf:
             - $ref: '#/components/schemas/SearchAttributes'

temporal/api/nexusoperation/v1/message.proto

@@ -28,3 +28,15 @@ message CallbackInfo {
     // Common callback info.
     temporal.api.callback.v1.CallbackInfo info = 2;
 }
+
+// When StartNexusOperationExecutionRequest uses the conflict policy NEXUS_OPERATION_ID_CONFLICT_POLICY_USE_EXISTING
+// and there is already an existing, running standalone Nexus operation, OnConflictOptions defines actions to be
+// taken.
+message OnConflictOptions {
+    // Attaches the request ID to the running operation.
+    bool attach_request_id = 1;
+    // Attaches the completion callbacks to the running operation.
+    bool attach_completion_callbacks = 2;
+    // Attaches any new links to the running operation.
+    bool attach_links = 3;
+}

temporal/api/workflowservice/v1/request_response.proto

@@ -3382,6 +3382,10 @@ message StartNexusOperationExecutionRequest {
     // Defines how to resolve an operation id conflict with a *running* operation.
     // The default policy is NEXUS_OPERATION_ID_CONFLICT_POLICY_FAIL.
     temporal.api.enums.v1.NexusOperationIdConflictPolicy id_conflict_policy = 13;
+    // Defines actions to be done to the existing running standalone Nexus when the conflict policy
+    // NEXUS_OPERATION_ID_CONFLICT_POLICY_USE_EXISTING is used. If not set or set to a empty object
+    // (all options with default value), it won't do modify running operation.
+    temporal.api.nexusoperation.v1.OnConflictOptions on_conflict_options = 17;
 
     // Search attributes for indexing.
     temporal.api.common.v1.SearchAttributes search_attributes = 14;
@@ -3396,7 +3400,7 @@ message StartNexusOperationExecutionRequest {
     temporal.api.sdk.v1.UserMetadata user_metadata = 16;
 
     // Completion callbacks to be invoked once the Nexus operation reaches a terminal state.
-    repeated temporal.api.common.v1.Callback completion_callbacks = 17;
+    repeated temporal.api.common.v1.Callback completion_callbacks = 18;
 }
 
 message StartNexusOperationExecutionResponse {