address comments

Author: carlydf

openapi/openapiv2.json

@@ -7005,7 +7005,7 @@
     "VersioningOverridePinnedOverride": {
       "type": "object",
       "properties": {
-        "type": {
+        "behavior": {
           "$ref": "#/definitions/VersioningOverridePinnedOverrideBehavior"
         },
         "version": {
@@ -7595,7 +7595,7 @@
         },
         "unversionedDeploymentName": {
           "type": "string",
-          "title": "Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)"
+          "title": "The name of the Deployment where you want to set Current Version to unversioned.\nRepresents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)"
         },
         "conflictToken": {
           "type": "string",
@@ -7629,7 +7629,7 @@
         },
         "unversionedDeploymentName": {
           "type": "string",
-          "title": "Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)"
+          "title": "The name of the Deployment where you want to set Ramping Version to unversioned.\nRepresents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)"
         },
         "percentage": {
           "type": "number",
@@ -8141,7 +8141,7 @@
         },
         "deploymentVersion": {
           "type": "object",
-          "description": "A Worker Deployment Version (Version, for short) represents a different\nversion of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)\nVersion records are created in Temporal server automatically when their\nfirst poller arrives to the server.\nExperimental. Worker Deployment Versions are experimental and might significantly change in the future."
+          "description": "A Worker Deployment Version (Version, for short) represents a\nversion of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)\nVersion records are created in Temporal server automatically when their\nfirst poller arrives to the server.\nExperimental. Worker Deployment Versions are experimental and might significantly change in the future."
         },
         "upsertEntries": {
           "type": "object",
@@ -11798,10 +11798,14 @@
         },
         "lastDeployment": {
           "$ref": "#/definitions/v1Deployment",
-          "description": "The deployment this activity was dispatched to most recently. Present only if the activity\nwas dispatched to a versioned worker.\nDeprecated. Use `last_worker_deployment_version`."
+          "description": "The deployment this activity was dispatched to most recently. Present only if the activity\nwas dispatched to a versioned worker.\nDeprecated. Use `last_deployment_version`."
         },
         "lastWorkerDeploymentVersion": {
           "type": "string",
+          "description": "The Worker Deployment Version this activity was dispatched to most recently.\nDeprecated. Use `last_deployment_version`."
+        },
+        "lastDeploymentVersion": {
+          "$ref": "#/definitions/v1WorkerDeploymentVersion",
           "description": "The Worker Deployment Version this activity was dispatched to most recently."
         },
         "priority": {
@@ -13340,7 +13344,7 @@
         },
         "previousVersion": {
           "type": "string",
-          "description": "Deprecated. Use `previous_current`."
+          "description": "Deprecated. Use `replaced_version`."
         },
         "deploymentVersion": {
           "$ref": "#/definitions/v1WorkerDeploymentVersion"
@@ -13360,7 +13364,7 @@
         },
         "previousVersion": {
           "type": "string",
-          "description": "Deprecated. Use `previous_ramping`."
+          "description": "Deprecated. Use `replaced_version`."
         },
         "deploymentVersion": {
           "$ref": "#/definitions/v1WorkerDeploymentVersion"
@@ -14807,7 +14811,7 @@
           "description": "Identifies the Worker Deployment this Version is part of.\nMust be unique within the namespace."
         }
       },
-      "description": "A Worker Deployment Version (Version, for short) represents a different\nversion of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)\nVersion records are created in Temporal server automatically when their\nfirst poller arrives to the server.\nExperimental. Worker Deployment Versions are experimental and might significantly change in the future."
+      "description": "A Worker Deployment Version (Version, for short) represents a\nversion of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)\nVersion records are created in Temporal server automatically when their\nfirst poller arrives to the server.\nExperimental. Worker Deployment Versions are experimental and might significantly change in the future."
     },
     "v1WorkerDeploymentVersionInfo": {
       "type": "object",
@@ -15554,7 +15558,7 @@
         },
         "deployment": {
           "$ref": "#/definitions/v1Deployment",
-          "description": "The worker deployment that completed the last workflow task of this workflow execution. Must\nbe present if `behavior` is set. Absent value means no workflow task is completed, or the\nlast workflow task was completed by an unversioned worker. Unversioned workers may still send\na deployment value which will be stored here, so the right way to check if an execution is\nversioned if an execution is versioned or not is via the `behavior` field.\nNote that `deployment` is overridden by `versioning_override` if the latter is present.\nDeprecated. Use `version`."
+          "description": "The worker deployment that completed the last workflow task of this workflow execution. Must\nbe present if `behavior` is set. Absent value means no workflow task is completed, or the\nlast workflow task was completed by an unversioned worker. Unversioned workers may still send\na deployment value which will be stored here, so the right way to check if an execution is\nversioned if an execution is versioned or not is via the `behavior` field.\nNote that `deployment` is overridden by `versioning_override` if the latter is present.\nDeprecated. Use `deployment_version`."
         },
         "version": {
           "$ref": "#/definitions/v1WorkerDeploymentVersion",

openapi/openapiv3.yaml

@@ -8917,9 +8917,15 @@ components:
           description: |-
             The deployment this activity was dispatched to most recently. Present only if the activity
              was dispatched to a versioned worker.
-             Deprecated. Use `last_worker_deployment_version`.
+             Deprecated. Use `last_deployment_version`.
         lastWorkerDeploymentVersion:
           type: string
+          description: |-
+            The Worker Deployment Version this activity was dispatched to most recently.
+             Deprecated. Use `last_deployment_version`.
+        lastDeploymentVersion:
+          allOf:
+            - $ref: '#/components/schemas/WorkerDeploymentVersion'
           description: The Worker Deployment Version this activity was dispatched to most recently.
         priority:
           allOf:
@@ -10461,7 +10467,9 @@ components:
           $ref: '#/components/schemas/WorkerDeploymentVersion'
         unversionedDeploymentName:
           type: string
-          description: Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)
+          description: |-
+            The name of the Deployment where you want to set Current Version to unversioned.
+             Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)
         conflictToken:
           type: string
           description: |-
