From 46e7cb806de5be261cb41120f39d6315178407d6 Mon Sep 17 00:00:00 2001 From: Zhenyu Zhou Date: Sat, 10 Oct 2020 15:56:24 +0800 Subject: [PATCH 1/3] Add networkProperties and clusterId --- .../stable/2018-06-01-preview/cluster.json | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json index 05f4f744581d..516e14142c29 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json @@ -1011,6 +1011,35 @@ }, "description": "The storage profile." }, + "NetworkProperties": { + "description": "The network properties.", + "properties": { + "resourceProviderConnection": { + "type": "string", + "description": "The direction for the resource provider connection.", + "enum": [ + "Inbound", + "Outbound" + ], + "x-ms-enum": { + "name": "ResourceProviderConnection", + "modelAsString": true + } + }, + "privateLink": { + "type": "string", + "description": "Indicates whether or not private link is enabled.", + "enum": [ + "Disabled", + "Enabled" + ], + "x-ms-enum": { + "name": "PrivateLink", + "modelAsString": true + } + } + } + }, "ClusterCreateProperties": { "description": "The cluster create parameters.", "properties": { @@ -1073,6 +1102,10 @@ "minSupportedTlsVersion": { "type": "string", "description": "The minimal supported tls version." + }, + "networkProperties": { + "$ref": "#/definitions/NetworkProperties", + "description": "The network properties." } } }, @@ -1189,6 +1222,10 @@ "modelAsString": false } }, + "clusterId": { + "type": "string", + "description": "The cluster id." + }, "clusterDefinition": { "$ref": "#/definitions/ClusterDefinition", "description": "The cluster definition." @@ -1257,6 +1294,10 @@ "minSupportedTlsVersion": { "type": "string", "description": "The minimal supported tls version." + }, + "networkProperties": { + "$ref": "#/definitions/NetworkProperties", + "description": "The network properties." } }, "required": [ From 45ed9ad89b68b15a00fd47ac7546850cd99ee46f Mon Sep 17 00:00:00 2001 From: Zhenyu Zhou Date: Tue, 9 Mar 2021 19:49:22 +0800 Subject: [PATCH 2/3] Fixed round trip errors --- .../2015-03-01-preview/applications.json | 6 +++- .../preview/2015-03-01-preview/cluster.json | 36 +++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json index b04f8c795d6d..eb5dbbd22354 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json @@ -320,7 +320,11 @@ }, "disableGatewayAuth": { "type": "boolean", - "description": "The value indicates whether to disable GatewayAuth." + "description": "The value indicates whether to disable GatewayAuth.", + "x-ms-mutability": [ + "create", + "update" + ] } } }, diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json index 1e45acaf0898..b8807daab605 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json @@ -756,7 +756,11 @@ "additionalProperties": { "type": "string" }, - "description": "The versions of different services in the cluster." + "description": "The versions of different services in the cluster.", + "x-ms-mutability": [ + "create", + "read" + ] }, "configurations": { "type": "object", @@ -814,7 +818,11 @@ }, "organizationalUnitDN": { "type": "string", - "description": "The organizational unit within the Active Directory to place the cluster and service accounts." + "description": "The organizational unit within the Active Directory to place the cluster and service accounts.", + "x-ms-mutability": [ + "create", + "read" + ] }, "ldapsUrls": { "type": "array", @@ -1060,7 +1068,11 @@ }, "VMGroupName": { "type": "string", - "description": "The name of the virtual machine group." + "description": "The name of the virtual machine group.", + "x-ms-mutability": [ + "create", + "read" + ] }, "autoscale": { "$ref": "#/definitions/Autoscale", @@ -1214,7 +1226,8 @@ "properties": { "enableComputeIsolation": { "type": "boolean", - "description": "The flag indicates whether enable compute isolation or not." + "description": "The flag indicates whether enable compute isolation or not.", + "default": false }, "hostSku": { "type": "string", @@ -1252,7 +1265,11 @@ "name": "Tier", "modelAsString": false }, - "default": "Standard" + "default": "Standard", + "x-ms-mutability": [ + "create", + "read" + ] }, "clusterDefinition": { "$ref": "#/definitions/ClusterDefinition", @@ -1545,7 +1562,11 @@ }, "parameters": { "type": "string", - "description": "The parameters for the script" + "description": "The parameters for the script", + "x-ms-mutability": [ + "create", + "update" + ] }, "roles": { "type": "array", @@ -1809,7 +1830,8 @@ "x-ms-enum": { "name": "JsonWebKeyEncryptionAlgorithm", "modelAsString": true - } + }, + "default": "RSA-OAEP" }, "msiResourceId": { "type": "string", From 77b360fea01b793fd3bd6d4d8553bafa7dd5c43c Mon Sep 17 00:00:00 2001 From: Zhenyu Zhou Date: Wed, 10 Mar 2021 14:13:25 +0800 Subject: [PATCH 3/3] remove default value because it is breaking change --- .../preview/2015-03-01-preview/applications.json | 6 +++++- .../preview/2015-03-01-preview/cluster.json | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json index eb5dbbd22354..48d77d8eb259 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/applications.json @@ -316,7 +316,11 @@ }, "subDomainSuffix": { "type": "string", - "description": "The subdomain suffix of the application." + "description": "The subdomain suffix of the application.", + "x-ms-mutability": [ + "create", + "update" + ] }, "disableGatewayAuth": { "type": "boolean", diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json index b8807daab605..22124535f830 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/cluster.json @@ -1227,7 +1227,10 @@ "enableComputeIsolation": { "type": "boolean", "description": "The flag indicates whether enable compute isolation or not.", - "default": false + "x-ms-mutability": [ + "create", + "read" + ] }, "hostSku": { "type": "string", @@ -1831,7 +1834,10 @@ "name": "JsonWebKeyEncryptionAlgorithm", "modelAsString": true }, - "default": "RSA-OAEP" + "x-ms-mutability": [ + "create", + "read" + ] }, "msiResourceId": { "type": "string",