Fix formatting

hashicorp · Mar 17, 2020 · b230942 · b230942
1 parent 5525a83
commit b230942
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/azurerm/helpers/azure/hdinsight.go b/azurerm/helpers/azure/hdinsight.go
@@ -150,14 +150,13 @@ func ExpandHDInsightsConfigurations(input []interface{}) map[string]interface{}
 	username := vs["username"].(string)
 	password := vs["password"].(string)
 
-	config := map[string]interface{}{
+	return map[string]interface{}{
 		"gateway": map[string]interface{}{
 			"restAuthCredential.isEnabled": enabled,
 			"restAuthCredential.username":  username,
 			"restAuthCredential.password":  password,
 		},
 	}
-	return config
 }
 
 func ExpandHDInsightsMetastore(input []interface{}) map[string]interface{} {
@@ -184,7 +183,6 @@ func ExpandHDInsightsMetastore(input []interface{}) map[string]interface{} {
 			"hive_hostname":                       server,
 		},
 	}
-
 }
 
 func FlattenHDInsightsConfigurations(input map[string]*string) []interface{} {
@@ -216,7 +214,6 @@ func FlattenHDInsightsConfigurations(input map[string]*string) []interface{} {
 }
 
 func FlattenHDInsightsHiveMetastore(env map[string]*string, site map[string]*string) []interface{} {
-
 	server := ""
 	if v, exists := env["hive_hostname"]; exists && v != nil {
 		server = *v
@@ -238,7 +235,6 @@ func FlattenHDInsightsHiveMetastore(env map[string]*string, site map[string]*str
 	}
 
 	if server != "" && database != "" {
-
 		return []interface{}{
 			map[string]interface{}{
 				"server":        server,
@@ -247,9 +243,9 @@ func FlattenHDInsightsHiveMetastore(env map[string]*string, site map[string]*str
 				"password":      password,
 			},
 		}
-	} else {
-		return nil
 	}
+
+	return nil
 }
 
 func SchemaHDInsightsStorageAccounts() *schema.Schema {

diff --git a/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go b/azurerm/internal/services/hdinsight/tests/resource_arm_hdinsight_hadoop_cluster_test.go
@@ -1007,13 +1007,13 @@ func testAccAzureRMHDInsightHadoopCluster_metastore(data acceptance.TestData) st
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_sql_server" "test"{
-  name                            = "acctestsql-%d"
-  resource_group_name             = azurerm_resource_group.test.name
-  location                        = azurerm_resource_group.test.location
-  administrator_login             = "sql_admin"
-  administrator_login_password    = "TerrAform123!"
-  version                         = "12.0"
+resource "azurerm_sql_server" "test" {
+  name                         = "acctestsql-%d"
+  resource_group_name          = azurerm_resource_group.test.name
+  location                     = azurerm_resource_group.test.location
+  administrator_login          = "sql_admin"
+  administrator_login_password = "TerrAform123!"
+  version                      = "12.0"
 }
 
 resource "azurerm_sql_database" "test" {
@@ -1079,7 +1079,7 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
   }
 
   hive_metastore {
-    server   = azurerm_sql_server.test.fully_qualified_domain_name
+    server        = azurerm_sql_server.test.fully_qualified_domain_name
     database_name = azurerm_sql_database.test.name
     username      = azurerm_sql_server.test.administrator_login
     password      = azurerm_sql_server.test.administrator_login_password