Fix arm review comments for container app (#26455)

* update * update * update
Azure · Oct 31, 2023 · 0f27d3a · 0f27d3a
1 parent 5574619
commit 0f27d3a
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 13 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
@@ -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
@@ -216,9 +216,6 @@
           }
         ],
         "responses": {
-          "200": {
-            "description": "Resource deleted successfully."
-          },
           "202": {
             "description": "Resource deletion accepted.",
             "headers": {

diff --git a/...tion/app/resource-manager/Microsoft.App/preview/2023-08-01-preview/CommonDefinitions.json b/...tion/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/...anager/Microsoft.App/preview/2023-08-01-preview/ManagedEnvironmentsDaprSubscriptions.json b/...anager/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",

diff --git a/...p/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builders_Delete.json b/...p/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}"

diff --git a/...app/resource-manager/Microsoft.App/preview/2023-08-01-preview/examples/Builds_Delete.json b/...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/.../2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_BulkSubscribeAndScopes.json b/.../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/...pp/preview/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_DefaultRoute.json b/...pp/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/...w/2023-08-01-preview/examples/DaprSubscriptions_CreateOrUpdate_RouteRulesAndMetadata.json b/...w/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"
+          }
+        }
+      }
     }
   }
 }