merge conflict resolution and minor change for metastoreraw

hashicorp · Jul 6, 2020 · 87e5c45 · 87e5c45
1 parent 64e53a9
commit 87e5c45
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 25 deletions.
diff --git a/azurerm/internal/services/hdinsight/hdinsight_hbase_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_hbase_cluster_resource.go
@@ -142,11 +142,10 @@ func resourceArmHDInsightHBaseClusterCreate(d *schema.ResourceData, meta interfa
 	gatewayRaw := d.Get("gateway").([]interface{})
 	configurations := azure.ExpandHDInsightsConfigurations(gatewayRaw)
 
-	if metastoresRaw, ok := d.Get("metastores").([]interface{}); ok {
-		metastores := expandHDInsightsMetastore(metastoresRaw)
-		for k, v := range metastores {
-			configurations[k] = v
-		}
+	metastoresRaw := d.Get("metastores").([]interface{})
+	metastores := expandHDInsightsMetastore(metastoresRaw)
+	for k, v := range metastores {
+		configurations[k] = v
 	}
 
 	storageAccountsRaw := d.Get("storage_account").([]interface{})

diff --git a/azurerm/internal/services/hdinsight/hdinsight_interactive_query_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_interactive_query_cluster_resource.go
@@ -142,11 +142,10 @@ func resourceArmHDInsightInteractiveQueryClusterCreate(d *schema.ResourceData, m
 	gatewayRaw := d.Get("gateway").([]interface{})
 	configurations := azure.ExpandHDInsightsConfigurations(gatewayRaw)
 
-	if metastoresRaw, ok := d.Get("metastores").([]interface{}); ok {
-		metastores := expandHDInsightsMetastore(metastoresRaw)
-		for k, v := range metastores {
-			configurations[k] = v
-		}
+	metastoresRaw := d.Get("metastores").([]interface{})
+	metastores := expandHDInsightsMetastore(metastoresRaw)
+	for k, v := range metastores {
+		configurations[k] = v
 	}
 
 	storageAccountsRaw := d.Get("storage_account").([]interface{})

diff --git a/azurerm/internal/services/hdinsight/hdinsight_kafka_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_kafka_cluster_resource.go
@@ -143,11 +143,10 @@ func resourceArmHDInsightKafkaClusterCreate(d *schema.ResourceData, meta interfa
 	gatewayRaw := d.Get("gateway").([]interface{})
 	configurations := azure.ExpandHDInsightsConfigurations(gatewayRaw)
 
-	if metastoresRaw, ok := d.Get("metastores").([]interface{}); ok {
-		metastores := expandHDInsightsMetastore(metastoresRaw)
-		for k, v := range metastores {
-			configurations[k] = v
-		}
+	metastoresRaw := d.Get("metastores").([]interface{})
+	metastores := expandHDInsightsMetastore(metastoresRaw)
+	for k, v := range metastores {
+		configurations[k] = v
 	}
 
 	storageAccountsRaw := d.Get("storage_account").([]interface{})

diff --git a/azurerm/internal/services/hdinsight/hdinsight_spark_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_spark_cluster_resource.go
@@ -142,11 +142,10 @@ func resourceArmHDInsightSparkClusterCreate(d *schema.ResourceData, meta interfa
 	gatewayRaw := d.Get("gateway").([]interface{})
 	configurations := azure.ExpandHDInsightsConfigurations(gatewayRaw)
 
-	if metastoresRaw, ok := d.Get("metastores").([]interface{}); ok {
-		metastores := expandHDInsightsMetastore(metastoresRaw)
-		for k, v := range metastores {
-			configurations[k] = v
-		}
+	metastoresRaw := d.Get("metastores").([]interface{})
+	metastores := expandHDInsightsMetastore(metastoresRaw)
+	for k, v := range metastores {
+		configurations[k] = v
 	}
 
 	storageAccountsRaw := d.Get("storage_account").([]interface{})

diff --git a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
@@ -140,11 +140,10 @@ func resourceArmHDInsightStormClusterCreate(d *schema.ResourceData, meta interfa
 	gatewayRaw := d.Get("gateway").([]interface{})
 	configurations := azure.ExpandHDInsightsConfigurations(gatewayRaw)
 
-	if metastoresRaw, ok := d.Get("metastores").([]interface{}); ok {
-		metastores := expandHDInsightsMetastore(metastoresRaw)
-		for k, v := range metastores {
-			configurations[k] = v
-		}
+	metastoresRaw := d.Get("metastores").([]interface{})
+	metastores := expandHDInsightsMetastore(metastoresRaw)
+	for k, v := range metastores {
+		configurations[k] = v
 	}
 
 	storageAccountsRaw := d.Get("storage_account").([]interface{})