tags { -> tags = {

\

@@ -0,0 +1,7 @@
+Merge branch 'master' into 012/early4
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.

azurerm/resource_arm_data_factory_test.go

@@ -302,7 +302,7 @@ func testAccAzureRMDataFactory_tags(rInt int, location string) string {
     name                = "acctestdf%d"
     location            = "${azurerm_resource_group.test.location}"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    tags {
+    tags = {
       environment = "production"
     }
   }
@@ -319,7 +319,7 @@ func testAccAzureRMDataFactory_tagsUpdated(rInt int, location string) string {
     name                = "acctestdf%d"
     location            = "${azurerm_resource_group.test.location}"
     resource_group_name = "${azurerm_resource_group.test.name}"
-    tags {
+    tags = {
       environment = "production"
       updated     = "true"
     }

azurerm/resource_arm_hdinsight_hadoop_cluster_test.go

@@ -425,7 +425,7 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -571,7 +571,7 @@ resource "azurerm_hdinsight_hadoop_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_hbase_cluster_test.go

@@ -425,7 +425,7 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -571,7 +571,7 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_interactive_query_cluster_test.go

@@ -425,7 +425,7 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -573,7 +573,7 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_kafka_cluster_test.go

@@ -428,7 +428,7 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -576,7 +576,7 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_ml_services_cluster_test.go

@@ -452,7 +452,7 @@ resource "azurerm_hdinsight_ml_services_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -610,7 +610,7 @@ resource "azurerm_hdinsight_ml_services_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_rserver_cluster_test.go

@@ -452,7 +452,7 @@ resource "azurerm_hdinsight_rserver_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -610,7 +610,7 @@ resource "azurerm_hdinsight_rserver_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_spark_cluster_test.go

@@ -425,7 +425,7 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -571,7 +571,7 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_hdinsight_storm_cluster_test.go

@@ -425,7 +425,7 @@ resource "azurerm_hdinsight_storm_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }
@@ -571,7 +571,7 @@ resource "azurerm_hdinsight_storm_cluster" "test" {
     }
   }
 
-  tags {
+  tags = {
     "Hello" = "World"
   }
 }

azurerm/resource_arm_iothub_shared_access_policy_test.go

@@ -105,7 +105,7 @@ resource "azurerm_iothub" "test" {
     capacity = "1"
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -155,7 +155,7 @@ resource "azurerm_iothub" "test" {
     capacity = "1"
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }

azurerm/resource_arm_iothub_test.go

@@ -240,7 +240,7 @@ resource "azurerm_iothub" "test" {
     capacity = "1"
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -263,7 +263,7 @@ resource "azurerm_iothub" "import" {
     capacity = "1"
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -288,7 +288,7 @@ resource "azurerm_iothub" "test" {
     capacity = "1"
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -319,7 +319,7 @@ resource "azurerm_iothub" "test" {
 		action      = "Accept"
 	}
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -415,7 +415,7 @@ resource "azurerm_iothub" "test" {
     enabled        = true
   }
 
-  tags {
+  tags = {
     "purpose" = "testing"
   }
 }
@@ -446,7 +446,7 @@ resource "azurerm_iothub" "test" {
     enabled        = true
   }
 
-	tags {
+	tags = {
     "purpose" = "testing"
   }
 }

azurerm/resource_arm_kubernetes_cluster_test.go

@@ -1232,7 +1232,7 @@ resource "azurerm_virtual_network" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-  tags {
+  tags = {
     environment = "Testing"
   }
 }
@@ -1304,7 +1304,7 @@ resource "azurerm_virtual_network" "test" {
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
-  tags {
+  tags = {
     environment = "Testing"
   }
 }