Fix violated rule R2026 for 2022-02-01 managedCluster swagger (#18024)

* fix allof * add missing type
Azure · Mar 4, 2022 · 25beca3 · 25beca3
1 parent 838de69
commit 25beca3
Showing 1 changed file with 25 additions and 28 deletions.
diff --git a/...ervice/resource-manager/Microsoft.ContainerService/stable/2022-02-01/managedClusters.json b/...ervice/resource-manager/Microsoft.ContainerService/stable/2022-02-01/managedClusters.json
@@ -2810,21 +2810,20 @@
       "description": "Properties for the container service agent pool profile."
     },
     "ManagedClusterAgentPoolProfile": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties"
-        },
-        {
-          "properties": {
-            "name": {
-              "type": "string",
-              "title": "Unique name of the agent pool profile in the context of the subscription and resource group.",
-              "description": "Windows agent pool names must be 6 characters or less.",
-              "pattern": "^[a-z][a-z0-9]{0,11}$"
-            }
-          }
         }
       ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "Unique name of the agent pool profile in the context of the subscription and resource group.",
+          "description": "Windows agent pool names must be 6 characters or less.",
+          "pattern": "^[a-z][a-z0-9]{0,11}$"
+        }
+      },
       "required": [
         "name"
       ],
@@ -2903,20 +2902,19 @@
       "description": "Settings for upgrading an agentpool"
     },
     "AgentPool": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/SubResource"
-        },
-        {
-          "properties": {
-            "properties": {
-              "description": "Properties of an agent pool.",
-              "$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties",
-              "x-ms-client-flatten": true
-            }
-          }
         }
       ],
+      "properties": {
+        "properties": {
+          "description": "Properties of an agent pool.",
+          "$ref": "#/definitions/ManagedClusterAgentPoolProfileProperties",
+          "x-ms-client-flatten": true
+        }
+      },
       "description": "Agent Pool."
     },
     "ManagedClusterWindowsProfile": {
@@ -4077,20 +4075,19 @@
       "description": "Details about a user assigned identity."
     },
     "ManagedClusterAccessProfile": {
+      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/Resource"
-        },
-        {
-          "properties": {
-            "properties": {
-              "description": "AccessProfile of a managed cluster.",
-              "$ref": "#/definitions/AccessProfile",
-              "x-ms-client-flatten": true
-            }
-          }
         }
       ],
+      "properties": {
+        "properties": {
+          "description": "AccessProfile of a managed cluster.",
+          "$ref": "#/definitions/AccessProfile",
+          "x-ms-client-flatten": true
+        }
+      },
       "description": "Managed cluster Access Profile.",
       "x-ms-azure-resource": false
     },