adding property layer to jobexecution (#26697)

* adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution * adding property layer to jobexecution
Azure · Dec 8, 2023 · 8e982a3 · 8e982a3
1 parent 9b5ad5f
commit 8e982a3
Show file tree

Hide file tree

Showing 19 changed files with 559 additions and 476 deletions.
diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/Jobs.json
@@ -931,7 +931,7 @@
       }
     },
     "JobExecution": {
-      "description": "Container Apps Jobs execution.",
+      "description": "Container Apps Job execution.",
       "type": "object",
       "properties": {
         "name": {
@@ -943,40 +943,47 @@
           "type": "string"
         },
         "type": {
-          "description": "Job Type.",
+          "description": "Job execution type",
           "type": "string"
         },
-        "status": {
-          "description": "Current running State of the job",
-          "enum": [
-            "Running",
-            "Processing",
-            "Stopped",
-            "Degraded",
-            "Failed",
-            "Unknown",
-            "Succeeded"
-          ],
-          "type": "string",
-          "readOnly": true,
-          "x-ms-enum": {
-            "name": "JobExecutionRunningState",
-            "modelAsString": true
-          }
-        },
-        "startTime": {
-          "description": "Job execution start time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "endTime": {
-          "description": "Job execution end time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "template": {
-          "description": "Job's execution container.",
-          "$ref": "#/definitions/JobExecutionTemplate"
+        "properties": {
+          "description": "Container Apps Job execution specific properties.",
+          "type": "object",
+          "properties": {
+            "status": {
+              "description": "Current running State of the job",
+              "enum": [
+                "Running",
+                "Processing",
+                "Stopped",
+                "Degraded",
+                "Failed",
+                "Unknown",
+                "Succeeded"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "JobExecutionRunningState",
+                "modelAsString": true
+              }
+            },
+            "startTime": {
+              "description": "Job execution start time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "endTime": {
+              "description": "Job execution end time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "template": {
+              "description": "Job's execution container.",
+              "$ref": "#/definitions/JobExecutionTemplate"
+            }
+          },
+          "x-ms-client-flatten": true
         }
       }
     },

diff --git a/...esource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Job_Executions_Get.json b/...esource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Job_Executions_Get.json
@@ -12,37 +12,39 @@
         "value": [
           {
             "name": "testcontainerappjob-27944454",
-            "status": "Running",
-            "startTime": "2023-02-13T20:37:30+00:00",
-            "endTime": "2023-02-13T20:47:30+00:00",
-            "template": {
-              "containers": [
-                {
-                  "image": "repo/testcontainerappsjob0:v4",
-                  "name": "testcontainerappsjob0",
-                  "resources": {
-                    "cpu": 0.5,
-                    "memory": "1Gi"
+            "properties": {
+              "status": "Running",
+              "startTime": "2023-02-13T20:37:30+00:00",
+              "endTime": "2023-02-13T20:47:30+00:00",
+              "template": {
+                "containers": [
+                  {
+                    "image": "repo/testcontainerappsjob0:v4",
+                    "name": "testcontainerappsjob0",
+                    "resources": {
+                      "cpu": 0.5,
+                      "memory": "1Gi"
+                    }
                   }
-                }
-              ],
-              "initContainers": [
-                {
-                  "image": "repo/testcontainerappsjob0:v4",
-                  "name": "testcontainerappsjob0",
-                  "resources": {
-                    "cpu": 0.5,
-                    "memory": "1Gi"
-                  },
-                  "command": [
-                    "/bin/sh"
-                  ],
-                  "args": [
-                    "-c",
-                    "while true; do echo hello; sleep 10;done"
-                  ]
-                }
-              ]
+                ],
+                "initContainers": [
+                  {
+                    "image": "repo/testcontainerappsjob0:v4",
+                    "name": "testcontainerappsjob0",
+                    "resources": {
+                      "cpu": 0.5,
+                      "memory": "1Gi"
+                    },
+                    "command": [
+                      "/bin/sh"
+                    ],
+                    "args": [
+                      "-c",
+                      "while true; do echo hello; sleep 10;done"
+                    ]
+                  }
+                ]
+              }
             }
           }
         ],

diff --git a/...resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Job_Stop_Multiple.json b/...resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Job_Stop_Multiple.json
@@ -25,21 +25,27 @@
         "value": [
           {
             "name": "testcontainerappsjob0-27944453",
-            "status": "Stopped",
-            "startTime": "2023-02-13T20:37:30+00:00",
-            "endTime": "2023-02-13T20:47:30+00:00"
+            "properties": {
+              "status": "Stopped",
+              "startTime": "2023-02-13T20:37:30+00:00",
+              "endTime": "2023-02-13T20:47:30+00:00"
+            }
           },
           {
             "name": "testcontainerappsjob0-27944452",
-            "status": "Stopped",
-            "startTime": "2023-02-13T20:37:30+00:00",
-            "endTime": "2023-02-13T20:47:30+00:00"
+            "properties": {
+              "status": "Stopped",
+              "startTime": "2023-02-13T21:37:30+00:00",
+              "endTime": "2023-02-13T21:47:30+00:00"
+            }
           },
           {
             "name": "testcontainerappsjob0-27944453",
-            "status": "Failed",
-            "startTime": "2023-02-13T20:37:30+00:00",
-            "endTime": "2023-02-13T20:47:30+00:00"
+            "properties": {
+              "status": "Failed",
+              "startTime": "2023-02-13T22:37:30+00:00",
+              "endTime": "2023-02-13T22:47:30+00:00"
+            }
           }
         ],
         "nextLink": null

diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/Jobs.json
@@ -1028,40 +1028,47 @@
           "type": "string"
         },
         "type": {
-          "description": "Job Type.",
+          "description": "Job execution type",
           "type": "string"
         },
-        "status": {
-          "description": "Current running State of the job",
-          "enum": [
-            "Running",
-            "Processing",
-            "Stopped",
-            "Degraded",
-            "Failed",
-            "Unknown",
-            "Succeeded"
-          ],
-          "type": "string",
-          "readOnly": true,
-          "x-ms-enum": {
-            "name": "JobExecutionRunningState",
-            "modelAsString": true
-          }
-        },
-        "startTime": {
-          "description": "Job execution start time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "endTime": {
-          "description": "Job execution end time.",
-          "format": "date-time",
-          "type": "string"
-        },
-        "template": {
-          "description": "Job's execution container.",
-          "$ref": "#/definitions/JobExecutionTemplate"
+        "properties": {
+          "description": "Container Apps Job execution specific properties.",
+          "type": "object",
+          "properties": {
+            "status": {
+              "description": "Current running State of the job",
+              "enum": [
+                "Running",
+                "Processing",
+                "Stopped",
+                "Degraded",
+                "Failed",
+                "Unknown",
+                "Succeeded"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "JobExecutionRunningState",
+                "modelAsString": true
+              }
+            },
+            "startTime": {
+              "description": "Job execution start time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "endTime": {
+              "description": "Job execution end time.",
+              "format": "date-time",
+              "type": "string"
+            },
+            "template": {
+              "description": "Job's execution container.",
+              "$ref": "#/definitions/JobExecutionTemplate"
+            }
+          },
+          "x-ms-client-flatten": true
         }
       }
     },

diff --git a/...resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Job_Execution_Get.json b/...resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Job_Execution_Get.json
@@ -11,37 +11,39 @@
       "headers": {},
       "body": {
         "name": "jobExecution1",
-        "status": "Running",
-        "startTime": "2023-02-13T20:37:30+00:00",
-        "endTime": "2023-02-13T20:47:30+00:00",
-        "template": {
-          "containers": [
-            {
-              "image": "repo/testcontainerappsjob0:v4",
-              "name": "testcontainerappsjob0",
-              "resources": {
-                "cpu": 0.5,
-                "memory": "1Gi"
+        "properties": {
+          "status": "Running",
+          "startTime": "2023-02-13T20:37:30+00:00",
+          "endTime": "2023-02-13T20:47:30+00:00",
+          "template": {
+            "containers": [
+              {
+                "image": "repo/testcontainerappsjob0:v4",
+                "name": "testcontainerappsjob0",
+                "resources": {
+                  "cpu": 0.5,
+                  "memory": "1Gi"
+                }
               }
-            }
-          ],
-          "initContainers": [
-            {
-              "image": "repo/testcontainerappsjob0:v4",
-              "name": "testinitcontainerAppsJob0",
-              "resources": {
-                "cpu": 0.5,
-                "memory": "1Gi"
-              },
-              "command": [
-                "/bin/sh"
-              ],
-              "args": [
-                "-c",
-                "while true; do echo hello; sleep 10;done"
-              ]
-            }
-          ]
+            ],
+            "initContainers": [
+              {
+                "image": "repo/testcontainerappsjob0:v4",
+                "name": "testinitcontainerAppsJob0",
+                "resources": {
+                  "cpu": 0.5,
+                  "memory": "1Gi"
+                },
+                "command": [
+                  "/bin/sh"
+                ],
+                "args": [
+                  "-c",
+                  "while true; do echo hello; sleep 10;done"
+                ]
+              }
+            ]
+          }
         }
       }
     }