From 152109eb48f2e677b3c6d4dbd40a94e49bd6f410 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Mon, 30 Oct 2023 17:52:15 +0800 Subject: [PATCH 1/3] update --- .../preview/2023-08-01-preview/Builders.json | 3 --- .../preview/2023-08-01-preview/Builds.json | 3 --- .../2023-08-01-preview/CommonDefinitions.json | 2 +- .../ManagedEnvironmentsDaprSubscriptions.json | 18 ++++++++++++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builders.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builders.json index 317957197a4f..2603efdfe288 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builders.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builders.json @@ -301,9 +301,6 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builds.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builds.json index 43ded0e50cc3..03d905541183 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builds.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/Builds.json @@ -216,9 +216,6 @@ } ], "responses": { - "200": { - "description": "Resource deleted successfully." - }, "202": { "description": "Resource deletion accepted.", "headers": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json index cbacf609553e..454f0ebbf119 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json @@ -790,7 +790,7 @@ "items": { "$ref": "#/definitions/DaprComponentServiceBinding" }, - "x-ms-identifier": [ + "x-ms-identifiers": [ "name" ] } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json index 80bacf36e2dd..b8e3432beb61 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json @@ -34,7 +34,8 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" @@ -83,7 +84,8 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", @@ -141,7 +143,8 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", @@ -170,6 +173,12 @@ "$ref": "./CommonDefinitions.json#/definitions/DaprSubscription" } }, + "201": { + "description": "Created", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DaprSubscription" + } + }, "default": { "description": "Common error response.", "schema": { @@ -209,7 +218,8 @@ "in": "path", "description": "Name of the Managed Environment.", "required": true, - "type": "string" + "type": "string", + "pattern": "^[-\\w\\._\\(\\)]+$" }, { "name": "name", From 0710807a367f9d0c0a5aaf3b58a7f08daff40e7a Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Mon, 30 Oct 2023 18:04:29 +0800 Subject: [PATCH 2/3] update --- .../examples/Builds_Delete.json | 1 - ...CreateOrUpdate_BulkSubscribeAndScopes.json | 24 ++++++++++++++++ ...criptions_CreateOrUpdate_DefaultRoute.json | 15 ++++++++++ ..._CreateOrUpdate_RouteRulesAndMetadata.json | 28 +++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builds_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builds_Delete.json index 3f2f1cc09837..c1c1b1df45af 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builds_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builds_Delete.json @@ -9,7 +9,6 @@ "buildName": "testBuild" }, "responses": { - "200": {}, "202": { "headers": { "Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}" diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_BulkSubscribeAndScopes.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_BulkSubscribeAndScopes.json index 4016bf77ce1d..29585f457b0d 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_BulkSubscribeAndScopes.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_BulkSubscribeAndScopes.json @@ -48,6 +48,30 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprSubscriptions/mysubscription", + "name": "mysubscription", + "type": "Microsoft.App/managedEnvironments/daprSubscriptions", + "properties": { + "pubsubName": "mypubsubcomponent", + "topic": "inventory", + "routes": { + "rules": [], + "default": "/products" + }, + "scopes": [ + "warehouseapp", + "customersupportapp" + ], + "bulkSubscribe": { + "enabled": true, + "maxMessagesCount": 123, + "maxAwaitDurationMs": 500 + } + } + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_DefaultRoute.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_DefaultRoute.json index c604df1162f4..7e39dcabdcb0 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_DefaultRoute.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_DefaultRoute.json @@ -30,6 +30,21 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprSubscriptions/mysubscription", + "name": "mysubscription", + "type": "Microsoft.App/managedEnvironments/daprSubscriptions", + "properties": { + "pubsubName": "mypubsubcomponent", + "topic": "inventory", + "routes": { + "rules": [], + "default": "/products" + } + } + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_RouteRulesAndMetadata.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_RouteRulesAndMetadata.json index f4e609751c06..538bae5f8fbf 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_RouteRulesAndMetadata.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_RouteRulesAndMetadata.json @@ -57,6 +57,34 @@ } } } + }, + "201": { + "body": { + "id": "/subscriptions/8efdecc5-919e-44eb-b179-915dca89ebf9/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/myenvironment/daprSubscriptions/mysubscription", + "name": "mysubscription", + "type": "Microsoft.App/managedEnvironments/daprSubscriptions", + "properties": { + "pubsubName": "mypubsubcomponent", + "topic": "inventory", + "routes": { + "rules": [ + { + "match": "event.type == 'widget'", + "path": "/widgets" + }, + { + "match": "event.type == 'gadget'", + "path": "/gadgets" + } + ], + "default": "/products" + }, + "metadata": { + "foo": "bar", + "hello": "world" + } + } + } } } } From 0ad3763deafd1ecd3808a9cc60a54a33b70cb0f4 Mon Sep 17 00:00:00 2001 From: Juliehzl Date: Mon, 30 Oct 2023 18:15:14 +0800 Subject: [PATCH 3/3] update --- .../preview/2023-08-01-preview/examples/Builders_Delete.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builders_Delete.json b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builders_Delete.json index 2b904ad4d936..a771dca6d009 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builders_Delete.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builders_Delete.json @@ -8,7 +8,6 @@ "builderName": "testBuilder" }, "responses": { - "200": {}, "202": { "headers": { "Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"