From 526fa0568d9ea377ebd22cef00efe238559a7f72 Mon Sep 17 00:00:00 2001 From: Michimune Kohno Date: Thu, 26 Oct 2023 11:35:45 -0700 Subject: [PATCH 1/5] Fix SDK build error for Microsoft.App --- .../preview/2023-08-01-preview/Diagnostics.json | 10 +--------- .../2023-08-01-preview/examples/Job_ProxyGet.json | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json index 636065640104..69688a3c1d6a 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json @@ -529,7 +529,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/{apiName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi": { "get": { "tags": [ "Jobs", @@ -548,14 +548,6 @@ { "$ref": "./Jobs.json#/parameters/JobNameParameter" }, - { - "name": "apiName", - "in": "path", - "description": "Proxy API Name for Container App Job.", - "required": true, - "type": "string", - "pattern": "^[-\\w\\._]+$" - }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json index 39afe14d659c..550554c4e0d1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json @@ -3,7 +3,6 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "jobName": "testcontainerAppsJob0", - "apiName": "rootapi", "api-version": "2023-08-01-preview" }, "responses": { From fa6ef4ae54635106020ebdc199bcac9a17a3eda1 Mon Sep 17 00:00:00 2001 From: Michimune Kohno Date: Thu, 26 Oct 2023 11:49:38 -0700 Subject: [PATCH 2/5] Update --- .../Microsoft.App/preview/2023-08-01-preview/Diagnostics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json index 69688a3c1d6a..0566dbbe5c80 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json @@ -529,7 +529,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi/": { "get": { "tags": [ "Jobs", From 6e8dc3f5a0548e37da128a68d3ef9f4290322c5f Mon Sep 17 00:00:00 2001 From: Michimune Kohno Date: Thu, 26 Oct 2023 12:21:59 -0700 Subject: [PATCH 3/5] update --- .../Microsoft.App/preview/2023-08-01-preview/Diagnostics.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json index 0566dbbe5c80..7612368cddfe 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json @@ -529,13 +529,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi/": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi": { "get": { "tags": [ "Jobs", "Diagnostics" ], - "summary": "Get the properties of a Container App Job.", + "summary": "Get the properties for a given Container App Job.", "description": "Get the properties of a Container App Job.", "operationId": "Jobs_ProxyGet", "parameters": [ From 5de74887120de4fea6dd03aa263961fb06c84a3a Mon Sep 17 00:00:00 2001 From: Michimune Kohno Date: Thu, 26 Oct 2023 13:05:24 -0700 Subject: [PATCH 4/5] update --- .../preview/2023-08-01-preview/Diagnostics.json | 10 +++++++++- .../2023-08-01-preview/examples/Job_ProxyGet.json | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json index 7612368cddfe..342e9b41b109 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json @@ -529,7 +529,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/rootApi": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/{apiName}": { "get": { "tags": [ "Jobs", @@ -548,6 +548,14 @@ { "$ref": "./Jobs.json#/parameters/JobNameParameter" }, + { + "name": "apiName", + "in": "path", + "description": "Proxy API Name for Container App Job.", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._]+$" + }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json index 550554c4e0d1..39afe14d659c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyGet.json @@ -3,6 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "jobName": "testcontainerAppsJob0", + "apiName": "rootapi", "api-version": "2023-08-01-preview" }, "responses": { From 03c3c75aa2bf98a67b28263b6ee9aa4b7a566215 Mon Sep 17 00:00:00 2001 From: Michimune Kohno Date: Thu, 26 Oct 2023 13:57:44 -0700 Subject: [PATCH 5/5] update --- .../2023-08-01-preview/Diagnostics.json | 44 ++++++++++++++ .../examples/Job_ProxyList.json | 59 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyList.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json index 342e9b41b109..a86753410804 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Diagnostics.json @@ -529,6 +529,50 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/": { + "get": { + "tags": [ + "Jobs", + "Diagnostics" + ], + "summary": "Get the list of proxy properties for a given Container App Job.", + "description": "Get the proxy properties of a Container App Job.", + "operationId": "Jobs_ProxyList", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "./Jobs.json#/parameters/JobNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "./Jobs.json#/definitions/JobsCollection" + } + }, + "default": { + "description": "Common error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Container App Job by name": { + "$ref": "./examples/Job_ProxyList.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/jobs/{jobName}/detectorProperties/{apiName}": { "get": { "tags": [ diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyList.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyList.json new file mode 100644 index 000000000000..7ae9b2ea9313 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Job_ProxyList.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "rg", + "jobName": "testcontainerAppsJob0", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/jobs/testcontainerAppsJob0/detectorproperties/rootApi", + "name": "testcontainerAppsJob0", + "type": "Microsoft.App/jobs", + "location": "East US", + "properties": { + "provisioningState": "Succeeded", + "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" + }, + "template": { + "containers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + } + } + ], + "initContainers": [ + { + "image": "repo/testcontainerAppsJob0:v4", + "name": "testinitcontainerAppsJob0", + "resources": { + "cpu": 0.2, + "memory": "100Mi" + } + } + ] + } + } + } + ], + "nextLink": null + } + } + } +}