Skip to content

Commit 2b69bec

Browse files
aim-for-betterZhenyu Zhou
aim-for-better
and
Zhenyu Zhou
authored
[Fix S360 Broken Issues][HDInsight]Fix s360 issues batch3 (#12612)
* Add networkProperties and clusterId * Add properties: VMGroupName, saskey, fileshare Change vmSizes to vmsizes, vmSizes_filter to vmsizes_filter to fix S360 issue * Suppress R4007 DefaultErrorResponseSchema Co-authored-by: Zhenyu Zhou <[email protected]>
1 parent 80f0a08 commit 2b69bec

File tree

10 files changed

+201
-32
lines changed

10 files changed

+201
-32
lines changed

‎custom-words.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2077,4 +2077,7 @@ Redirector
20772077
destaging
20782078
appendpos
20792079
appendblock
2080-
Exprired
2080+
Exprired
2081+
azureasyncoperations
2082+
saskey
2083+
vmsize

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/applications.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,10 @@
254254
"format": "int32",
255255
"description": "The public port to connect to."
256256
},
257+
"privateIPAddress": {
258+
"type": "string",
259+
"description": "The private ip address of the endpoint."
260+
},
257261
"subDomainSuffix": {
258262
"type": "string",
259263
"description": "The subdomain suffix of the application."

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/cluster.json‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,51 @@
619619
},
620620
"x-ms-long-running-operation": true
621621
}
622+
},
623+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/azureasyncoperations/{operationId}": {
624+
"get": {
625+
"tags": [
626+
"Clusters"
627+
],
628+
"operationId": "Clusters_GetAzureAsyncOperationStatus",
629+
"description": "The the async operation status.",
630+
"x-ms-examples": {
631+
"Get Async Operation Status of Creating Cluster": {
632+
"$ref": "./examples/GetClusterCreatingAsyncOperationStatus.json"
633+
}
634+
},
635+
"parameters": [
636+
{
637+
"$ref": "#/parameters/SubscriptionIdParameter"
638+
},
639+
{
640+
"$ref": "#/parameters/ResourceGroupNameParameter"
641+
},
642+
{
643+
"$ref": "#/parameters/ClusterNameParameter"
644+
},
645+
{
646+
"$ref": "#/parameters/ApiVersionParameter"
647+
},
648+
{
649+
"$ref": "#/parameters/OperationIdParameter"
650+
}
651+
],
652+
"responses": {
653+
"default": {
654+
"description": "Error response describing why the operation failed.",
655+
"schema": {
656+
"$ref": "./operations.json#/definitions/ErrorResponse"
657+
}
658+
},
659+
"200": {
660+
"description": "OK response definition.",
661+
"schema": {
662+
"$ref": "#/definitions/AsyncOperationResult"
663+
}
664+
}
665+
}
666+
}
622667
}
623668
},
624669
"definitions": {
@@ -930,6 +975,10 @@
930975
"format": "int32",
931976
"description": "The instance count of the cluster."
932977
},
978+
"VMGroupName": {
979+
"type": "string",
980+
"description": "The name of the virtual machine group."
981+
},
933982
"autoscale": {
934983
"$ref": "#/definitions/Autoscale",
935984
"x-ms-client-name": "autoscaleConfiguration",
@@ -1009,6 +1058,14 @@
10091058
"msiResourceId": {
10101059
"type": "string",
10111060
"description": "The managed identity (MSI) that is allowed to access the storage account, only to be specified for Azure Data Lake Storage Gen 2."
1061+
},
1062+
"saskey": {
1063+
"type": "string",
1064+
"description": "The shared access signature key."
1065+
},
1066+
"fileshare": {
1067+
"type": "string",
1068+
"description": "The file share name."
10121069
}
10131070
},
10141071
"description": "The storage Account."
@@ -1733,7 +1790,7 @@
17331790
},
17341791
"description": "Gateway settings."
17351792
},
1736-
"OperationResource": {
1793+
"AsyncOperationResult": {
17371794
"properties": {
17381795
"status": {
17391796
"type": "string",
@@ -1845,6 +1902,14 @@
18451902
"required": true,
18461903
"type": "string",
18471904
"description": "The HDInsight client API Version."
1905+
},
1906+
"OperationIdParameter": {
1907+
"name": "operationId",
1908+
"in": "path",
1909+
"required": true,
1910+
"type": "string",
1911+
"description": "The long running operation id.",
1912+
"x-ms-parameter-location": "method"
18481913
}
18491914
}
18501915
}

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/GetClusterCreatingAsyncOperationStatus.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"parameters": {
3+
"clusterName": "cluster1",
4+
"resourceGroupName": "rg1",
5+
"api-version": "2018-06-01-preview",
6+
"subscriptionId": "subid",
7+
"operationId": "CF938302-6B4D-44A0-A6D2-C0D67E847AEC"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"status": "InProgress"
13+
}
14+
}
15+
}
16+
}

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/GetExtension.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"responses": {
1010
"200": {
1111
"body": {
12-
"workspaceId": "id",
13-
"primaryKey": "key"
12+
"clusterMonitoringEnabled": true,
13+
"workspaceId": "id"
1414
}
1515
}
1616
}

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/GetHDInsightCapabilities.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
{
1414
"friendlyName": "1.6",
1515
"displayName": "HdInsight version 1.6.1.0.335536",
16-
"isDefault": "false"
16+
"isDefault": false
1717
},
1818
{
1919
"friendlyName": "2.1",
2020
"displayName": "Version 2.1.9.406.1221105",
21-
"isDefault": "false",
21+
"isDefault": false,
2222
"componentVersions": {
2323
"HDP": "1.3",
2424
"Hadoop": "1.2.0"
@@ -27,7 +27,7 @@
2727
{
2828
"friendlyName": "3.0",
2929
"displayName": "Version 3.0.6.989.2441725",
30-
"isDefault": "false",
30+
"isDefault": false,
3131
"componentVersions": {
3232
"HDP": "2.0",
3333
"Hadoop": "2.2.0"
@@ -36,7 +36,7 @@
3636
{
3737
"friendlyName": "3.1",
3838
"displayName": "Version 3.1.4.989.2441725",
39-
"isDefault": "false",
39+
"isDefault": false,
4040
"componentVersions": {
4141
"HDP": "2.1.7",
4242
"Hadoop": "2.4.0",
@@ -46,7 +46,7 @@
4646
{
4747
"friendlyName": "3.2",
4848
"displayName": "Version 3.2.7.989.2441725",
49-
"isDefault": "false",
49+
"isDefault": false,
5050
"componentVersions": {
5151
"HDP": "2.2",
5252
"Hadoop": "2.6.0",
@@ -57,7 +57,7 @@
5757
{
5858
"friendlyName": "3.3",
5959
"displayName": "Version 3.3.0.989.2441725",
60-
"isDefault": "true",
60+
"isDefault": true,
6161
"componentVersions": {
6262
"HDP": "2.3",
6363
"Hadoop": "2.7.0",
@@ -72,7 +72,7 @@
7272
{
7373
"friendlyName": "3.2",
7474
"displayName": "Version 3.2.1000.0.8840373",
75-
"isDefault": "false",
75+
"isDefault": false,
7676
"componentVersions": {
7777
"HDP": "2.2",
7878
"Hadoop": "2.6.0",
@@ -83,7 +83,7 @@
8383
{
8484
"friendlyName": "3.3",
8585
"displayName": "Version 3.3.1000.0.9776961",
86-
"isDefault": "false",
86+
"isDefault": false,
8787
"componentVersions": {
8888
"HDP": "2.3",
8989
"Hadoop": "2.7.0",
@@ -95,7 +95,7 @@
9595
{
9696
"friendlyName": "3.4",
9797
"displayName": "Version 3.4.1000.0.9719475",
98-
"isDefault": "false",
98+
"isDefault": false,
9999
"componentVersions": {
100100
"HDP": "2.4",
101101
"Hadoop": "2.7.1",
@@ -108,7 +108,7 @@
108108
{
109109
"friendlyName": "3.5",
110110
"displayName": "Version 3.5.1000.0.9732704",
111-
"isDefault": "true",
111+
"isDefault": true,
112112
"componentVersions": {
113113
"HDP": "2.5",
114114
"Hadoop": "2.7.3",
@@ -122,7 +122,7 @@
122122
{
123123
"friendlyName": "3.6",
124124
"displayName": "Version 3.6.1000.0.9503998",
125-
"isDefault": "false",
125+
"isDefault": false,
126126
"componentVersions": {
127127
"HDP": "2.6",
128128
"Spark": "2.1.0"
@@ -131,7 +131,7 @@
131131
{
132132
"friendlyName": "99.152",
133133
"displayName": "Version 99.152.1000.0.6943836",
134-
"isDefault": "false"
134+
"isDefault": false
135135
}
136136
]
137137
}
@@ -184,7 +184,7 @@
184184
]
185185
}
186186
},
187-
"vmSizes": {
187+
"vmsizes": {
188188
"paas": {
189189
"available": [
190190
"A5",
@@ -242,7 +242,7 @@
242242
]
243243
}
244244
},
245-
"vmSize_filters": [
245+
"vmsize_filters": [
246246
{
247247
"FilterMode": "Exclude",
248248
"Regions": [

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/examples/HDI_Locations_GetAsyncOperationStatus.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"parameters": {
3+
"location": "East US 2",
4+
"api-version": "2018-06-01-preview",
5+
"subscriptionId": "subid",
6+
"operationId": "8a0348f4-8a85-4ec2-abe0-03b26104a9a0-0"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"status": "Succeeded"
12+
}
13+
}
14+
}
15+
}

‎specification/hdinsight/resource-manager/Microsoft.HDInsight/stable/2018-06-01-preview/extensions.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
"200": {
263263
"description": "OK. The request has succeeded.",
264264
"schema": {
265-
"$ref": "#/definitions/Extension"
265+
"$ref": "#/definitions/ClusterMonitoringResponse"
266266
}
267267
}
268268
}
@@ -318,7 +318,7 @@
318318
},
319319
"definitions": {
320320
"Extension": {
321-
"description": "Cluster monitoring extensions",
321+
"description": "Cluster monitoring extensions.",
322322
"properties": {
323323
"workspaceId": {
324324
"description": "The workspace ID for the cluster monitoring extension.",
@@ -331,27 +331,27 @@
331331
}
332332
},
333333
"ClusterMonitoringResponse": {
334-
"description": "The Operations Management Suite (OMS) status response",
334+
"description": "The cluster monitoring status response.",
335335
"properties": {
336336
"clusterMonitoringEnabled": {
337-
"description": "The status of the Operations Management Suite (OMS) on the HDInsight cluster.",
337+
"description": "The status of the monitor on the HDInsight cluster.",
338338
"type": "boolean"
339339
},
340340
"workspaceId": {
341-
"description": "The workspace ID of the Operations Management Suite (OMS) on the HDInsight cluster.",
341+
"description": "The workspace ID of the monitor on the HDInsight cluster.",
342342
"type": "string"
343343
}
344344
}
345345
},
346346
"ClusterMonitoringRequest": {
347-
"description": "The Operations Management Suite (OMS) parameters.",
347+
"description": "The cluster monitor parameters.",
348348
"properties": {
349349
"workspaceId": {
350-
"description": "The Operations Management Suite (OMS) workspace ID.",
350+
"description": "The cluster monitor workspace ID.",
351351
"type": "string"
352352
},
353353
"primaryKey": {
354-
"description": "The Operations Management Suite (OMS) workspace key.",
354+
"description": "The cluster monitor workspace key.",
355355
"type": "string"
356356
}
357357
}

0 commit comments

Comments
 (0)