From ca893ea3a9b0e31cf837c19d5ad9883ff0187e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruslan=20Yakushev=20=F0=9F=9A=B4?= <1664475+ruslany@users.noreply.github.com> Date: Thu, 3 Mar 2022 16:17:07 -0800 Subject: [PATCH 1/2] Move dapr section from template to configuration --- .../2022-01-01-preview/CommonDefinitions.json | 35 ------------------- .../2022-01-01-preview/ContainerApps.json | 35 +++++++++++++++++++ .../ContainerApps_CreateOrUpdate.json | 10 +++--- .../examples/ContainerApps_Get.json | 10 +++--- .../ContainerApps_ListByResourceGroup.json | 10 +++--- .../ContainerApps_ListBySubscription.json | 10 +++--- .../examples/ContainerApps_Patch.json | 10 +++--- 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json index 7e4e9f66156d..d74fb9991175 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json @@ -261,37 +261,6 @@ } } }, - "Dapr": { - "description": "Container App Dapr configuration.", - "type": "object", - "properties": { - "enabled": { - "description": "Boolean indicating if the Dapr side car is enabled", - "type": "boolean" - }, - "appId": { - "description": "Dapr application identifier", - "type": "string" - }, - "appProtocol": { - "description": "Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http", - "enum": [ - "http", - "grpc" - ], - "type": "string", - "x-ms-enum": { - "name": "appProtocol", - "modelAsString": true - } - }, - "appPort": { - "format": "int32", - "description": "Tells Dapr which port your application is listening on", - "type": "integer" - } - } - }, "DefaultErrorResponse": { "description": "App Service error response.", "type": "object", @@ -505,10 +474,6 @@ "$ref": "#/definitions/Scale", "description": "Scaling properties for the Container App." }, - "dapr": { - "$ref": "#/definitions/Dapr", - "description": "Dapr configuration for the Container App." - }, "volumes": { "description": "List of volume definitions for the Container App.", "type": "array", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json index 0f86a1895e9f..3b39e35bb4d5 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json @@ -449,6 +449,10 @@ "x-ms-identifiers": [ "server" ] + }, + "dapr": { + "$ref": "#/definitions/Dapr", + "description": "Dapr configuration for the Container App." } } }, @@ -562,6 +566,37 @@ } } }, + "Dapr": { + "description": "Container App Dapr configuration.", + "type": "object", + "properties": { + "enabled": { + "description": "Boolean indicating if the Dapr side car is enabled", + "type": "boolean" + }, + "appId": { + "description": "Dapr application identifier", + "type": "string" + }, + "appProtocol": { + "description": "Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http", + "enum": [ + "http", + "grpc" + ], + "type": "string", + "x-ms-enum": { + "name": "appProtocol", + "modelAsString": true + } + }, + "appPort": { + "format": "int32", + "description": "Tells Dapr which port your application is listening on", + "type": "integer" + } + } + }, "Ingress": { "description": "Container App Ingress configuration.", "type": "object", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json index 4886fba51996..ce9179f1aeec 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -24,6 +24,11 @@ "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com" } ] + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -64,11 +69,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json index 7f3df32bdb0f..71afe563ddb9 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json @@ -35,6 +35,11 @@ "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com" } ] + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -61,11 +66,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json index 2f86e8bcaae6..2469e1ed62a7 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json @@ -36,6 +36,11 @@ "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com" } ] + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -62,11 +67,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json index 1ef7041b3573..82e0e4447180 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json @@ -35,6 +35,11 @@ "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com" } ] + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -61,11 +66,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json index 6f94668279ec..2646a946d4ca 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json @@ -33,6 +33,11 @@ "external": true, "targetPort": 3000, "transport": "auto" + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "grpc" } }, "template": { @@ -59,11 +64,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "grpc" } } } From 1f2c5b140213daf825dad2a9be58ab87b39af2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruslan=20Yakushev=20=F0=9F=9A=B4?= <1664475+ruslany@users.noreply.github.com> Date: Thu, 3 Mar 2022 16:26:51 -0800 Subject: [PATCH 2/2] Fix samples --- .../ContainerApps_CreateOrUpdate.json | 20 +++++++++---------- .../examples/Revisions_Get.json | 4 ---- .../examples/Revisions_List.json | 4 ---- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json index ce9179f1aeec..a3361fe80a45 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -104,6 +104,11 @@ "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com" } ] + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -147,11 +152,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } @@ -174,6 +174,11 @@ "external": true, "targetPort": 3000, "transport": "auto" + }, + "dapr": { + "enabled": true, + "appPort": 3000, + "appProtocol": "http" } }, "template": { @@ -217,11 +222,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000, - "appProtocol": "http" } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_Get.json index 8c423c2a605a..3092e525c708 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_Get.json @@ -40,10 +40,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000 } }, "active": true, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_List.json b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_List.json index 29ccd646b6ec..aed17be62c3c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_List.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_List.json @@ -41,10 +41,6 @@ } } ] - }, - "dapr": { - "enabled": true, - "appPort": 3000 } }, "active": true,