From 2c8c41c77dcabd5b1b9f6d28a1e0268b42951867 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 15:44:54 -0800 Subject: [PATCH 1/9] Remove AppState property as we decided to postpone it --- .../stable/2022-10-01/ContainerApps.json | 12 ------------ .../examples/ContainerApps_CreateOrUpdate.json | 3 --- .../2022-10-01/examples/ContainerApps_Get.json | 1 - .../examples/ContainerApps_ListByResourceGroup.json | 1 - .../examples/ContainerApps_ListBySubscription.json | 1 - .../2022-10-01/examples/ContainerApps_Patch.json | 1 - .../ContainerApps_TcpApp_CreateOrUpdate.json | 2 -- 7 files changed, 21 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json index 9d1269f9f26f..689a27c4c73f 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json @@ -569,18 +569,6 @@ "$ref": "./CommonDefinitions.json#/definitions/WorkloadProfileType", "description": "Workload profile type to pin for container app execution." }, - "appState": { - "description": "Current state of the app. Controls if the app is enabled or disabled.", - "enum": [ - "Enabled", - "Disabled" - ], - "type": "string", - "x-ms-enum": { - "name": "AppState", - "modelAsString": true - } - }, "latestRevisionName": { "description": "Name of the latest revision of the Container App.", "type": "string", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_CreateOrUpdate.json index 6fefb87ed3b5..cb8ae00de3af 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_CreateOrUpdate.json @@ -9,7 +9,6 @@ "properties": { "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileType": "GeneralPurpose", - "appState": "Enabled", "configuration": { "ingress": { "external": true, @@ -131,7 +130,6 @@ "provisioningState": "Succeeded", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileType": "GeneralPurpose", - "appState": "Enabled", "latestRevisionName": "testcontainerApp0-pjxhsye", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", @@ -260,7 +258,6 @@ "properties": { "provisioningState": "InProgress", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", - "appState": "Enabled", "latestRevisionName": "testcontainerApp0-pjxhsye", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Get.json index 1e2a4ca45079..70861d3dc287 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Get.json @@ -17,7 +17,6 @@ "provisioningState": "Succeeded", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileType": "GeneralPurpose", - "appState": "Enabled", "latestRevisionName": "testcontainerApp0-pjxhsye", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListByResourceGroup.json index 831a45f52ac0..640b3d5750fd 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListByResourceGroup.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileType": "GeneralPurpose", - "appState": "Enabled", "latestRevisionName": "testcontainerApp0-pjxhsye", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListBySubscription.json index 028362e71287..2b49b3a392a9 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_ListBySubscription.json @@ -17,7 +17,6 @@ "provisioningState": "Succeeded", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "workloadProfileType": "GeneralPurpose", - "appState": "Enabled", "latestRevisionName": "testcontainerApp0-pjxhsye", "latestReadyRevisionName": "testcontainerApp0-pjxhsye", "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json index 0e55844e31a8..3baaea00cade 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json @@ -11,7 +11,6 @@ "tag2": "value2" }, "properties": { - "appState": "Enabled", "configuration": { "ingress": { "external": true, diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_TcpApp_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_TcpApp_CreateOrUpdate.json index fe0b7d1a956a..4651848141ae 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_TcpApp_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_TcpApp_CreateOrUpdate.json @@ -68,7 +68,6 @@ "properties": { "provisioningState": "Succeeded", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", - "appState": "Enabled", "latestRevisionName": "testcontainerAppTcp-pjxhsye", "latestReadyRevisionName": "testcontainerAppTcp-pjxhsye", "latestRevisionFqdn": "testcontainerAppTcp-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", @@ -140,7 +139,6 @@ "properties": { "provisioningState": "InProgress", "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", - "appState": "Enabled", "latestRevisionName": "testcontainerAppTcp-pjxhsye", "latestReadyRevisionName": "testcontainerAppTcp-pjxhsye", "latestRevisionFqdn": "testcontainerAppTcp-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io", From e2fcbdd57a6f83a8f350b6cbc22b079e97b716a8 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:00:48 -0800 Subject: [PATCH 2/9] Fix swagger issues --- .../Microsoft.App/stable/2022-10-01/CommonDefinitions.json | 3 ++- .../Microsoft.App/stable/2022-10-01/ContainerApps.json | 2 +- .../stable/2022-10-01/examples/Revisions_Get.json | 2 +- .../stable/2022-10-01/examples/Revisions_List.json | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json index 89bd10a6cf4a..db5a9c92a5e0 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json @@ -485,7 +485,8 @@ "maxReplicas": { "format": "int32", "description": "Optional. Maximum number of container replicas. Defaults to 10 if not set.", - "type": "integer" + "type": "integer", + "default": 10 }, "rules": { "description": "Scaling rules.", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json index 689a27c4c73f..b61531bbf4f3 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json @@ -597,7 +597,7 @@ "$ref": "./CommonDefinitions.json#/definitions/Template", "description": "Container App versioned application definition." }, - "outboundIPAddresses": { + "outboundIpAddresses": { "description": "Outbound IP Addresses for container app.", "type": "array", "items": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json index a0bacc0e6974..b21ff9df3670 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", "revisionName": "testcontainerApp0-pjxhsye", - "api-version": "2021-02-01" + "api-version": "2021-10-01" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json index 3d324514a55e..93378b49d635 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json @@ -3,7 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", - "api-version": "2021-02-01" + "api-version": "2021-10-01" }, "responses": { "200": { From 39d9d703af95a24b9804824edc40f105fc06e653 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:02:49 -0800 Subject: [PATCH 3/9] fix swagger issues --- .../preview/2022-11-01-preview/CommonDefinitions.json | 3 ++- .../preview/2022-11-01-preview/ContainerApps.json | 2 +- .../preview/2022-11-01-preview/examples/Replicas_List.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/CommonDefinitions.json index afcc586e4211..61691ef618f9 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/CommonDefinitions.json @@ -484,7 +484,8 @@ "maxReplicas": { "format": "int32", "description": "Optional. Maximum number of container replicas. Defaults to 10 if not set.", - "type": "integer" + "type": "integer", + "default": 10 }, "rules": { "description": "Scaling rules.", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json index 089fb59476e5..6e3007da3d17 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json @@ -591,7 +591,7 @@ "$ref": "./CommonDefinitions.json#/definitions/Template", "description": "Container App versioned application definition." }, - "outboundIPAddresses": { + "outboundIpAddresses": { "description": "Outbound IP Addresses for container app.", "type": "array", "items": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json index 6ffc39c95e79..6645234f8d0e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json @@ -4,7 +4,7 @@ "resourceGroupName": "workerapps-rg-xj", "containerAppName": "myapp", "revisionName": "myapp--0wlqy09", - "api-version": "2021-02-01" + "api-version": "2021-11-01-preview" }, "responses": { "200": { From f3631e968a5cdb57932d0b61782a402f6fd67cbd Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:19:28 -0800 Subject: [PATCH 4/9] More swagger fixes --- .../Microsoft.App/stable/2022-10-01/examples/Replicas_List.json | 2 +- .../Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json | 2 +- .../stable/2022-10-01/examples/Revisions_List.json | 2 +- .../stable/2022-10-01/examples/Revisions_Restart.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Replicas_List.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Replicas_List.json index 6ffc39c95e79..d93445c15189 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Replicas_List.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Replicas_List.json @@ -4,7 +4,7 @@ "resourceGroupName": "workerapps-rg-xj", "containerAppName": "myapp", "revisionName": "myapp--0wlqy09", - "api-version": "2021-02-01" + "api-version": "2022-10-01" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json index b21ff9df3670..1bffbedc06f4 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Get.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", "revisionName": "testcontainerApp0-pjxhsye", - "api-version": "2021-10-01" + "api-version": "2022-10-01" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json index 93378b49d635..3d22fdaa0437 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_List.json @@ -3,7 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", - "api-version": "2021-10-01" + "api-version": "2022-10-01" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Restart.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Restart.json index 3336c0109c26..58d93c970231 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Restart.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Revisions_Restart.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg", "containerAppName": "testStaticSite0", "revisionName": "testcontainerApp0-pjxhsye", - "api-version": "2021-02-01" + "api-version": "2022-10-01" }, "responses": { "200": {} From 5dc43bf5551f150e90730c49755b2212a90d4ef3 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:21:25 -0800 Subject: [PATCH 5/9] Swagger fixes --- .../preview/2022-11-01-preview/examples/Revisions_Get.json | 2 +- .../preview/2022-11-01-preview/examples/Revisions_List.json | 2 +- .../preview/2022-11-01-preview/examples/Revisions_Restart.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Get.json index a0bacc0e6974..c2a175dc47b5 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Get.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", "revisionName": "testcontainerApp0-pjxhsye", - "api-version": "2021-02-01" + "api-version": "2022-11-01-preview" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_List.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_List.json index 3d324514a55e..80b630a4faf3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_List.json @@ -3,7 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", - "api-version": "2021-02-01" + "api-version": "2022-11-01-preview" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Restart.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Restart.json index 3336c0109c26..36456f1b613c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Restart.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Revisions_Restart.json @@ -4,7 +4,7 @@ "resourceGroupName": "rg", "containerAppName": "testStaticSite0", "revisionName": "testcontainerApp0-pjxhsye", - "api-version": "2021-02-01" + "api-version": "2022-11-01-preview" }, "responses": { "200": {} From 92fed37ea61de419acde34a26f83e38f4aad31cf Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:23:22 -0800 Subject: [PATCH 6/9] additional fix --- .../preview/2022-11-01-preview/examples/Replicas_List.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json index 6645234f8d0e..1e4416b83b01 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/Replicas_List.json @@ -4,7 +4,7 @@ "resourceGroupName": "workerapps-rg-xj", "containerAppName": "myapp", "revisionName": "myapp--0wlqy09", - "api-version": "2021-11-01-preview" + "api-version": "2022-11-01-preview" }, "responses": { "200": { From 09db6b29a5cd60b2f1c559b0f168e2f739faf0a0 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:36:07 -0800 Subject: [PATCH 7/9] Even more swagger fixes - where does this come from? --- .../preview/2022-11-01-preview/ContainerApps.json | 9 +++++++-- .../2022-10-01/examples/ContainerApps_GetAuthToken.json | 2 +- .../examples/ManagedEnvironments_GetAuthToken.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json index 6e3007da3d17..c54103b85ab2 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ContainerApps.json @@ -482,6 +482,7 @@ "Single" ], "type": "string", + "default": "Single", "x-ms-enum": { "name": "ActiveRevisionsMode", "modelAsString": true @@ -636,7 +637,8 @@ "properties": { "enabled": { "description": "Boolean indicating if the Dapr side car is enabled", - "type": "boolean" + "type": "boolean", + "default": false }, "appId": { "description": "Dapr application identifier", @@ -649,6 +651,7 @@ "grpc" ], "type": "string", + "default": "http", "x-ms-enum": { "name": "appProtocol", "modelAsString": true @@ -722,6 +725,7 @@ "tcp" ], "type": "string", + "default": "auto", "x-ms-enum": { "name": "IngressTransportMethod", "modelAsString": true @@ -749,7 +753,8 @@ }, "allowInsecure": { "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", - "type": "boolean" + "type": "boolean", + "default": false }, "ipSecurityRestrictions": { "description": "Rules to restrict incoming IP address.", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_GetAuthToken.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_GetAuthToken.json index fa97ef8fb0f4..d48ff3122df0 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_GetAuthToken.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_GetAuthToken.json @@ -3,7 +3,7 @@ "subscriptionId": "651f8027-33e8-4ec4-97b4-f6e9f3dc8744", "resourceGroupName": "rg", "containerAppName": "testcontainerApp0", - "api-version": "2022-05-01" + "api-version": "2022-10-01" }, "responses": { "200": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json index a1c56f9c4ddc..6fc48f186bfa 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json @@ -3,7 +3,7 @@ "subscriptionId": "651f8027-33e8-4ec4-97b4-f6e9f3dc8744", "resourceGroupName": "rg", "environmentName": "testenv", - "api-version": "2022-05-01" + "api-version": "2022-10-01" }, "responses": { "200": { From 588047bea67aa697b1382cffb910c9ed8cf34138 Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:46:00 -0800 Subject: [PATCH 8/9] Fix other swagger issues --- .../stable/2022-10-01/examples/Certificate_CreateOrUpdate.json | 2 +- .../examples/ManagedEnvironments_CreateOrUpdate.json | 2 +- .../2022-10-01/examples/ManagedEnvironments_GetAuthToken.json | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Certificate_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Certificate_CreateOrUpdate.json index 3acfe6c97d0d..785fffe842af 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Certificate_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/Certificate_CreateOrUpdate.json @@ -9,7 +9,7 @@ "location": "East US", "properties": { "password": "private key password", - "value": "PFX-or-PEM-blob" + "value": "Y2VydA==" } } }, diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json index df0dbbf614bc..a245bb269164 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json @@ -26,7 +26,7 @@ }, "customDomainConfiguration": { "dnsSuffix": "www.my-name.com", - "certificateValue": "PFX-or-PEM-blob", + "certificateValue": "Y2VydA==", "certificatePassword": "private key password" }, "workloadProfiles": [ diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json index 6fc48f186bfa..3196566b1c32 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_GetAuthToken.json @@ -18,7 +18,6 @@ "expires": "2022-07-14T19:22:50.3080223Z" } } - }, - "404": {} + } } } From 483f876feb4c77601074346c6418163ac3f2130e Mon Sep 17 00:00:00 2001 From: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Date: Wed, 9 Nov 2022 14:02:47 -0800 Subject: [PATCH 9/9] fixing remaining swagger issues --- .../examples/ManagedEnvironments_CreateOrUpdate.json | 2 +- .../examples/ManagedEnvironments_CreateOrUpdate.json | 2 +- .../2022-10-01/examples/ManagedEnvironments_Delete.json | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json index d341d61a73ba..678f848b50d0 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json @@ -27,7 +27,7 @@ "customDomainConfiguration": { "dnsSuffix": "www.my-name.com", "certificateValue": "Y2VydA==", - "certificatePassword": "private key password" + "certificatePassword": "Y2VydA==" }, "workloadProfiles": [ { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json index a245bb269164..a5c4e51f60d2 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json @@ -27,7 +27,7 @@ "customDomainConfiguration": { "dnsSuffix": "www.my-name.com", "certificateValue": "Y2VydA==", - "certificatePassword": "private key password" + "certificatePassword": "Y2VydA==" }, "workloadProfiles": [ { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Delete.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Delete.json index 1ef67935bf55..e8f266f85765 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Delete.json @@ -8,7 +8,11 @@ }, "responses": { "200": {}, - "202": {}, + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/localtions/eastus/operationResults/00000" + } + }, "204": {} } }