From 49e6b7054c5606773c56c9f9d480ba221c565a0f Mon Sep 17 00:00:00 2001 From: Konstantin Kosinsky Date: Tue, 26 May 2020 11:53:20 -0700 Subject: [PATCH 01/13] Mark gateway enabled optional and depricated --- azurerm/helpers/azure/hdinsight.go | 27 ++++++++++--------- .../hdinsight_hadoop_cluster_resource_test.go | 1 - 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/azurerm/helpers/azure/hdinsight.go b/azurerm/helpers/azure/hdinsight.go index ca129004101e..df5aeb2e1aca 100644 --- a/azurerm/helpers/azure/hdinsight.go +++ b/azurerm/helpers/azure/hdinsight.go @@ -2,7 +2,6 @@ package azure import ( "fmt" - "strconv" "strings" "github.com/Azure/azure-sdk-for-go/services/preview/hdinsight/mgmt/2018-06-01-preview/hdinsight" @@ -94,9 +93,19 @@ func SchemaHDInsightsGateway() *schema.Schema { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "enabled": { - Type: schema.TypeBool, - Required: true, - ForceNew: true, + Type: schema.TypeBool, + Optional: true, + ForceNew: false, + Computed: true, + Deprecated: "HDInsight doesn't support disabling gateway anymore", + ValidateFunc: func(i interface{}, k string) (warnings []string, errors []error) { + enabled := i.(bool) + + if !enabled { + errors = append(errors, fmt.Errorf("Only true is supported, because HDInsight doesn't support disabling gateway anymore. Provided value %t", enabled)) + } + return warnings, errors + }, }, // NOTE: these are Required since if these aren't present you get a `500 bad request` "username": { @@ -160,7 +169,7 @@ func ExpandHDInsightsConfigurations(input []interface{}) map[string]interface{} vs := input[0].(map[string]interface{}) // NOTE: Admin username must be different from SSH Username - enabled := vs["enabled"].(bool) + enabled := true username := vs["username"].(string) password := vs["password"].(string) @@ -254,13 +263,7 @@ func ExpandHDInsightsAmbariMetastore(input []interface{}) map[string]interface{} } func FlattenHDInsightsConfigurations(input map[string]*string) []interface{} { - enabled := false - if v, exists := input["restAuthCredential.isEnabled"]; exists && v != nil { - e, err := strconv.ParseBool(*v) - if err == nil { - enabled = e - } - } + enabled := true username := "" if v, exists := input["restAuthCredential.username"]; exists && v != nil { diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go index 05780c4b5fbc..08a6d097bd56 100644 --- a/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go +++ b/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go @@ -452,7 +452,6 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" { } gateway { - enabled = true username = "acctestusrgw" password = "TerrAform123!" } From 55e72d765fbe231ccca4e83b38bd63ab2d9c2d73 Mon Sep 17 00:00:00 2001 From: Konstantin Kosinsky Date: Wed, 27 May 2020 16:44:56 -0700 Subject: [PATCH 02/13] UpdateGatewaySettings --- azurerm/helpers/azure/hdinsight.go | 2 +- .../services/hdinsight/common_hdinsight.go | 23 +++++ .../hdinsight_hadoop_cluster_resource_test.go | 92 +++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) diff --git a/azurerm/helpers/azure/hdinsight.go b/azurerm/helpers/azure/hdinsight.go index df5aeb2e1aca..36bed4c7c615 100644 --- a/azurerm/helpers/azure/hdinsight.go +++ b/azurerm/helpers/azure/hdinsight.go @@ -116,7 +116,7 @@ func SchemaHDInsightsGateway() *schema.Schema { "password": { Type: schema.TypeString, Required: true, - ForceNew: true, + ForceNew: false, Sensitive: true, // Azure returns the key as *****. We'll suppress that here. DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { diff --git a/azurerm/internal/services/hdinsight/common_hdinsight.go b/azurerm/internal/services/hdinsight/common_hdinsight.go index 265c68e56dc0..f6de5aeec497 100644 --- a/azurerm/internal/services/hdinsight/common_hdinsight.go +++ b/azurerm/internal/services/hdinsight/common_hdinsight.go @@ -106,6 +106,29 @@ func hdinsightClusterUpdate(clusterKind string, readFunc schema.ReadFunc) schema } } + if d.HasChange("gateway") { + log.Printf("[DEBUG] Updating the HDInsight %q Cluster gateway", clusterKind) + vs := d.Get("gateway").([]interface{})[0].(map[string]interface{}) + + enabled := true + username := vs["username"].(string) + password := vs["password"].(string) + + future, err := client.UpdateGatewaySettings(ctx, resourceGroup, name, hdinsight.UpdateGatewaySettingsParameters{ + IsCredentialEnabled: &enabled, + UserName: utils.String(username), + Password: utils.String(password), + }) + + if err != nil { + return err + } + + if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { + return fmt.Errorf("Error waiting for HDInsight Cluster %q (Resource Group %q) Gateway to be updated: %s", name, resourceGroup, err) + } + } + return readFunc(d, meta) } } diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go index 08a6d097bd56..835443ed53f0 100644 --- a/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go +++ b/azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go @@ -435,6 +435,47 @@ func TestAccAzureRMHDInsightHadoopCluster_updateMetastore(t *testing.T) { }) } +func TestAccAzureRMHDInsightHadoopCluster_updateGateway(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_hdinsight_hadoop_cluster", "test") + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMHDInsightClusterDestroy(data.ResourceType), + Steps: []resource.TestStep{ + { + Config: testAccAzureRMHDInsightHadoopCluster_basic(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMHDInsightClusterExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "https_endpoint"), + resource.TestCheckResourceAttrSet(data.ResourceName, "ssh_endpoint"), + ), + }, + data.ImportStep("roles.0.head_node.0.password", + "roles.0.head_node.0.vm_size", + "roles.0.worker_node.0.password", + "roles.0.worker_node.0.vm_size", + "roles.0.zookeeper_node.0.password", + "roles.0.zookeeper_node.0.vm_size", + "storage_account"), + { + Config: testAccAzureRMHDInsightHadoopCluster_updateGateway(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMHDInsightClusterExists(data.ResourceName), + resource.TestCheckResourceAttrSet(data.ResourceName, "https_endpoint"), + resource.TestCheckResourceAttrSet(data.ResourceName, "ssh_endpoint"), + ), + }, + data.ImportStep("roles.0.head_node.0.password", + "roles.0.head_node.0.vm_size", + "roles.0.worker_node.0.password", + "roles.0.worker_node.0.vm_size", + "roles.0.zookeeper_node.0.password", + "roles.0.zookeeper_node.0.vm_size", + "storage_account"), + }, + }) +} + func testAccAzureRMHDInsightHadoopCluster_basic(data acceptance.TestData) string { template := testAccAzureRMHDInsightHadoopCluster_template(data) return fmt.Sprintf(` @@ -1315,3 +1356,54 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" { } `, template, data.RandomInteger, data.RandomInteger) } + +func testAccAzureRMHDInsightHadoopCluster_updateGateway(data acceptance.TestData) string { + template := testAccAzureRMHDInsightHadoopCluster_template(data) + return fmt.Sprintf(` +%s + +resource "azurerm_hdinsight_hadoop_cluster" "test" { + name = "acctesthdi-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + cluster_version = "3.6" + tier = "Standard" + + component_version { + hadoop = "2.7" + } + + gateway { + username = "acctestusrgw" + password = "TerrAformne3!" + } + + storage_account { + storage_container_id = azurerm_storage_container.test.id + storage_account_key = azurerm_storage_account.test.primary_access_key + is_default = true + } + + roles { + head_node { + vm_size = "Standard_D3_v2" + username = "acctestusrvm" + password = "AccTestvdSC4daf986!" + } + + worker_node { + vm_size = "Standard_D4_V2" + username = "acctestusrvm" + password = "AccTestvdSC4daf986!" + target_instance_count = 2 + } + + zookeeper_node { + vm_size = "Standard_D3_v2" + username = "acctestusrvm" + password = "AccTestvdSC4daf986!" + } + } +} +`, template, data.RandomInteger) +} From 8753a39864bc23b656d7b809cd743e0e2459e83b Mon Sep 17 00:00:00 2001 From: Konstantin Kosinsky Date: Wed, 27 May 2020 16:51:16 -0700 Subject: [PATCH 03/13] Update documentation --- website/docs/r/hdinsight_hadoop_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_hbase_cluster.html.markdown | 4 ++-- .../docs/r/hdinsight_interactive_query_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_kafka_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_ml_services_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_rserver_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_spark_cluster.html.markdown | 4 ++-- website/docs/r/hdinsight_storm_cluster.html.markdown | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/website/docs/r/hdinsight_hadoop_cluster.html.markdown b/website/docs/r/hdinsight_hadoop_cluster.html.markdown index bccdc6d1b00b..8ea949ad0fd7 100644 --- a/website/docs/r/hdinsight_hadoop_cluster.html.markdown +++ b/website/docs/r/hdinsight_hadoop_cluster.html.markdown @@ -123,9 +123,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_hbase_cluster.html.markdown b/website/docs/r/hdinsight_hbase_cluster.html.markdown index 4c1bb01e8d18..3daef89badc1 100644 --- a/website/docs/r/hdinsight_hbase_cluster.html.markdown +++ b/website/docs/r/hdinsight_hbase_cluster.html.markdown @@ -121,9 +121,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown index e1fbd7814ab6..7a663470487e 100644 --- a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown +++ b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown @@ -119,9 +119,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_kafka_cluster.html.markdown b/website/docs/r/hdinsight_kafka_cluster.html.markdown index 595a1dae5110..fe19df758045 100644 --- a/website/docs/r/hdinsight_kafka_cluster.html.markdown +++ b/website/docs/r/hdinsight_kafka_cluster.html.markdown @@ -122,9 +122,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_ml_services_cluster.html.markdown b/website/docs/r/hdinsight_ml_services_cluster.html.markdown index fa7534e060db..e0668ba5834e 100644 --- a/website/docs/r/hdinsight_ml_services_cluster.html.markdown +++ b/website/docs/r/hdinsight_ml_services_cluster.html.markdown @@ -116,9 +116,9 @@ The following arguments are supported: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_rserver_cluster.html.markdown b/website/docs/r/hdinsight_rserver_cluster.html.markdown index 0f91e299245d..c883e97b03a4 100644 --- a/website/docs/r/hdinsight_rserver_cluster.html.markdown +++ b/website/docs/r/hdinsight_rserver_cluster.html.markdown @@ -116,9 +116,9 @@ The following arguments are supported: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_spark_cluster.html.markdown b/website/docs/r/hdinsight_spark_cluster.html.markdown index 6fbe8ab7d4e7..ff993ef05e1c 100644 --- a/website/docs/r/hdinsight_spark_cluster.html.markdown +++ b/website/docs/r/hdinsight_spark_cluster.html.markdown @@ -121,9 +121,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. diff --git a/website/docs/r/hdinsight_storm_cluster.html.markdown b/website/docs/r/hdinsight_storm_cluster.html.markdown index e36adf352c20..ed60ceaa2e37 100644 --- a/website/docs/r/hdinsight_storm_cluster.html.markdown +++ b/website/docs/r/hdinsight_storm_cluster.html.markdown @@ -119,9 +119,9 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Required) Is the Ambari portal enabled? Changing this forces a new resource to be created. +* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. -* `password` - (Required) The password used for the Ambari Portal. Changing this forces a new resource to be created. +* `password` - (Required) The password used for the Ambari Portal. -> **NOTE:** This password must be different from the one used for the `head_node`, `worker_node` and `zookeeper_node` roles. From 40f04f19360f94337ce63078551d0505ed5f437b Mon Sep 17 00:00:00 2001 From: kosinsky Date: Tue, 9 Jun 2020 08:14:31 -0700 Subject: [PATCH 04/13] Apply suggestions from code review Co-authored-by: magodo --- azurerm/helpers/azure/hdinsight.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azurerm/helpers/azure/hdinsight.go b/azurerm/helpers/azure/hdinsight.go index 36bed4c7c615..ab519b2d4da3 100644 --- a/azurerm/helpers/azure/hdinsight.go +++ b/azurerm/helpers/azure/hdinsight.go @@ -95,8 +95,7 @@ func SchemaHDInsightsGateway() *schema.Schema { "enabled": { Type: schema.TypeBool, Optional: true, - ForceNew: false, - Computed: true, + Default: true, Deprecated: "HDInsight doesn't support disabling gateway anymore", ValidateFunc: func(i interface{}, k string) (warnings []string, errors []error) { enabled := i.(bool) @@ -116,7 +115,6 @@ func SchemaHDInsightsGateway() *schema.Schema { "password": { Type: schema.TypeString, Required: true, - ForceNew: false, Sensitive: true, // Azure returns the key as *****. We'll suppress that here. DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { From 597ccb5011e9a7240abfafcefbbce83fe6cc67ed Mon Sep 17 00:00:00 2001 From: Konstantin Kosinsky Date: Tue, 9 Jun 2020 08:57:26 -0700 Subject: [PATCH 05/13] Formatting and TODO comment --- azurerm/helpers/azure/hdinsight.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurerm/helpers/azure/hdinsight.go b/azurerm/helpers/azure/hdinsight.go index ab519b2d4da3..d60bfcfe5da2 100644 --- a/azurerm/helpers/azure/hdinsight.go +++ b/azurerm/helpers/azure/hdinsight.go @@ -92,10 +92,11 @@ func SchemaHDInsightsGateway() *schema.Schema { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + // TODO 3.0: remove this attribute "enabled": { Type: schema.TypeBool, Optional: true, - Default: true, + Default: true, Deprecated: "HDInsight doesn't support disabling gateway anymore", ValidateFunc: func(i interface{}, k string) (warnings []string, errors []error) { enabled := i.(bool) From 7bd55aca9a4ad82ca408655ea612e50920a1a71a Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:18 -0700 Subject: [PATCH 06/13] Update website/docs/r/hdinsight_storm_cluster.html.markdown --- website/docs/r/hdinsight_storm_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_storm_cluster.html.markdown b/website/docs/r/hdinsight_storm_cluster.html.markdown index ed60ceaa2e37..05a6364b25b0 100644 --- a/website/docs/r/hdinsight_storm_cluster.html.markdown +++ b/website/docs/r/hdinsight_storm_cluster.html.markdown @@ -119,7 +119,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From e8135dcb5bbe6a42d29473e944da3ac122ae1405 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:25 -0700 Subject: [PATCH 07/13] Update website/docs/r/hdinsight_ml_services_cluster.html.markdown --- website/docs/r/hdinsight_ml_services_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_ml_services_cluster.html.markdown b/website/docs/r/hdinsight_ml_services_cluster.html.markdown index e0668ba5834e..4cc19eec15d4 100644 --- a/website/docs/r/hdinsight_ml_services_cluster.html.markdown +++ b/website/docs/r/hdinsight_ml_services_cluster.html.markdown @@ -116,7 +116,7 @@ The following arguments are supported: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From 52d22eb3d11c103b3d0a7de0620ce9208dd21079 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:31 -0700 Subject: [PATCH 08/13] Update website/docs/r/hdinsight_rserver_cluster.html.markdown --- website/docs/r/hdinsight_rserver_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_rserver_cluster.html.markdown b/website/docs/r/hdinsight_rserver_cluster.html.markdown index c883e97b03a4..1dd9cfd3e248 100644 --- a/website/docs/r/hdinsight_rserver_cluster.html.markdown +++ b/website/docs/r/hdinsight_rserver_cluster.html.markdown @@ -116,7 +116,7 @@ The following arguments are supported: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From a5927c0181b209bf715947093170fcb6eea3f3b6 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:37 -0700 Subject: [PATCH 09/13] Update website/docs/r/hdinsight_interactive_query_cluster.html.markdown --- .../docs/r/hdinsight_interactive_query_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown index 7a663470487e..742443c5fd3b 100644 --- a/website/docs/r/hdinsight_interactive_query_cluster.html.markdown +++ b/website/docs/r/hdinsight_interactive_query_cluster.html.markdown @@ -119,7 +119,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From bf19dec929d8893b0f4ff04151756266b65c8bb0 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:47 -0700 Subject: [PATCH 10/13] Update website/docs/r/hdinsight_spark_cluster.html.markdown --- website/docs/r/hdinsight_spark_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_spark_cluster.html.markdown b/website/docs/r/hdinsight_spark_cluster.html.markdown index ff993ef05e1c..3f5375e43f98 100644 --- a/website/docs/r/hdinsight_spark_cluster.html.markdown +++ b/website/docs/r/hdinsight_spark_cluster.html.markdown @@ -121,7 +121,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From 9a07d0b633ac06073e53ee5a963c4dabd2069d38 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:53 -0700 Subject: [PATCH 11/13] Update website/docs/r/hdinsight_hadoop_cluster.html.markdown --- website/docs/r/hdinsight_hadoop_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_hadoop_cluster.html.markdown b/website/docs/r/hdinsight_hadoop_cluster.html.markdown index 8ea949ad0fd7..1df2f504a71c 100644 --- a/website/docs/r/hdinsight_hadoop_cluster.html.markdown +++ b/website/docs/r/hdinsight_hadoop_cluster.html.markdown @@ -123,7 +123,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From 3785d73c138c702723105de998e0ed0539c8b94c Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:19:58 -0700 Subject: [PATCH 12/13] Update website/docs/r/hdinsight_hbase_cluster.html.markdown --- website/docs/r/hdinsight_hbase_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_hbase_cluster.html.markdown b/website/docs/r/hdinsight_hbase_cluster.html.markdown index 3daef89badc1..f09e6c421520 100644 --- a/website/docs/r/hdinsight_hbase_cluster.html.markdown +++ b/website/docs/r/hdinsight_hbase_cluster.html.markdown @@ -121,7 +121,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal. From b62a3bf40f4f62afa375556a86be72046db6ab63 Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 29 Jun 2020 16:20:04 -0700 Subject: [PATCH 13/13] Update website/docs/r/hdinsight_kafka_cluster.html.markdown --- website/docs/r/hdinsight_kafka_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/hdinsight_kafka_cluster.html.markdown b/website/docs/r/hdinsight_kafka_cluster.html.markdown index fe19df758045..3149632c9556 100644 --- a/website/docs/r/hdinsight_kafka_cluster.html.markdown +++ b/website/docs/r/hdinsight_kafka_cluster.html.markdown @@ -122,7 +122,7 @@ A `component_version` block supports the following: A `gateway` block supports the following: -* `enabled` - (Optional) Is the Ambari portal enabled? Deprecated: HDInsight doesn't support disabling gateway anymore. +* `enabled` - (Optional/ **Deprecated) Is the Ambari portal enabled? The HDInsight API doesn't support disabling gateway anymore. * `password` - (Required) The password used for the Ambari Portal.