From 96aaae97e4596b202ed360586ae13046561cde2d Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Mon, 21 Jan 2019 02:30:25 -0800 Subject: [PATCH 1/5] [HDInsight] - Update configurations --- .../preview/2015-03-01-preview/cluster.json | 136 ++++++++++++++++++ .../2015-03-01-preview/configurations.json | 65 ++++++++- ...n => HDI_Clusters_GetGatewaySettings.json} | 3 +- ...Clusters_UpdateGatewaySettings_Enable.json | 20 +++ .../examples/HDI_Configurations_Get.json | 17 +++ .../examples/HDI_Configurations_List.json | 25 ++++ .../preview/2018-06-01-preview/cluster.json | 136 ++++++++++++++++++ .../2018-06-01-preview/configurations.json | 63 +++++++- ...n => HDI_Clusters_GetGatewaySettings.json} | 3 +- ...Clusters_UpdateGatewaySettings_Enable.json | 20 +++ .../examples/HDI_Configurations_Get.json | 17 +++ .../examples/HDI_Configurations_List.json | 25 ++++ 12 files changed, 517 insertions(+), 13 deletions(-) rename specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/{GetHttpConnectivity.json => HDI_Clusters_GetGatewaySettings.json} (80%) create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_Get.json create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_List.json rename specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/{GetHttpConnectivity.json => HDI_Clusters_GetGatewaySettings.json} (80%) create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_Get.json create mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_List.json 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 96e83bd8c2cf..00d6e0ec5c1d 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 @@ -427,6 +427,100 @@ }, "x-ms-long-running-operation": true } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/getGatewaySettings": { + "post": { + "tags": [ + "Clusters" + ], + "operationId": "Clusters_GetGatewaySettings", + "description": "Gets the gateway settings for the specified cluster.", + "x-ms-examples": { + "Get HTTP settings": { + "$ref": "./examples/HDI_Clusters_GetGatewaySettings.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/GatewaySettings" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateGatewaySettings": { + "post": { + "tags": [ + "Clusters" + ], + "operationId": "Clusters_UpdateGatewaySettings", + "description": "Configures the gateway settings on the specified cluster.", + "x-ms-examples": { + "Enable HTTP connectivity": { + "$ref": "./examples/HDI_Clusters_UpdateGatewaySettings_Enable.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/UpdateGatewaySettingsParameters" + }, + "description": "The cluster configurations." + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition." + }, + "202": { + "description": "Accepted response definition" + } + }, + "x-ms-long-running-operation": true + } } }, "definitions": { @@ -1228,6 +1322,48 @@ } } }, + "UpdateGatewaySettingsParameters": { + "properties": { + "restAuthCredential.isEnabled": { + "type": "boolean", + "default": true, + "x-ms-client-name": "isCredentialEnabled", + "description": "Indicates whether or not the gateway settings based authorization is enabled." + }, + "restAuthCredential.username": { + "type": "string", + "x-ms-client-name": "userName", + "description": "The gateway settings user name." + }, + "restAuthCredential.password": { + "type": "string", + "x-ms-client-name": "password", + "description": "The gateway settings user password." + } + } + }, + "GatewaySettings": { + "properties": { + "restAuthCredential.isEnabled": { + "type": "string", + "x-ms-client-name": "isCredentialEnabled", + "description": "Indicates whether or not the gateway settings based authorization is enabled.", + "readOnly": true + }, + "restAuthCredential.username": { + "type": "string", + "x-ms-client-name": "userName", + "description": "The gateway settings user name.", + "readOnly": true + }, + "restAuthCredential.password": { + "type": "string", + "x-ms-client-name": "password", + "description": "The gateway settings user password.", + "readOnly": true + } + } + }, "OperationResource": { "properties": { "status": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/configurations.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/configurations.json index 12bb5e526c61..a6d0c75155f4 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/configurations.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/configurations.json @@ -32,13 +32,56 @@ } }, "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations": { + "post": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_List", + "description": "Gets all configuration information for an HDI cluster.", + "x-ms-examples": { + "Get all configuration information": { + "$ref": "./examples/HDI_Configurations_List.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/ClusterConfigurations" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}": { "post": { "tags": [ "Configurations" ], - "operationId": "Configurations_UpdateHTTPSettings", - "description": "Configures the HTTP settings on the specified cluster.", + "operationId": "Configurations_Update", + "description": "Configures the HTTP settings on the specified cluster. This API is deprecated, please use UpdateGatewaySettings in cluster endpoint instead.", + "deprecated": true, "x-ms-examples": { "Enable HTTP connectivity": { "$ref": "./examples/ChangeHttpConnectivityEnable.json" @@ -97,10 +140,10 @@ "Configurations" ], "operationId": "Configurations_Get", - "description": "The configuration object for the specified cluster.", + "description": "The configuration object for the specified cluster. This API is not recommended and might be removed in the future. Please consider using List configurations API instead.", "x-ms-examples": { - "Get HTTP settings": { - "$ref": "./examples/GetHttpConnectivity.json" + "Get Core site settings": { + "$ref": "./examples/HDI_Configurations_Get.json" } }, "parameters": [ @@ -144,6 +187,18 @@ "type": "string" }, "description": "The configuration object for the specified configuration for the specified cluster." + }, + "ClusterConfigurations": { + "properties": { + "configurations": { + "description": "The configuration object for the specified configuration for the specified cluster.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/ClusterConfiguration" + } + } + }, + "description": "The configuration object for the specified cluster." } }, "parameters": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetHttpConnectivity.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_GetGatewaySettings.json similarity index 80% rename from specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetHttpConnectivity.json rename to specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_GetGatewaySettings.json index 26033736edd0..7b95f0e600e3 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetHttpConnectivity.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_GetGatewaySettings.json @@ -3,8 +3,7 @@ "clusterName": "cluster1", "resourceGroupName": "rg1", "api-version": "2015-03-01-preview", - "subscriptionId": "subid", - "configurationName": "gateway" + "subscriptionId": "subid" }, "responses": { "200": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json new file mode 100644 index 000000000000..c16007d978b1 --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2015-03-01-preview", + "subscriptionId": "subid", + "parameters": { + "restAuthCredential.isEnabled": true, + "restAuthCredential.username": "hadoop", + "restAuthCredential.password": "**********" + } + }, + "responses": { + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.HDInsight/pathToOperationResult" + } + } + } +} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_Get.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_Get.json new file mode 100644 index 000000000000..e73de18e0339 --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_Get.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2015-03-01-preview", + "subscriptionId": "subid", + "configurationName": "core-site" + }, + "responses": { + "200": { + "body": { + "fs.defaultFS":"wasb://test.blob.core.windows.net", + "fs.azure.account.key.test.blob.core.windows.net":"accountKey" + } + } + } +} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_List.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_List.json new file mode 100644 index 000000000000..c653de57ed85 --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/HDI_Configurations_List.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2015-03-01-preview", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "configurations": { + "core-site": { + "fs.defaultFS": "wasb://test.blob.core.windows.net", + "fs.azure.account.key.test.blob.core.windows.net": "accountKey" + }, + "gateway": { + "restAuthCredential.isEnabled": "true", + "restAuthCredential.username": "admin", + "restAuthCredential.password": "**********" + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json index 61b0b7df3398..5aa1b17a196c 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json @@ -427,6 +427,100 @@ }, "x-ms-long-running-operation": true } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/getGatewaySettings": { + "post": { + "tags": [ + "Clusters" + ], + "operationId": "Clusters_GetGatewaySettings", + "description": "Gets the gateway settings for the specified cluster.", + "x-ms-examples": { + "Get HTTP settings": { + "$ref": "./examples/HDI_Clusters_GetGatewaySettings.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/GatewaySettings" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateGatewaySettings": { + "post": { + "tags": [ + "Clusters" + ], + "operationId": "Clusters_UpdateGatewaySettings", + "description": "Configures the gateway settings on the specified cluster.", + "x-ms-examples": { + "Enable HTTP connectivity": { + "$ref": "./examples/HDI_Clusters_UpdateGatewaySettings_Enable.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/UpdateGatewaySettingsParameters" + }, + "description": "The cluster configurations." + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition." + }, + "202": { + "description": "Accepted response definition" + } + }, + "x-ms-long-running-operation": true + } } }, "definitions": { @@ -1228,6 +1322,48 @@ } } }, + "UpdateGatewaySettingsParameters": { + "properties": { + "restAuthCredential.isEnabled": { + "type": "boolean", + "default": true, + "x-ms-client-name": "isCredentialEnabled", + "description": "Indicates whether or not the gateway settings based authorization is enabled." + }, + "restAuthCredential.username": { + "type": "string", + "x-ms-client-name": "userName", + "description": "The gateway settings user name." + }, + "restAuthCredential.password": { + "type": "string", + "x-ms-client-name": "password", + "description": "The gateway settings user password." + } + } + }, + "GatewaySettings": { + "properties": { + "restAuthCredential.isEnabled": { + "type": "string", + "x-ms-client-name": "isCredentialEnabled", + "description": "Indicates whether or not the gateway settings based authorization is enabled.", + "readOnly": true + }, + "restAuthCredential.username": { + "type": "string", + "x-ms-client-name": "userName", + "description": "The gateway settings user name.", + "readOnly": true + }, + "restAuthCredential.password": { + "type": "string", + "x-ms-client-name": "password", + "description": "The gateway settings user password.", + "readOnly": true + } + } + }, "OperationResource": { "properties": { "status": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/configurations.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/configurations.json index 195561448e30..077626bdec58 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/configurations.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/configurations.json @@ -32,13 +32,56 @@ } }, "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations": { + "post": { + "tags": [ + "Configurations" + ], + "operationId": "Configurations_List", + "description": "Gets all configuration information for an HDI cluster.", + "x-ms-examples": { + "Get all configuration information": { + "$ref": "./examples/HDI_Configurations_List.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ClusterNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./operations.json#/definitions/ErrorResponse" + } + }, + "200": { + "description": "OK response definition.", + "schema": { + "$ref": "#/definitions/ClusterConfigurations" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}": { "post": { "tags": [ "Configurations" ], "operationId": "Configurations_Update", - "description": "Configures the configuration on the specified cluster.", + "description": "Configures the HTTP settings on the specified cluster. This API is deprecated, please use UpdateGatewaySettings in cluster endpoint instead.", + "deprecated": true, "x-ms-examples": { "Enable HTTP connectivity": { "$ref": "./examples/ChangeHttpConnectivityEnable.json" @@ -97,10 +140,10 @@ "Configurations" ], "operationId": "Configurations_Get", - "description": "The configuration object for the specified cluster.", + "description": "The configuration object for the specified cluster. This API is not recommended and might be removed in the future. Please consider using List configurations API instead.", "x-ms-examples": { - "Get HTTP settings": { - "$ref": "./examples/GetHttpConnectivity.json" + "Get Core site settings": { + "$ref": "./examples/HDI_Configurations_Get.json" } }, "parameters": [ @@ -144,6 +187,18 @@ "type": "string" }, "description": "The configuration object for the specified configuration for the specified cluster." + }, + "ClusterConfigurations": { + "properties": { + "configurations": { + "description": "The configuration object for the specified configuration for the specified cluster.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/ClusterConfiguration" + } + } + }, + "description": "The configuration object for the specified cluster." } }, "parameters": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetHttpConnectivity.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_GetGatewaySettings.json similarity index 80% rename from specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetHttpConnectivity.json rename to specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_GetGatewaySettings.json index 75ff30e36059..8a85b271a6fd 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetHttpConnectivity.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_GetGatewaySettings.json @@ -3,8 +3,7 @@ "clusterName": "cluster1", "resourceGroupName": "rg1", "api-version": "2018-06-01-preview", - "subscriptionId": "subid", - "configurationName": "gateway" + "subscriptionId": "subid" }, "responses": { "200": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json new file mode 100644 index 000000000000..abd6f96579c0 --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Clusters_UpdateGatewaySettings_Enable.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2018-06-01-preview", + "subscriptionId": "subid", + "parameters": { + "restAuthCredential.isEnabled": true, + "restAuthCredential.username": "hadoop", + "restAuthCredential.password": "**********" + } + }, + "responses": { + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.HDInsight/pathToOperationResult" + } + } + } +} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_Get.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_Get.json new file mode 100644 index 000000000000..7abae5b25e2e --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_Get.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2018-06-01-preview", + "subscriptionId": "subid", + "configurationName": "core-site" + }, + "responses": { + "200": { + "body": { + "fs.defaultFS":"wasb://test.blob.core.windows.net", + "fs.azure.account.key.test.blob.core.windows.net":"accountKey" + } + } + } +} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_List.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_List.json new file mode 100644 index 000000000000..81448557d3f6 --- /dev/null +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/HDI_Configurations_List.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "clusterName": "cluster1", + "resourceGroupName": "rg1", + "api-version": "2018-06-01-preview", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "configurations": { + "core-site": { + "fs.defaultFS": "wasb://test.blob.core.windows.net", + "fs.azure.account.key.test.blob.core.windows.net": "accountKey" + }, + "gateway": { + "restAuthCredential.isEnabled": "true", + "restAuthCredential.username": "admin", + "restAuthCredential.password": "**********" + } + } + } + } + } +} \ No newline at end of file From 966e254b4389830fb0183e071e4307a0a1a4d388 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Tue, 26 Mar 2019 05:06:34 -0700 Subject: [PATCH 2/5] Remove unused examples to avoid Avocado validation error --- .../GetLinuxHadoopScriptExecutionHistory.json | 32 ------------------- .../examples/RdpSettingsEnable.json | 27 ---------------- .../GetLinuxHadoopScriptExecutionHistory.json | 32 ------------------- .../examples/RdpSettingsEnable.json | 27 ---------------- 4 files changed, 118 deletions(-) delete mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json delete mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/RdpSettingsEnable.json delete mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json delete mode 100644 specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/RdpSettingsEnable.json diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json deleted file mode 100644 index 8ead93315fbd..000000000000 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parameters": { - "clusterName": "cluster1", - "resourceGroupName": "rg1", - "api-version": "2015-03-01-preview", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "value": [{ - "scriptExecutionId": 386120808773799, - "name": "app-install", - "applicationName": "app", - "uri": "http://app.com/public/hdi-app/20170301/hdinsight-app-install.sh", - "parameters": "", - "roles": [ - "edgenode" - ], - "startTime": "2017-03-22T21:40:37.8865514Z", - "endTime": "2017-03-22T22:06:02.1584639Z", - "status": "Succeeded", - "operation": "AppInstall", - "executionSummary": [{ - "status": "COMPLETED", - "instanceCount": 1 - }] - }] - } - } - } -} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/RdpSettingsEnable.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/RdpSettingsEnable.json deleted file mode 100644 index d9c130239a81..000000000000 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2015-03-01-preview/examples/RdpSettingsEnable.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "clusterName": "cluster1", - "resourceGroupName": "rg1", - "api-version": "2015-03-01-preview", - "subscriptionId": "subid", - "parameters": { - "osProfile": { - "windowsOperatingSystemProfile": { - "rdpSettings": { - "username": "hadoop", - "password": "**********", - "expiryDate": "2017-02-28" - } - } - } - } - }, - "responses": { - "202": { - "headers": { - "location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.HDInsight/pathToOperationResult" - } - }, - "200": {} - } -} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json deleted file mode 100644 index 60b3ddcf0b00..000000000000 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/GetLinuxHadoopScriptExecutionHistory.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parameters": { - "clusterName": "cluster1", - "resourceGroupName": "rg1", - "api-version": "2018-06-01-preview", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "value": [{ - "scriptExecutionId": 386120808773799, - "name": "app-install", - "applicationName": "app", - "uri": "http://app.com/public/hdi-app/20170301/hdinsight-app-install.sh", - "parameters": "", - "roles": [ - "edgenode" - ], - "startTime": "2017-03-22T21:40:37.8865514Z", - "endTime": "2017-03-22T22:06:02.1584639Z", - "status": "Succeeded", - "operation": "AppInstall", - "executionSummary": [{ - "status": "COMPLETED", - "instanceCount": 1 - }] - }] - } - } - } -} \ No newline at end of file diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/RdpSettingsEnable.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/RdpSettingsEnable.json deleted file mode 100644 index cd7de3816f56..000000000000 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/examples/RdpSettingsEnable.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "clusterName": "cluster1", - "resourceGroupName": "rg1", - "api-version": "2018-06-01-preview", - "subscriptionId": "subid", - "parameters": { - "osProfile": { - "windowsOperatingSystemProfile": { - "rdpSettings": { - "username": "hadoop", - "password": "**********", - "expiryDate": "2017-02-28" - } - } - } - } - }, - "responses": { - "202": { - "headers": { - "location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.HDInsight/pathToOperationResult" - } - }, - "200": {} - } -} \ No newline at end of file From 9ed06e022ff142079af919f5649d16f4d39fbf33 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Tue, 26 Mar 2019 23:06:30 -0700 Subject: [PATCH 3/5] Add description for gateway settings and update gateway settings --- .../preview/2015-03-01-preview/cluster.json | 6 ++++-- .../preview/2018-06-01-preview/cluster.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 00d6e0ec5c1d..c8f0601da9ff 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 @@ -1340,7 +1340,8 @@ "x-ms-client-name": "password", "description": "The gateway settings user password." } - } + }, + "description": "The update gateway settings request parameters." }, "GatewaySettings": { "properties": { @@ -1362,7 +1363,8 @@ "description": "The gateway settings user password.", "readOnly": true } - } + }, + "description": "Gateway settings." }, "OperationResource": { "properties": { diff --git a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json index 5aa1b17a196c..1bdcbbd7fe80 100644 --- a/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json +++ b/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2018-06-01-preview/cluster.json @@ -1340,7 +1340,8 @@ "x-ms-client-name": "password", "description": "The gateway settings user password." } - } + }, + "description": "The update gateway settings request parameters." }, "GatewaySettings": { "properties": { @@ -1362,7 +1363,8 @@ "description": "The gateway settings user password.", "readOnly": true } - } + }, + "description": "Gateway settings." }, "OperationResource": { "properties": { From 05381f89aef2650662ba4fdaf735bc9c6b4868ac Mon Sep 17 00:00:00 2001 From: idear Date: Tue, 2 Apr 2019 07:52:41 +0800 Subject: [PATCH 4/5] Add suppression rule --- specification/hdinsight/resource-manager/readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/hdinsight/resource-manager/readme.md b/specification/hdinsight/resource-manager/readme.md index c9c998d78bc9..727d3664ab4d 100644 --- a/specification/hdinsight/resource-manager/readme.md +++ b/specification/hdinsight/resource-manager/readme.md @@ -50,6 +50,17 @@ tag: package-2018-06-preview - $.definitions.VmSizeCompatibilityFilter.properties.FilterMode ``` + ``` yaml +directive: + - suppress: R3016 # to suppress (DefinitionsPropertiesNamesCamelCase) + from: cluster.json + reason: The casing of this property is not incorrect. + where: + - $..["restAuthCredential.isEnabled"] + - $..["restAuthCredential.username"] + - $..["restAuthCredential.password"] +``` + ### Tag: package-2018-06-preview These settings apply only when `--tag=package-2018-06-preview` is specified on the command line. From 976b192b4c0dab6a9b3dc4daa94767f80937fe63 Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Mon, 1 Apr 2019 20:10:13 -0700 Subject: [PATCH 5/5] Trigger