From c8afc7402e3cd05564287fbd7476aa8d3ee17a5e Mon Sep 17 00:00:00 2001 From: aim-for-better Date: Wed, 20 Jan 2021 15:14:53 +0800 Subject: [PATCH] [Fix broken S360 Issues][HDInsight] Fix S360 issues batch2 (#12493) * Add networkProperties and clusterId * Add display.description and properties of operation. Fix DeletionOperationResponse linting error Add privateIPAddress in ConnectivityEndpoints and ApplicationGetEndpoints * Fix model validation error: update example Co-authored-by: Zhenyu Zhou --- .../2018-06-01-preview/applications.json | 7 + .../stable/2018-06-01-preview/cluster.json | 7 + .../examples/DeleteApplication.json | 3 +- .../examples/DeleteExtension.json | 3 +- .../examples/DeleteLinuxHadoopCluster.json | 3 +- .../examples/DeleteScriptAction.json | 3 +- .../DisableLinuxClusterMonitoring.json | 3 +- .../stable/2018-06-01-preview/extensions.json | 6 + .../stable/2018-06-01-preview/operations.json | 136 ++++++++++++++++++ .../2018-06-01-preview/scriptActions.json | 3 + 10 files changed, 169 insertions(+), 5 deletions(-) diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/applications.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/applications.json index 979c1460aff0..a05f36080591 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/applications.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/applications.json @@ -219,6 +219,9 @@ }, "202": { "description": "Accepted response definition." + }, + "204": { + "description": "No Content response definition." } }, "x-ms-long-running-operation": true @@ -278,6 +281,10 @@ "type": "integer", "format": "int32", "description": "The public port to connect to." + }, + "privateIPAddress": { + "type": "string", + "description": "The private ip address of the endpoint." } } }, 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 faa761d1cfb9..8054e928938e 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 @@ -204,6 +204,9 @@ }, "200": { "description": "Ok response definition." + }, + "204": { + "description": "No Content response definition." } }, "x-ms-long-running-operation": true @@ -1229,6 +1232,10 @@ "type": "integer", "format": "int32", "description": "The port to connect to." + }, + "privateIPAddress": { + "type": "string", + "description": "The private ip address of the endpoint." } } }, diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteApplication.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteApplication.json index e5f362cf1446..02b8c2b5f4e1 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteApplication.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteApplication.json @@ -12,6 +12,7 @@ "location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.HDInsight/pathToOperationResult" } }, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteExtension.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteExtension.json index 3d71713faa44..aaee2316f8a3 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteExtension.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteExtension.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteLinuxHadoopCluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteLinuxHadoopCluster.json index 157bf3cc9e65..f13d552600ba 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteLinuxHadoopCluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteLinuxHadoopCluster.json @@ -7,6 +7,7 @@ }, "responses": { "202": {}, - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteScriptAction.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteScriptAction.json index 6ab023b2ee0e..22e30232b4dd 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteScriptAction.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DeleteScriptAction.json @@ -7,6 +7,7 @@ "scriptName": "scriptName" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DisableLinuxClusterMonitoring.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DisableLinuxClusterMonitoring.json index e7dc0de12b80..e719b8fe027d 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DisableLinuxClusterMonitoring.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/DisableLinuxClusterMonitoring.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/extensions.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/extensions.json index 22a15a4640a0..afc7a3f0832d 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/extensions.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/extensions.json @@ -162,6 +162,9 @@ }, "202": { "description": "OK response definition." + }, + "204": { + "description": "No Content response definition." } }, "x-ms-long-running-operation": true @@ -304,6 +307,9 @@ }, "202": { "description": "Accepted response definition." + }, + "204": { + "description": "No Content response definition." } }, "x-ms-long-running-operation": true diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/operations.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/operations.json index 51969351ea77..48beffae6656 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/operations.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/operations.json @@ -89,12 +89,148 @@ "operation": { "description": "The operation type: read, write, delete, etc.", "type": "string" + }, + "description": { + "description": "Localized friendly description for the operation", + "type": "string" } } + }, + "properties": { + "description": "The operation properties.", + "$ref": "#/definitions/OperationProperties" } }, "readOnly": true }, + "OperationProperties": { + "description": "The details of operation.", + "type": "object", + "properties": { + "serviceSpecification": { + "description": "The specification of the service.", + "$ref": "#/definitions/ServiceSpecification" + } + } + }, + "ServiceSpecification": { + "description": "The specification of the service.", + "type": "object", + "properties": { + "metricSpecifications": { + "description": "The metric specifications.", + "type": "array", + "items": { + "$ref": "#/definitions/MetricSpecifications" + } + } + } + }, + "MetricSpecifications": { + "description": "The details of metric specifications.", + "type": "object", + "properties": { + "name": { + "description": "The name of the metric specification.", + "type": "string" + }, + "displayName": { + "description": "The display name of the metric specification.", + "type": "string" + }, + "displayDescription": { + "description": "The display description of the metric specification.", + "type": "string" + }, + "unit": { + "description": "The unit of the metric specification.", + "type": "string" + }, + "aggregationType": { + "description": "The aggregation type of the metric specification.", + "type": "string" + }, + "supportedAggregationTypes": { + "description": "The supported aggregation types of the metric specification.", + "type": "array", + "items": { + "type": "string" + } + }, + "supportedTimeGrainTypes": { + "description": "The supported time grain types of the metric specification.", + "type": "array", + "items": { + "type": "string" + } + }, + "enableRegionalMdmAccount": { + "description": "The flag indicates whether enable regional mdm account or not.", + "type": "boolean" + }, + "sourceMdmAccount": { + "description": "The source mdm account.", + "type": "string" + }, + "sourceMdmNamespace": { + "description": "The source mdm namespace.", + "type": "string" + }, + "metricFilterPattern": { + "description": "The metric filter pattern.", + "type": "string" + }, + "fillGapWithZero": { + "description": "The flag indicates whether filling gap with zero.", + "type": "boolean" + }, + "category": { + "description": "The category of the metric.", + "type": "string" + }, + "resourceIdDimensionNameOverride": { + "description": "The override name of resource id dimension name.", + "type": "string" + }, + "isInternal": { + "description": "The flag indicates whether the metric is internal or not.", + "type": "boolean" + }, + "delegateMetricNameOverride": { + "description": "The override name of delegate metric.", + "type": "string" + }, + "dimensions": { + "description": "The dimensions of the metric specification.", + "type": "array", + "items": { + "$ref": "#/definitions/Dimension" + } + } + } + }, + "Dimension": { + "description": "The definition of Dimension.", + "type": "object", + "properties": { + "name": { + "description": "The name of the dimension.", + "type": "string" + }, + "displayName": { + "description": "The display name of the dimension.", + "type": "string" + }, + "internalName": { + "description": "The display name of the dimension.", + "type": "string" + }, + "toBeExportedForShoebox": { + "description": "The flag indicates whether the metric will be exported for shoebox or not.", + "type": "boolean" + } + } + }, "OperationListResult": { "description": "Result of the request to list HDInsight operations. It contains a list of operations and a URL link to get the next set of results.", "properties": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/scriptActions.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/scriptActions.json index f393dd981ffd..3a2614a2a0f0 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/scriptActions.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/scriptActions.json @@ -72,6 +72,9 @@ }, "200": { "description": "OK response definition." + }, + "204": { + "description": "No Content response definition." } } }