From 71c0a623c60026bf988161e32db4094a4e95b2aa Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Fri, 10 Jul 2020 07:30:59 -0700
Subject: [PATCH 01/14] Move Hadoop tests to 4.0

---
 .../hdinsight_hadoop_cluster_resource_test.go | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

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 8ca388331c1d..7e4a4b40cca6 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
@@ -589,11 +589,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -735,11 +735,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -787,11 +787,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -857,11 +857,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -929,11 +929,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -991,11 +991,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -1053,10 +1053,10 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     enabled  = true
@@ -1116,10 +1116,10 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     enabled  = true
@@ -1239,11 +1239,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   tls_min_version     = "1.2"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     enabled  = true
@@ -1327,10 +1327,10 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     enabled  = true
@@ -1416,10 +1416,10 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     enabled  = true
@@ -1477,11 +1477,11 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
 
   gateway {
@@ -1533,10 +1533,10 @@ 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"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hadoop = "2.7"
+    hadoop = "3.1"
   }
   gateway {
     username = "acctestusrgw"

From f8a45ebdbb40e7a721a5e22ae0b4574d3e2f95d3 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Fri, 10 Jul 2020 11:00:01 -0700
Subject: [PATCH 02/14] Move HBase tests to 4.0

---
 .../hdinsight_hbase_cluster_resource_test.go  | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_hbase_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_hbase_cluster_resource_test.go
index da733bd9ca6a..98b67907ef30 100644
--- a/azurerm/internal/services/hdinsight/tests/hdinsight_hbase_cluster_resource_test.go
+++ b/azurerm/internal/services/hdinsight/tests/hdinsight_hbase_cluster_resource_test.go
@@ -434,11 +434,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -486,11 +486,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -570,7 +570,6 @@ resource "azurerm_hdinsight_hbase_cluster" "import" {
         for_each = lookup(roles.value, "head_node", [])
         content {
           password           = lookup(head_node.value, "password", null)
-          ssh_keys           = lookup(head_node.value, "ssh_keys", null)
           subnet_id          = lookup(head_node.value, "subnet_id", null)
           username           = head_node.value.username
           virtual_network_id = lookup(head_node.value, "virtual_network_id", null)
@@ -582,7 +581,6 @@ resource "azurerm_hdinsight_hbase_cluster" "import" {
         for_each = lookup(roles.value, "worker_node", [])
         content {
           password              = lookup(worker_node.value, "password", null)
-          ssh_keys              = lookup(worker_node.value, "ssh_keys", null)
           subnet_id             = lookup(worker_node.value, "subnet_id", null)
           target_instance_count = worker_node.value.target_instance_count
           username              = worker_node.value.username
@@ -595,7 +593,6 @@ resource "azurerm_hdinsight_hbase_cluster" "import" {
         for_each = lookup(roles.value, "zookeeper_node", [])
         content {
           password           = lookup(zookeeper_node.value, "password", null)
-          ssh_keys           = lookup(zookeeper_node.value, "ssh_keys", null)
           subnet_id          = lookup(zookeeper_node.value, "subnet_id", null)
           username           = zookeeper_node.value.username
           virtual_network_id = lookup(zookeeper_node.value, "virtual_network_id", null)
@@ -621,11 +618,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -673,11 +670,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -743,11 +740,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -815,11 +812,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -949,12 +946,12 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   tls_min_version     = "1.2"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {
@@ -1043,10 +1040,10 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
   gateway {
     enabled  = true
@@ -1132,10 +1129,10 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
   gateway {
     enabled  = true
@@ -1193,11 +1190,11 @@ resource "azurerm_hdinsight_hbase_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    hbase = "1.1"
+    hbase = "2.1"
   }
 
   gateway {

From 05e8a045549d2017b5327ed6717b75f41897d4d7 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Fri, 10 Jul 2020 18:28:45 -0700
Subject: [PATCH 03/14] Move Interactive Hive tests to 4.0

---
 ...interactive_query_cluster_resource_test.go | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_interactive_query_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_interactive_query_cluster_resource_test.go
index 23e6c6250d3a..d7eab06cccc4 100644
--- a/azurerm/internal/services/hdinsight/tests/hdinsight_interactive_query_cluster_resource_test.go
+++ b/azurerm/internal/services/hdinsight/tests/hdinsight_interactive_query_cluster_resource_test.go
@@ -434,11 +434,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -488,11 +488,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -572,7 +572,6 @@ resource "azurerm_hdinsight_interactive_query_cluster" "import" {
         for_each = lookup(roles.value, "head_node", [])
         content {
           password           = lookup(head_node.value, "password", null)
-          ssh_keys           = lookup(head_node.value, "ssh_keys", null)
           subnet_id          = lookup(head_node.value, "subnet_id", null)
           username           = head_node.value.username
           virtual_network_id = lookup(head_node.value, "virtual_network_id", null)
@@ -584,7 +583,6 @@ resource "azurerm_hdinsight_interactive_query_cluster" "import" {
         for_each = lookup(roles.value, "worker_node", [])
         content {
           password              = lookup(worker_node.value, "password", null)
-          ssh_keys              = lookup(worker_node.value, "ssh_keys", null)
           subnet_id             = lookup(worker_node.value, "subnet_id", null)
           target_instance_count = worker_node.value.target_instance_count
           username              = worker_node.value.username
@@ -597,7 +595,6 @@ resource "azurerm_hdinsight_interactive_query_cluster" "import" {
         for_each = lookup(roles.value, "zookeeper_node", [])
         content {
           password           = lookup(zookeeper_node.value, "password", null)
-          ssh_keys           = lookup(zookeeper_node.value, "ssh_keys", null)
           subnet_id          = lookup(zookeeper_node.value, "subnet_id", null)
           username           = zookeeper_node.value.username
           virtual_network_id = lookup(zookeeper_node.value, "virtual_network_id", null)
@@ -623,11 +620,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -675,11 +672,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -745,11 +742,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -817,11 +814,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -949,12 +946,12 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   tls_min_version     = "1.2"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {
@@ -1043,10 +1040,10 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
   gateway {
     enabled  = true
@@ -1132,10 +1129,10 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
   gateway {
     enabled  = true
@@ -1193,11 +1190,11 @@ resource "azurerm_hdinsight_interactive_query_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    interactive_hive = "2.1"
+    interactive_hive = "3.1"
   }
 
   gateway {

From 1ed382bda4af774766eba45155c7a92b138adbaf Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Sat, 11 Jul 2020 09:47:09 -0700
Subject: [PATCH 04/14] Move Kafka tests to 4.0

---
 .../hdinsight_kafka_cluster_resource_test.go  | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_kafka_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_kafka_cluster_resource_test.go
index a49218352ff6..25ad89b0bdde 100644
--- a/azurerm/internal/services/hdinsight/tests/hdinsight_kafka_cluster_resource_test.go
+++ b/azurerm/internal/services/hdinsight/tests/hdinsight_kafka_cluster_resource_test.go
@@ -437,11 +437,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -492,11 +492,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -577,7 +577,6 @@ resource "azurerm_hdinsight_kafka_cluster" "import" {
         for_each = lookup(roles.value, "head_node", [])
         content {
           password           = lookup(head_node.value, "password", null)
-          ssh_keys           = lookup(head_node.value, "ssh_keys", null)
           subnet_id          = lookup(head_node.value, "subnet_id", null)
           username           = head_node.value.username
           virtual_network_id = lookup(head_node.value, "virtual_network_id", null)
@@ -590,7 +589,6 @@ resource "azurerm_hdinsight_kafka_cluster" "import" {
         content {
           number_of_disks_per_node = worker_node.value.number_of_disks_per_node
           password                 = lookup(worker_node.value, "password", null)
-          ssh_keys                 = lookup(worker_node.value, "ssh_keys", null)
           subnet_id                = lookup(worker_node.value, "subnet_id", null)
           target_instance_count    = worker_node.value.target_instance_count
           username                 = worker_node.value.username
@@ -603,7 +601,6 @@ resource "azurerm_hdinsight_kafka_cluster" "import" {
         for_each = lookup(roles.value, "zookeeper_node", [])
         content {
           password           = lookup(zookeeper_node.value, "password", null)
-          ssh_keys           = lookup(zookeeper_node.value, "ssh_keys", null)
           subnet_id          = lookup(zookeeper_node.value, "subnet_id", null)
           username           = zookeeper_node.value.username
           virtual_network_id = lookup(zookeeper_node.value, "virtual_network_id", null)
@@ -629,11 +626,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -682,11 +679,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -753,11 +750,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -826,11 +823,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -959,12 +956,12 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   tls_min_version     = "1.2"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {
@@ -1054,10 +1051,10 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
   gateway {
     enabled  = true
@@ -1144,10 +1141,10 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
   gateway {
     enabled  = true
@@ -1206,11 +1203,11 @@ resource "azurerm_hdinsight_kafka_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    kafka = "1.1"
+    kafka = "2.1"
   }
 
   gateway {

From ba07c26190b20c4cb0ffc2a3d01cd12a2765a0b4 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Sat, 11 Jul 2020 16:24:04 -0700
Subject: [PATCH 05/14] Move Spark tests to 4.0

---
 .../hdinsight_spark_cluster_resource_test.go  | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_spark_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_spark_cluster_resource_test.go
index 72d2d0ff76ff..a341de2ff7f7 100644
--- a/azurerm/internal/services/hdinsight/tests/hdinsight_spark_cluster_resource_test.go
+++ b/azurerm/internal/services/hdinsight/tests/hdinsight_spark_cluster_resource_test.go
@@ -434,11 +434,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -488,11 +488,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -572,7 +572,6 @@ resource "azurerm_hdinsight_spark_cluster" "import" {
         for_each = lookup(roles.value, "head_node", [])
         content {
           password           = lookup(head_node.value, "password", null)
-          ssh_keys           = lookup(head_node.value, "ssh_keys", null)
           subnet_id          = lookup(head_node.value, "subnet_id", null)
           username           = head_node.value.username
           virtual_network_id = lookup(head_node.value, "virtual_network_id", null)
@@ -584,7 +583,6 @@ resource "azurerm_hdinsight_spark_cluster" "import" {
         for_each = lookup(roles.value, "worker_node", [])
         content {
           password              = lookup(worker_node.value, "password", null)
-          ssh_keys              = lookup(worker_node.value, "ssh_keys", null)
           subnet_id             = lookup(worker_node.value, "subnet_id", null)
           target_instance_count = worker_node.value.target_instance_count
           username              = worker_node.value.username
@@ -597,7 +595,6 @@ resource "azurerm_hdinsight_spark_cluster" "import" {
         for_each = lookup(roles.value, "zookeeper_node", [])
         content {
           password           = lookup(zookeeper_node.value, "password", null)
-          ssh_keys           = lookup(zookeeper_node.value, "ssh_keys", null)
           subnet_id          = lookup(zookeeper_node.value, "subnet_id", null)
           username           = zookeeper_node.value.username
           virtual_network_id = lookup(zookeeper_node.value, "virtual_network_id", null)
@@ -623,11 +620,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -675,11 +672,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -745,11 +742,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -817,11 +814,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -949,12 +946,12 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   tls_min_version     = "1.2"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {
@@ -1043,10 +1040,10 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
   gateway {
     enabled  = true
@@ -1132,10 +1129,10 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
   gateway {
     enabled  = true
@@ -1193,11 +1190,11 @@ resource "azurerm_hdinsight_spark_cluster" "test" {
   name                = "acctesthdi-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  cluster_version     = "3.6"
+  cluster_version     = "4.0"
   tier                = "Standard"
 
   component_version {
-    spark = "2.3"
+    spark = "2.4"
   }
 
   gateway {

From f0b8a5ef007761328d258ed9e1e41956d6203377 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Sun, 12 Jul 2020 08:06:27 -0700
Subject: [PATCH 06/14] Mark Storm as deprecated. Fix  requireImports test

---
 .../hdinsight/hdinsight_storm_cluster_resource.go        | 9 +++++----
 .../tests/hdinsight_storm_cluster_resource_test.go       | 3 ---
 website/docs/r/hdinsight_storm_cluster.html.markdown     | 3 +++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
index d6b4cea5aeaa..df19251a5701 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
@@ -42,10 +42,11 @@ var hdInsightStormClusterZookeeperNodeDefinition = azure.HDInsightNodeDefinition
 
 func resourceArmHDInsightStormCluster() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceArmHDInsightStormClusterCreate,
-		Read:   resourceArmHDInsightStormClusterRead,
-		Update: hdinsightClusterUpdate("Storm", resourceArmHDInsightStormClusterRead),
-		Delete: hdinsightClusterDelete("Storm"),
+		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		Create:             resourceArmHDInsightStormClusterCreate,
+		Read:               resourceArmHDInsightStormClusterRead,
+		Update:             hdinsightClusterUpdate("Storm", resourceArmHDInsightStormClusterRead),
+		Delete:             hdinsightClusterDelete("Storm"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
diff --git a/azurerm/internal/services/hdinsight/tests/hdinsight_storm_cluster_resource_test.go b/azurerm/internal/services/hdinsight/tests/hdinsight_storm_cluster_resource_test.go
index 4fa433e833dd..002537e5e732 100644
--- a/azurerm/internal/services/hdinsight/tests/hdinsight_storm_cluster_resource_test.go
+++ b/azurerm/internal/services/hdinsight/tests/hdinsight_storm_cluster_resource_test.go
@@ -492,7 +492,6 @@ resource "azurerm_hdinsight_storm_cluster" "import" {
         for_each = lookup(roles.value, "head_node", [])
         content {
           password           = lookup(head_node.value, "password", null)
-          ssh_keys           = lookup(head_node.value, "ssh_keys", null)
           subnet_id          = lookup(head_node.value, "subnet_id", null)
           username           = head_node.value.username
           virtual_network_id = lookup(head_node.value, "virtual_network_id", null)
@@ -504,7 +503,6 @@ resource "azurerm_hdinsight_storm_cluster" "import" {
         for_each = lookup(roles.value, "worker_node", [])
         content {
           password              = lookup(worker_node.value, "password", null)
-          ssh_keys              = lookup(worker_node.value, "ssh_keys", null)
           subnet_id             = lookup(worker_node.value, "subnet_id", null)
           target_instance_count = worker_node.value.target_instance_count
           username              = worker_node.value.username
@@ -517,7 +515,6 @@ resource "azurerm_hdinsight_storm_cluster" "import" {
         for_each = lookup(roles.value, "zookeeper_node", [])
         content {
           password           = lookup(zookeeper_node.value, "password", null)
-          ssh_keys           = lookup(zookeeper_node.value, "ssh_keys", null)
           subnet_id          = lookup(zookeeper_node.value, "subnet_id", null)
           username           = zookeeper_node.value.username
           virtual_network_id = lookup(zookeeper_node.value, "virtual_network_id", null)
diff --git a/website/docs/r/hdinsight_storm_cluster.html.markdown b/website/docs/r/hdinsight_storm_cluster.html.markdown
index f82c7b7246b2..76cdef0b2d0c 100644
--- a/website/docs/r/hdinsight_storm_cluster.html.markdown
+++ b/website/docs/r/hdinsight_storm_cluster.html.markdown
@@ -10,6 +10,9 @@ description: |-
 
 Manages a HDInsight Storm Cluster.
 
+~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020 and Apache Storm isn't supported in HDInsight 4.0. More details about available versions of HDInsight: https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions 
+
+
 ## Example Usage
 
 ```hcl

From d8e0871d38286ebadcc269bab7a03be62e3a2036 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Sun, 12 Jul 2020 08:28:55 -0700
Subject: [PATCH 07/14] Malr RServer and MLService as deprecated

---
 .../hdinsight/hdinsight_ml_services_cluster_resource.go  | 9 +++++----
 .../hdinsight/hdinsight_rserver_cluster_resource.go      | 9 +++++----
 .../docs/r/hdinsight_ml_services_cluster.html.markdown   | 2 ++
 website/docs/r/hdinsight_rserver_cluster.html.markdown   | 2 ++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
index 3141c93a50fc..587b1ba81a5b 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
@@ -53,10 +53,11 @@ var hdInsightMLServicesClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition
 
 func resourceArmHDInsightMLServicesCluster() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceArmHDInsightMLServicesClusterCreate,
-		Read:   resourceArmHDInsightMLServicesClusterRead,
-		Update: hdinsightClusterUpdate("MLServices", resourceArmHDInsightMLServicesClusterRead),
-		Delete: hdinsightClusterDelete("MLServices"),
+		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		Create:             resourceArmHDInsightMLServicesClusterCreate,
+		Read:               resourceArmHDInsightMLServicesClusterRead,
+		Update:             hdinsightClusterUpdate("MLServices", resourceArmHDInsightMLServicesClusterRead),
+		Delete:             hdinsightClusterDelete("MLServices"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
diff --git a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
index 6781520975a7..9281907b33eb 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
@@ -53,10 +53,11 @@ var hdInsightRServerClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition{
 
 func resourceArmHDInsightRServerCluster() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceArmHDInsightRServerClusterCreate,
-		Read:   resourceArmHDInsightRServerClusterRead,
-		Update: hdinsightClusterUpdate("RServer", resourceArmHDInsightRServerClusterRead),
-		Delete: hdinsightClusterDelete("RServer"),
+		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		Create:             resourceArmHDInsightRServerClusterCreate,
+		Read:               resourceArmHDInsightRServerClusterRead,
+		Update:             hdinsightClusterUpdate("RServer", resourceArmHDInsightRServerClusterRead),
+		Delete:             hdinsightClusterDelete("RServer"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
diff --git a/website/docs/r/hdinsight_ml_services_cluster.html.markdown b/website/docs/r/hdinsight_ml_services_cluster.html.markdown
index 0769ac41a08e..01752c364234 100644
--- a/website/docs/r/hdinsight_ml_services_cluster.html.markdown
+++ b/website/docs/r/hdinsight_ml_services_cluster.html.markdown
@@ -10,6 +10,8 @@ description: |-
 
 Manages a HDInsight ML Services Cluster.
 
+~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020. More details: https://docs.microsoft.com/en-us/azure/hdinsight/r-server/r-server-overview#simple-secure-and-high-scale-operationalization-and-administration
+
 ## Example Usage
 
 ```hcl
diff --git a/website/docs/r/hdinsight_rserver_cluster.html.markdown b/website/docs/r/hdinsight_rserver_cluster.html.markdown
index caad16c7e9ad..6a3b1326bdc1 100644
--- a/website/docs/r/hdinsight_rserver_cluster.html.markdown
+++ b/website/docs/r/hdinsight_rserver_cluster.html.markdown
@@ -10,6 +10,8 @@ description: |-
 
 Manages a HDInsight RServer Cluster.
 
+~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020. More details: https://docs.microsoft.com/en-us/azure/hdinsight/r-server/r-server-overview#simple-secure-and-high-scale-operationalization-and-administration
+
 ## Example Usage
 
 ```hcl

From 0e53e94f749aefba792b41de66a4602c75a3c748 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:49:06 -0700
Subject: [PATCH 08/14] Deprecation messages

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 .../hdinsight/hdinsight_ml_services_cluster_resource.go     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
index 587b1ba81a5b..d6e191b707c7 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
@@ -53,7 +53,11 @@ var hdInsightMLServicesClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition
 
 func resourceArmHDInsightMLServicesCluster() *schema.Resource {
 	return &schema.Resource{
-		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		DeprecationMessage: `HDInsight 3.6 will be retired on 2020-12-31 - MLServices is not supported in HDInsight 4.0 and so this resource will be removed in the next major version of the AzureRM Terraform Provider.
+		
+More information on the HDInsight 3.6 deprecation can be found at:
+
+https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
 		Create:             resourceArmHDInsightMLServicesClusterCreate,
 		Read:               resourceArmHDInsightMLServicesClusterRead,
 		Update:             hdinsightClusterUpdate("MLServices", resourceArmHDInsightMLServicesClusterRead),

From 8fdecced6c5d8bf2c91bcd66527dee6f8f46a668 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:49:22 -0700
Subject: [PATCH 09/14] Deprecation messages

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 .../services/hdinsight/hdinsight_storm_cluster_resource.go  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
index df19251a5701..44ae2c115d34 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
@@ -42,7 +42,11 @@ var hdInsightStormClusterZookeeperNodeDefinition = azure.HDInsightNodeDefinition
 
 func resourceArmHDInsightStormCluster() *schema.Resource {
 	return &schema.Resource{
-		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		DeprecationMessage: `HDInsight 3.6 will be retired on 2020-12-31 - Storm is not supported in HDInsight 4.0 and so this resource will be removed in the next major version of the AzureRM Terraform Provider.
+		
+More information on the HDInsight 3.6 deprecation can be found at:
+
+https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
 		Create:             resourceArmHDInsightStormClusterCreate,
 		Read:               resourceArmHDInsightStormClusterRead,
 		Update:             hdinsightClusterUpdate("Storm", resourceArmHDInsightStormClusterRead),

From 1b3c4d7f6786432eab5119610ac87c5b0423719b Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:49:37 -0700
Subject: [PATCH 10/14] Deprecation messages

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 .../hdinsight/hdinsight_rserver_cluster_resource.go         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
index 9281907b33eb..51f159f3874d 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
@@ -53,7 +53,11 @@ var hdInsightRServerClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition{
 
 func resourceArmHDInsightRServerCluster() *schema.Resource {
 	return &schema.Resource{
-		DeprecationMessage: "Due to HDInsight 3.6 retirement on December 31, 2020",
+		DeprecationMessage: `HDInsight 3.6 will be retired on 2020-12-31 - R Server is not supported in HDInsight 4.0 and so this resource will be removed in the next major version of the AzureRM Terraform Provider.
+		
+More information on the HDInsight 3.6 deprecation can be found at:
+
+https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
 		Create:             resourceArmHDInsightRServerClusterCreate,
 		Read:               resourceArmHDInsightRServerClusterRead,
 		Update:             hdinsightClusterUpdate("RServer", resourceArmHDInsightRServerClusterRead),

From 0c025f5191869d547117ad5aaa112ef99149c09e Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:50:05 -0700
Subject: [PATCH 11/14] Deprecation doc

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 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 01752c364234..5fe79336a15d 100644
--- a/website/docs/r/hdinsight_ml_services_cluster.html.markdown
+++ b/website/docs/r/hdinsight_ml_services_cluster.html.markdown
@@ -10,7 +10,7 @@ description: |-
 
 Manages a HDInsight ML Services Cluster.
 
-~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020. More details: https://docs.microsoft.com/en-us/azure/hdinsight/r-server/r-server-overview#simple-secure-and-high-scale-operationalization-and-administration
+!> **Note:** [HDInsight 3.6 is deprecated and will be retired on 2020-12-31 - HDInsight 4.0 no longer supports ML Services Clusters](https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions) - as such this Terraform resource is deprecated and will be removed in the next major version of the AzureRM Terraform Provider.
 
 ## Example Usage
 

From da917330c9e905cf0e61e9c35a588feb257ecdb2 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:50:19 -0700
Subject: [PATCH 12/14] Deprecation doc

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 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 6a3b1326bdc1..3c2c511a77d6 100644
--- a/website/docs/r/hdinsight_rserver_cluster.html.markdown
+++ b/website/docs/r/hdinsight_rserver_cluster.html.markdown
@@ -10,7 +10,7 @@ description: |-
 
 Manages a HDInsight RServer Cluster.
 
-~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020. More details: https://docs.microsoft.com/en-us/azure/hdinsight/r-server/r-server-overview#simple-secure-and-high-scale-operationalization-and-administration
+!> **Note:** [HDInsight 3.6 is deprecated and will be retired on 2020-12-31 - HDInsight 4.0 no longer supports RServer Clusters](https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions) - as such this Terraform resource is deprecated and will be removed in the next major version of the AzureRM Terraform Provider.
 
 ## Example Usage
 

From f68a424e0115f534c9c1d884d4b6b0f98c8e76c6 Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kokosins@microsoft.com>
Date: Mon, 13 Jul 2020 07:50:30 -0700
Subject: [PATCH 13/14] Deprecation doc

Co-authored-by: Tom Harvey <tombuildsstuff@users.noreply.github.com>
---
 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 76cdef0b2d0c..f0479ed8ac36 100644
--- a/website/docs/r/hdinsight_storm_cluster.html.markdown
+++ b/website/docs/r/hdinsight_storm_cluster.html.markdown
@@ -10,7 +10,7 @@ description: |-
 
 Manages a HDInsight Storm Cluster.
 
-~> **NOTE:** This resource has been deprecated due to HDInsight 3.6 retirement on December 31, 2020 and Apache Storm isn't supported in HDInsight 4.0. More details about available versions of HDInsight: https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions 
+!> **Note:** [HDInsight 3.6 is deprecated and will be retired on 2020-12-31 - HDInsight 4.0 no longer supports Storm Clusters](https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions) - as such this Terraform resource is deprecated and will be removed in the next major version of the AzureRM Terraform Provider.
 
 
 ## Example Usage

From 1163b5130f9b1ba3eb221172754b2b554950a4ee Mon Sep 17 00:00:00 2001
From: Konstantin Kosinsky <kosinsky@github.com>
Date: Mon, 13 Jul 2020 08:30:42 -0700
Subject: [PATCH 14/14] Fir message formatting

---
 .../hdinsight/hdinsight_ml_services_cluster_resource.go   | 8 ++++----
 .../hdinsight/hdinsight_rserver_cluster_resource.go       | 8 ++++----
 .../hdinsight/hdinsight_storm_cluster_resource.go         | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
index d6e191b707c7..95df79f40636 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
@@ -58,10 +58,10 @@ func resourceArmHDInsightMLServicesCluster() *schema.Resource {
 More information on the HDInsight 3.6 deprecation can be found at:
 
 https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
-		Create:             resourceArmHDInsightMLServicesClusterCreate,
-		Read:               resourceArmHDInsightMLServicesClusterRead,
-		Update:             hdinsightClusterUpdate("MLServices", resourceArmHDInsightMLServicesClusterRead),
-		Delete:             hdinsightClusterDelete("MLServices"),
+		Create: resourceArmHDInsightMLServicesClusterCreate,
+		Read:   resourceArmHDInsightMLServicesClusterRead,
+		Update: hdinsightClusterUpdate("MLServices", resourceArmHDInsightMLServicesClusterRead),
+		Delete: hdinsightClusterDelete("MLServices"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
diff --git a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
index 51f159f3874d..54728fe42560 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
@@ -58,10 +58,10 @@ func resourceArmHDInsightRServerCluster() *schema.Resource {
 More information on the HDInsight 3.6 deprecation can be found at:
 
 https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
-		Create:             resourceArmHDInsightRServerClusterCreate,
-		Read:               resourceArmHDInsightRServerClusterRead,
-		Update:             hdinsightClusterUpdate("RServer", resourceArmHDInsightRServerClusterRead),
-		Delete:             hdinsightClusterDelete("RServer"),
+		Create: resourceArmHDInsightRServerClusterCreate,
+		Read:   resourceArmHDInsightRServerClusterRead,
+		Update: hdinsightClusterUpdate("RServer", resourceArmHDInsightRServerClusterRead),
+		Delete: hdinsightClusterDelete("RServer"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
diff --git a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
index 44ae2c115d34..5cab2a1bb838 100644
--- a/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
+++ b/azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
@@ -47,10 +47,10 @@ func resourceArmHDInsightStormCluster() *schema.Resource {
 More information on the HDInsight 3.6 deprecation can be found at:
 
 https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-component-versioning#available-versions`,
-		Create:             resourceArmHDInsightStormClusterCreate,
-		Read:               resourceArmHDInsightStormClusterRead,
-		Update:             hdinsightClusterUpdate("Storm", resourceArmHDInsightStormClusterRead),
-		Delete:             hdinsightClusterDelete("Storm"),
+		Create: resourceArmHDInsightStormClusterCreate,
+		Read:   resourceArmHDInsightStormClusterRead,
+		Update: hdinsightClusterUpdate("Storm", resourceArmHDInsightStormClusterRead),
+		Delete: hdinsightClusterDelete("Storm"),
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},