From 4b27bd8530bac60a8920aae0deaf00b0d4904ad8 Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Wed, 10 Jul 2024 16:00:10 -0700 Subject: [PATCH 01/13] add fields --- .../preview/2024-08-02-preview/Jobs.json | 126 ++++++++++++++++++ .../examples/Jobs_Resume.json | 95 +++++++++++++ .../examples/Jobs_Suspend.json | 95 +++++++++++++ 3 files changed, 316 insertions(+) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index 43b44f33a5dd..c7412febbd7f 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -625,6 +625,118 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/resume": { + "post": { + "tags": [ + "Jobs" + ], + "summary": "Resumes a suspended job", + "operationId": "Jobs_Resume", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "jobName", + "in": "path", + "description": "Name of the Job.", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" + } + ], + "responses": { + "200": { + "description": "Job resumed successfully." + }, + "202": { + "description": "Resume operation is in progress.", + "headers": { + "Location": { + "type": "string" + } + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Resume Job": { + "$ref": "./examples/Jobs_Resume.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/suspend": { + "post": { + "tags": [ + "Jobs" + ], + "summary": "Suspends a job", + "operationId": "Jobs_Suspend", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "jobName", + "in": "path", + "description": "Name of the Job.", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" + } + ], + "responses": { + "200": { + "description": "Job suspended successfully." + }, + "202": { + "description": "Suspend operation is in progress.", + "headers": { + "Location": { + "type": "string" + } + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Suspend Job": { + "$ref": "./examples/Jobs_Suspend.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } + } } }, "parameters": { @@ -794,6 +906,20 @@ "modelAsString": true } }, + "runningState": { + "description": "Current running state of the job", + "enum": [ + "Running", + "InProgress", + "Suspended" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "JobRunningState", + "modelAsString": true + } + }, "environmentId": { "description": "Resource ID of environment.", "type": "string", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json new file mode 100644 index 000000000000..b77b20fbff34 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json @@ -0,0 +1,95 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "jobName": "testcontainerAppsJob0", + "api-version": "2024-08-02-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/jobs/testcontainerAppsJob0", + "name": "testcontainerAppsJob0", + "type": "Microsoft.App/jobs", + "location": "East US", + "properties": { + "provisioningState": "Succeeded", + "runningState": "Running", + "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", + "configuration": { + "replicaTimeout": 10, + "replicaRetryLimit": 10, + "manualTriggerConfig": { + "replicaCompletionCount": 1, + "parallelism": 4 + }, + "triggerType": "Manual", + "identitySettings": [ + { + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity", + "lifecycle": "All" + }, + { + "identity": "system", + "lifecycle": "Init" + } + ] + }, + "template": { + "containers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + }, + "volumeMounts": [ + { + "volumeName": "azurefile", + "mountPath": "/mnt/path1", + "subPath": "subPath1" + }, + { + "volumeName": "nfsazurefile", + "mountPath": "/mnt/path2", + "subPath": "subPath2" + } + ] + } + ], + "initContainers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testinitcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + } + } + ], + "volumes": [ + { + "name": "azurefile", + "storageType": "AzureFile", + "storageName": "storage" + }, + { + "name": "nfsazurefile", + "storageType": "NfsAzureFile", + "storageName": "nfsStorage" + } + ] + } + } + } + }, + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview" + } + } + } +} + diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json new file mode 100644 index 000000000000..389c515ba10b --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json @@ -0,0 +1,95 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "jobName": "testcontainerAppsJob0", + "api-version": "2024-08-02-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/jobs/testcontainerAppsJob0", + "name": "testcontainerAppsJob0", + "type": "Microsoft.App/jobs", + "location": "East US", + "properties": { + "provisioningState": "Succeeded", + "runningState": "Suspended", + "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", + "configuration": { + "replicaTimeout": 10, + "replicaRetryLimit": 10, + "manualTriggerConfig": { + "replicaCompletionCount": 1, + "parallelism": 4 + }, + "triggerType": "Manual", + "identitySettings": [ + { + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity", + "lifecycle": "All" + }, + { + "identity": "system", + "lifecycle": "Init" + } + ] + }, + "template": { + "containers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + }, + "volumeMounts": [ + { + "volumeName": "azurefile", + "mountPath": "/mnt/path1", + "subPath": "subPath1" + }, + { + "volumeName": "nfsazurefile", + "mountPath": "/mnt/path2", + "subPath": "subPath2" + } + ] + } + ], + "initContainers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testinitcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + } + } + ], + "volumes": [ + { + "name": "azurefile", + "storageType": "AzureFile", + "storageName": "storage" + }, + { + "name": "nfsazurefile", + "storageType": "NfsAzureFile", + "storageName": "nfsStorage" + } + ] + } + } + } + }, + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview" + } + } + } +} + From 9c0fa31da908ee24bfcc422e42972e80220b675b Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Wed, 10 Jul 2024 16:08:40 -0700 Subject: [PATCH 02/13] add --- .../Microsoft.App/preview/2024-08-02-preview/Jobs.json | 1 - .../preview/2024-08-02-preview/examples/Jobs_Resume.json | 1 - .../preview/2024-08-02-preview/examples/Jobs_Suspend.json | 1 - 3 files changed, 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index c7412febbd7f..bec842d30342 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -1409,4 +1409,3 @@ } ] } - diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json index b77b20fbff34..5305f91c1261 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json @@ -92,4 +92,3 @@ } } } - diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json index 389c515ba10b..eda0c11585dc 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json @@ -92,4 +92,3 @@ } } } - From 31e6b1f3f3ba1d8b63d985a58f2635c793121c2e Mon Sep 17 00:00:00 2001 From: bgashirabake <85650284+bgashirabake@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:17:32 -0700 Subject: [PATCH 03/13] Update Jobs.json fix runningState and add azure-asyncoperation --- .../Microsoft.App/preview/2024-08-02-preview/Jobs.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index bec842d30342..d7281a3401b1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -659,6 +659,9 @@ "202": { "description": "Resume operation is in progress.", "headers": { + "Azure-AsyncOperation": { + "type": "string" + }, "Location": { "type": "string" } @@ -715,6 +718,9 @@ "202": { "description": "Suspend operation is in progress.", "headers": { + "Azure-AsyncOperation": { + "type": "string" + }, "Location": { "type": "string" } @@ -909,7 +915,7 @@ "runningState": { "description": "Current running state of the job", "enum": [ - "Running", + "Active", "InProgress", "Suspended" ], From 4d52e9c1455f62a23d7330d338886761b82573eb Mon Sep 17 00:00:00 2001 From: bgashirabake <85650284+bgashirabake@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:19:00 -0700 Subject: [PATCH 04/13] Update Jobs_Resume.json --- .../preview/2024-08-02-preview/examples/Jobs_Resume.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json index 5305f91c1261..91b2181d0b40 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json @@ -87,6 +87,7 @@ }, "202": { "headers": { + "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview", "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview" } } From d7c5bf70e965e26c4c6328d4c1dedab295df6949 Mon Sep 17 00:00:00 2001 From: bgashirabake <85650284+bgashirabake@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:19:53 -0700 Subject: [PATCH 05/13] Update Jobs_Suspend.json --- .../preview/2024-08-02-preview/examples/Jobs_Suspend.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json index eda0c11585dc..2ddf6d460684 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Suspend.json @@ -87,6 +87,7 @@ }, "202": { "headers": { + "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview", "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/jobs/testcontainerAppsJob0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2024-08-02-preview" } } From 588b532d18b9a0f54fd51c6d77bcc18a0d6716fa Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Mon, 15 Jul 2024 12:27:29 -0700 Subject: [PATCH 06/13] add azure-asyncoperation --- .../Microsoft.App/preview/2024-08-02-preview/Jobs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index d7281a3401b1..68aeff1d2999 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -681,7 +681,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" } } }, @@ -740,7 +740,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "location" + "final-state-via": "azure-async-operation" } } } From 77801a1a2689f3d689c10ee7b32e5d44a04dd6e1 Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Wed, 17 Jul 2024 15:38:39 -0700 Subject: [PATCH 07/13] fix lintdiff --- .../preview/2024-08-02-preview/Jobs.json | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index 68aeff1d2999..95fcb6dd8dae 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -635,13 +635,13 @@ "operationId": "Jobs_Resume", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -654,7 +654,10 @@ ], "responses": { "200": { - "description": "Job resumed successfully." + "description": "Job resumed successfully.", + "schema": { + "$ref": "#/definitions/Job" + } }, "202": { "description": "Resume operation is in progress.", @@ -694,13 +697,13 @@ "operationId": "Jobs_Suspend", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -713,7 +716,10 @@ ], "responses": { "200": { - "description": "Job suspended successfully." + "description": "Job suspended successfully.", + "schema": { + "$ref": "#/definitions/Job" + } }, "202": { "description": "Suspend operation is in progress.", From 7ab0493d8ce1b314dfec67462e2d864cee669e7d Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Thu, 18 Jul 2024 01:56:13 -0700 Subject: [PATCH 08/13] fix --- .../Microsoft.App/preview/2024-08-02-preview/Jobs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index 95fcb6dd8dae..a5ede1526f12 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -673,7 +673,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -735,7 +735,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, From c7ab3d88eb9cb4355f2bcd60146bc872893dbd2c Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Thu, 18 Jul 2024 17:49:13 -0700 Subject: [PATCH 09/13] fix --- .../preview/2024-08-02-preview/Jobs.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index a5ede1526f12..2ee9d483c31b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -635,13 +635,13 @@ "operationId": "Jobs_Resume", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -673,7 +673,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" } } }, @@ -697,13 +697,13 @@ "operationId": "Jobs_Suspend", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -735,7 +735,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" } } }, @@ -887,7 +887,7 @@ "description": "Container App Job", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" } ], "properties": { From 2ac7e6c0b7db058c76b698fd99cf9c0489ad9cbb Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Tue, 23 Jul 2024 13:17:57 -0700 Subject: [PATCH 10/13] fix --- .../preview/2024-08-02-preview/Jobs.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index 2ee9d483c31b..95fcb6dd8dae 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -635,13 +635,13 @@ "operationId": "Jobs_Resume", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -673,7 +673,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } }, @@ -697,13 +697,13 @@ "operationId": "Jobs_Suspend", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { "name": "jobName", @@ -735,7 +735,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" } } }, @@ -887,7 +887,7 @@ "description": "Container App Job", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" } ], "properties": { From 3e293502244f64b7fc773b8092029774e432708d Mon Sep 17 00:00:00 2001 From: "bgashirabake@gmail.com" Date: Tue, 23 Jul 2024 13:52:00 -0700 Subject: [PATCH 11/13] add --- .../Microsoft.App/preview/2024-08-02-preview/Jobs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index 95fcb6dd8dae..a5ede1526f12 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -673,7 +673,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -735,7 +735,7 @@ "default": { "description": "Common error response.", "schema": { - "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, From 1b17a0ff351c2cbfbcfcc527a674ceaef9a4a27d Mon Sep 17 00:00:00 2001 From: bgashirabake <85650284+bgashirabake@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:55:23 -0700 Subject: [PATCH 12/13] Update Jobs_Resume.json --- .../preview/2024-08-02-preview/examples/Jobs_Resume.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json index 91b2181d0b40..a7fee5eac481 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/examples/Jobs_Resume.json @@ -15,7 +15,7 @@ "location": "East US", "properties": { "provisioningState": "Succeeded", - "runningState": "Running", + "runningState": "Active", "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "configuration": { "replicaTimeout": 10, From d12716910791839cfd896cb8e6cdd9efca8b5ab9 Mon Sep 17 00:00:00 2001 From: bgashirabake <85650284+bgashirabake@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:26:46 -0700 Subject: [PATCH 13/13] fix JobName parameter --- .../preview/2024-08-02-preview/Jobs.json | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json index a5ede1526f12..fd812c28299a 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-08-02-preview/Jobs.json @@ -644,12 +644,7 @@ "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "name": "jobName", - "in": "path", - "description": "Name of the Job.", - "required": true, - "type": "string", - "pattern": "^[-\\w\\._\\(\\)]+$" + "$ref": "#/parameters/JobNameParameter" } ], "responses": { @@ -706,12 +701,7 @@ "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "name": "jobName", - "in": "path", - "description": "Name of the Job.", - "required": true, - "type": "string", - "pattern": "^[-\\w\\._\\(\\)]+$" + "$ref": "#/parameters/JobNameParameter" } ], "responses": {