@@ -10502,7 +10510,7 @@ components:
           format: bytes
         previousVersion:
           type: string
-          description: Deprecated. Use `previous_current`.
+          description: Deprecated. Use `replaced_version`.
         deploymentVersion:
           $ref: '#/components/schemas/WorkerDeploymentVersion'
         unversioned:
@@ -10522,7 +10530,9 @@ components:
           $ref: '#/components/schemas/WorkerDeploymentVersion'
         unversionedDeploymentName:
           type: string
-          description: Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)
+          description: |-
+            The name of the Deployment where you want to set Ramping Version to unversioned.
+             Represents all the unversioned workers (those with `UNVERSIONED` (or unspecified) `WorkerVersioningMode`.)
         percentage:
           type: number
           description: 'Ramp percentage to set. Valid range: [0,100].'
@@ -10570,7 +10580,7 @@ components:
           format: bytes
         previousVersion:
           type: string
-          description: Deprecated. Use `previous_ramping`.
+          description: Deprecated. Use `replaced_version`.
         deploymentVersion:
           $ref: '#/components/schemas/WorkerDeploymentVersion'
         unversioned:
@@ -11993,7 +12003,7 @@ components:
     VersioningOverride_PinnedOverride:
       type: object
       properties:
-        type:
+        behavior:
           enum:
             - PINNED_OVERRIDE_BEHAVIOR_UNSPECIFIED
             - PINNED_OVERRIDE_BEHAVIOR_PINNED
@@ -12103,7 +12113,7 @@ components:
             Identifies the Worker Deployment this Version is part of.
              Must be unique within the namespace.
       description: |-
-        A Worker Deployment Version (Version, for short) represents a different
+        A Worker Deployment Version (Version, for short) represents a
          version of workers within a Worker Deployment. (see documentation of WorkerDeploymentVersionInfo)
          Version records are created in Temporal server automatically when their
          first poller arrives to the server.
@@ -13024,7 +13034,7 @@ components:
              a deployment value which will be stored here, so the right way to check if an execution is
              versioned if an execution is versioned or not is via the `behavior` field.
              Note that `deployment` is overridden by `versioning_override` if the latter is present.
-             Deprecated. Use `version`.
+             Deprecated. Use `deployment_version`.
         version:
           allOf:
             - $ref: '#/components/schemas/WorkerDeploymentVersion'

temporal/api/workflow/v1/message.proto

@@ -169,7 +169,7 @@ message WorkflowExecutionVersioningInfo {
     // a deployment value which will be stored here, so the right way to check if an execution is
     // versioned if an execution is versioned or not is via the `behavior` field.
     // Note that `deployment` is overridden by `versioning_override` if the latter is present.
-    // Deprecated. Use `version`.
+    // Deprecated. Use `deployment_version`.
     temporal.api.deployment.v1.Deployment deployment = 2 [deprecated = true];
     // Deprecated. Use `deployment_version`.
     temporal.api.deployment.v1.WorkerDeploymentVersion version = 5 [deprecated = true];
@@ -311,10 +311,14 @@ message PendingActivityInfo {
 
     // The deployment this activity was dispatched to most recently. Present only if the activity
     // was dispatched to a versioned worker.
-    // Deprecated. Use `last_worker_deployment_version`.
+    // Deprecated. Use `last_deployment_version`.
     temporal.api.deployment.v1.Deployment last_deployment = 20 [deprecated = true];
     // The Worker Deployment Version this activity was dispatched to most recently.
-    string last_worker_deployment_version = 21;
+    // Deprecated. Use `last_deployment_version`.
+    string last_worker_deployment_version = 21 [deprecated = true];
+    // The Worker Deployment Version this activity was dispatched to most recently.
+    temporal.api.deployment.v1.WorkerDeploymentVersion last_deployment_version = 24;
+
 
     // Priority metadata
     temporal.api.common.v1.Priority priority = 22;

temporal/api/workflowservice/v1/request_response.proto

@@ -2064,7 +2064,7 @@ message SetWorkerDeploymentCurrentVersionResponse {
     // that write to the Worker Deployment state to ensure that the state
     // did not change between this API call and a future write.
     bytes conflict_token = 1;
-    // Deprecated. Use `previous_current`.
+    // Deprecated. Use `replaced_version`.
     string previous_version = 2 [deprecated = true];
     // The version that was current before executing this operation.
     oneof replaced_version {
@@ -2121,10 +2121,10 @@ message SetWorkerDeploymentRampingVersionResponse {
     // that write to the Worker Deployment state to ensure that the state
     // did not change between this API call and a future write.
     bytes conflict_token = 1;
-    // Deprecated. Use `previous_ramping`.
+    // Deprecated. Use `replaced_version`.
     string previous_version = 2 [deprecated = true];
     // The version that was ramping before executing this operation.
-    oneof replaced_ramping {
+    oneof replaced_version {
         temporal.api.deployment.v1.WorkerDeploymentVersion deployment_version = 4;
         bool unversioned = 5;
     };