refactor to common

Author: fretz12

openapi/openapiv2.json

@@ -10468,7 +10468,7 @@
           "description": "Links to be associated with the activity. Callbacks may also have associated links;\nlinks already included with a callback should not be duplicated here."
         },
         "onConflictOptions": {
-          "$ref": "#/definitions/apiActivityV1OnConflictOptions",
+          "$ref": "#/definitions/apiCommonV1OnConflictOptions",
           "description": "Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING."
         }
       }
@@ -11139,24 +11139,6 @@
         }
       }
     },
-    "apiActivityV1OnConflictOptions": {
-      "type": "object",
-      "properties": {
-        "attachRequestId": {
-          "type": "boolean",
-          "description": "Attaches the request ID to the running activity."
-        },
-        "attachCompletionCallbacks": {
-          "type": "boolean",
-          "description": "Attaches the completion callbacks to the running activity."
-        },
-        "attachLinks": {
-          "type": "boolean",
-          "description": "Attaches the links to the running activity."
-        }
-      },
-      "description": "When StartActivityExecution uses the conflict policy ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING and\nthere is already an existing running activity, OnConflictOptions defines actions to be taken on\nthe existing running activity."
-    },
     "apiCallbackV1CallbackInfo": {
       "type": "object",
       "properties": {
@@ -11199,6 +11181,24 @@
       },
       "description": "Common callback information. Specific CallbackInfo messages should embed this and may include additional fields."
     },
+    "apiCommonV1OnConflictOptions": {
+      "type": "object",
+      "properties": {
+        "attachRequestId": {
+          "type": "boolean",
+          "description": "Attaches the request ID to the running execution."
+        },
+        "attachCompletionCallbacks": {
+          "type": "boolean",
+          "description": "Attaches the completion callbacks to the running execution."
+        },
+        "attachLinks": {
+          "type": "boolean",
+          "description": "Attaches the links to the running execution."
+        }
+      },
+      "description": "When starting an execution with a conflict policy that uses an existing execution and there is already an existing\nrunning execution, OnConflictOptions defines actions to be taken on the existing running execution."
+    },
     "apiWorkflowV1CallbackInfo": {
       "type": "object",
       "properties": {

openapi/openapiv3.yaml

@@ -11726,17 +11726,16 @@ components:
       properties:
         attachRequestId:
           type: boolean
-          description: Attaches the request ID to the running activity.
+          description: Attaches the request ID to the running execution.
         attachCompletionCallbacks:
           type: boolean
-          description: Attaches the completion callbacks to the running activity.
+          description: Attaches the completion callbacks to the running execution.
         attachLinks:
           type: boolean
-          description: Attaches the links to the running activity.
+          description: Attaches the links to the running execution.
       description: |-
-        When StartActivityExecution uses the conflict policy ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING and
-         there is already an existing running activity, OnConflictOptions defines actions to be taken on
-         the existing running activity.
+        When starting an execution with a conflict policy that uses an existing execution and there is already an existing
+         running execution, OnConflictOptions defines actions to be taken on the existing running execution.
     Outcome:
       type: object
       properties:

temporal/api/activity/v1/message.proto

@@ -200,18 +200,6 @@ message ActivityExecutionListInfo {
     google.protobuf.Duration execution_duration = 11;
 }
 
-// When StartActivityExecution uses the conflict policy ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING and
-// there is already an existing running activity, OnConflictOptions defines actions to be taken on
-// the existing running activity.
-message OnConflictOptions {
-    // Attaches the request ID to the running activity.
-    bool attach_request_id = 1;
-    // Attaches the completion callbacks to the running activity.
-    bool attach_completion_callbacks = 2;
-    // Attaches the links to the running activity.
-    bool attach_links = 3;
-}
-
 // CallbackInfo contains the state of an attached activity callback.
 message CallbackInfo {
     // Trigger for when the activity is closed.

temporal/api/common/v1/message.proto

@@ -363,3 +363,14 @@ message WorkerSelector {
         string worker_instance_key = 1;
     }
 }
+
+// When starting an execution with a conflict policy that uses an existing execution and there is already an existing
+// running execution, OnConflictOptions defines actions to be taken on the existing running execution.
+message OnConflictOptions {
+    // Attaches the request ID to the running execution.
+    bool attach_request_id = 1;
+    // Attaches the completion callbacks to the running execution.
+    bool attach_completion_callbacks = 2;
+    // Attaches the links to the running execution.
+    bool attach_links = 3;
+}

temporal/api/workflowservice/v1/request_response.proto

@@ -2938,7 +2938,7 @@ message StartActivityExecutionRequest {
     // links already included with a callback should not be duplicated here.
     repeated temporal.api.common.v1.Link links = 20;
     // Options for handling conflicts when using ACTIVITY_ID_CONFLICT_POLICY_USE_EXISTING.
-    temporal.api.activity.v1.OnConflictOptions on_conflict_options = 21;
+    temporal.api.common.v1.OnConflictOptions on_conflict_options = 21;
 }
 
 message StartActivityExecutionResponse {