rebase and regen

Author: Quinn-With-Two-Ns

openapi/openapiv2.json

@@ -12764,9 +12764,13 @@
           "$ref": "#/definitions/v1Callback",
           "description": "Information on how this callback should be invoked (e.g. its URL and type)."
         },
+        "status": {
+          "$ref": "#/definitions/v1CallbackExecutionStatus",
+          "description": "A general status for this callback, indicates whether it is currently running or in one of the terminal statuses."
+        },
         "state": {
-          "$ref": "#/definitions/v1CallbackExecutionState",
-          "description": "Current state of the callback execution."
+          "$ref": "#/definitions/v1CallbackState",
+          "description": "The detailed state of this callback, provides more granular information than the general status."
         },
         "attempt": {
           "type": "integer",
@@ -12828,9 +12832,9 @@
           "type": "string",
           "description": "Run ID of the callback execution."
         },
-        "state": {
-          "$ref": "#/definitions/v1CallbackExecutionState",
-          "description": "Current state of the callback execution."
+        "status": {
+          "$ref": "#/definitions/v1CallbackExecutionStatus",
+          "description": "Only running and terminal statuses appear here. More detailed information in CallbackExecutionInfo but not\navailable in the list response."
         },
         "createTime": {
           "type": "string",
@@ -12869,17 +12873,17 @@
       },
       "description": "The outcome of a completed callback execution: either success or a failure."
     },
-    "v1CallbackExecutionState": {
+    "v1CallbackExecutionStatus": {
       "type": "string",
       "enum": [
-        "CALLBACK_EXECUTION_STATE_UNSPECIFIED",
-        "CALLBACK_EXECUTION_STATE_RUNNING",
-        "CALLBACK_EXECUTION_STATE_SUCCEEDED",
-        "CALLBACK_EXECUTION_STATE_FAILED",
-        "CALLBACK_EXECUTION_STATE_TERMINATED"
+        "CALLBACK_EXECUTION_STATUS_UNSPECIFIED",
+        "CALLBACK_EXECUTION_STATUS_RUNNING",
+        "CALLBACK_EXECUTION_STATUS_SUCCEEDED",
+        "CALLBACK_EXECUTION_STATUS_FAILED",
+        "CALLBACK_EXECUTION_STATUS_TERMINATED"
       ],
-      "default": "CALLBACK_EXECUTION_STATE_UNSPECIFIED",
-      "description": "Terminal status of a standalone callback execution.\n\n - CALLBACK_EXECUTION_STATE_UNSPECIFIED: Default value, unspecified status.\n - CALLBACK_EXECUTION_STATE_RUNNING: Callback execution is running.\n - CALLBACK_EXECUTION_STATE_SUCCEEDED: Callback has succeeded.\n - CALLBACK_EXECUTION_STATE_FAILED: Callback has failed.\n - CALLBACK_EXECUTION_STATE_TERMINATED: Callback was terminated via TerminateCallbackExecution."
+      "default": "CALLBACK_EXECUTION_STATUS_UNSPECIFIED",
+      "description": "Status of a callback execution.\nThe status is updated once, when the callback is originally scheduled, and again when the callback reaches a terminal\nstatus.\n\n - CALLBACK_EXECUTION_STATUS_UNSPECIFIED: Default value, unspecified status.\n - CALLBACK_EXECUTION_STATUS_RUNNING: Callback execution is running.\n - CALLBACK_EXECUTION_STATUS_SUCCEEDED: Callback has succeeded.\n - CALLBACK_EXECUTION_STATUS_FAILED: Callback has failed.\n - CALLBACK_EXECUTION_STATUS_TERMINATED: Callback was terminated via TerminateCallbackExecution."
     },
     "v1CallbackInfo": {
       "type": "object",
@@ -15985,6 +15989,10 @@
     "v1PollCallbackExecutionResponse": {
       "type": "object",
       "properties": {
+        "runId": {
+          "type": "string",
+          "description": "The run ID of the callback, useful when run_id was not specified in the request."
+        },
         "outcome": {
           "$ref": "#/definitions/v1CallbackExecutionOutcome"
         }

openapi/openapiv3.yaml

@@ -9597,15 +9597,28 @@ components:
           allOf:
             - $ref: '#/components/schemas/Callback'
           description: Information on how this callback should be invoked (e.g. its URL and type).
+        status:
+          enum:
+            - CALLBACK_EXECUTION_STATUS_UNSPECIFIED
+            - CALLBACK_EXECUTION_STATUS_RUNNING
+            - CALLBACK_EXECUTION_STATUS_SUCCEEDED
+            - CALLBACK_EXECUTION_STATUS_FAILED
+            - CALLBACK_EXECUTION_STATUS_TERMINATED
+          type: string
+          description: A general status for this callback, indicates whether it is currently running or in one of the terminal statuses.
+          format: enum
         state:
           enum:
-            - CALLBACK_EXECUTION_STATE_UNSPECIFIED
-            - CALLBACK_EXECUTION_STATE_RUNNING
-            - CALLBACK_EXECUTION_STATE_SUCCEEDED
-            - CALLBACK_EXECUTION_STATE_FAILED
-            - CALLBACK_EXECUTION_STATE_TERMINATED
+            - CALLBACK_STATE_UNSPECIFIED
+            - CALLBACK_STATE_STANDBY
+            - CALLBACK_STATE_SCHEDULED
+            - CALLBACK_STATE_BACKING_OFF
+            - CALLBACK_STATE_FAILED
+            - CALLBACK_STATE_SUCCEEDED
+            - CALLBACK_STATE_BLOCKED
+            - CALLBACK_STATE_TERMINATED
           type: string
-          description: Current state of the callback execution.
+          description: The detailed state of this callback, provides more granular information than the general status.
           format: enum
         attempt:
           type: integer
@@ -9660,15 +9673,17 @@ components:
         runId:
           type: string
           description: Run ID of the callback execution.
-        state:
+        status:
           enum:
-            - CALLBACK_EXECUTION_STATE_UNSPECIFIED
-            - CALLBACK_EXECUTION_STATE_RUNNING
-            - CALLBACK_EXECUTION_STATE_SUCCEEDED
-            - CALLBACK_EXECUTION_STATE_FAILED
-            - CALLBACK_EXECUTION_STATE_TERMINATED
+            - CALLBACK_EXECUTION_STATUS_UNSPECIFIED
+            - CALLBACK_EXECUTION_STATUS_RUNNING
+            - CALLBACK_EXECUTION_STATUS_SUCCEEDED
+            - CALLBACK_EXECUTION_STATUS_FAILED
+            - CALLBACK_EXECUTION_STATUS_TERMINATED
           type: string
-          description: Current state of the callback execution.
+          description: |-
+            Only running and terminal statuses appear here. More detailed information in CallbackExecutionInfo but not
+             available in the list response.
           format: enum
         createTime:
           type: string
@@ -12757,6 +12772,9 @@ components:
     PollCallbackExecutionResponse:
       type: object
       properties:
+        runId:
+          type: string
+          description: The run ID of the callback, useful when run_id was not specified in the request.
         outcome:
           $ref: '#/components/schemas/CallbackExecutionOutcome'
     PollWorkflowTaskQueueResponse: