From faab603585f58c27a7646a96a8dc56aedd1300ee Mon Sep 17 00:00:00 2001 From: Fuming Zhang Date: Wed, 2 Mar 2022 17:21:52 +0800 Subject: [PATCH] remove nested property in allOf for 2022-02-02-preview managedClusters --- .../2022-02-02-preview/managedClusters.json | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-02-02-preview/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-02-02-preview/managedClusters.json index 0dcc15ac3f2f..2d09f1c3edb7 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-02-02-preview/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/preview/2022-02-02-preview/managedClusters.json @@ -3109,21 +3109,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" ], @@ -3202,20 +3201,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": { @@ -4317,20 +4315,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 },