Skip to content

Commit

Permalink
Merge pull request #7706 from kosinsky/hdi_36_deprication
Browse files Browse the repository at this point in the history 
Move HDInsight tests to 4.0 and mark 3.6 only resources deprecated
  • Loading branch information
@tombuildsstuff
tombuildsstuff committed Jul 14, 2020
2 parents 6f90a38 + 1163b51 commit fbf98e3
Show file tree
Hide file tree
Showing 12 changed files with 128 additions and 121 deletions.
5 changes: 5 additions & 0 deletions azurerm/internal/services/hdinsight/hdinsight_ml_services_cluster_resource.go
View file
Expand Up @@ -53,6 +53,11 @@ var hdInsightMLServicesClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition

func resourceArmHDInsightMLServicesCluster() *schema.Resource {
return &schema.Resource{
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),
Expand Down
5 changes: 5 additions & 0 deletions azurerm/internal/services/hdinsight/hdinsight_rserver_cluster_resource.go
View file
Expand Up @@ -53,6 +53,11 @@ var hdInsightRServerClusterEdgeNodeDefinition = azure.HDInsightNodeDefinition{

func resourceArmHDInsightRServerCluster() *schema.Resource {
return &schema.Resource{
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),
Expand Down
5 changes: 5 additions & 0 deletions azurerm/internal/services/hdinsight/hdinsight_storm_cluster_resource.go
View file
Expand Up @@ -42,6 +42,11 @@ var hdInsightStormClusterZookeeperNodeDefinition = azure.HDInsightNodeDefinition

func resourceArmHDInsightStormCluster() *schema.Resource {
return &schema.Resource{
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),
Expand Down
52 changes: 26 additions & 26 deletions azurerm/internal/services/hdinsight/tests/hdinsight_hadoop_cluster_resource_test.go
View file
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand Down
43 changes: 20 additions & 23 deletions azurerm/internal/services/hdinsight/tests/hdinsight_hbase_cluster_resource_test.go
View file
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit fbf98e3

Please sign in to comment.