Skip to content

Commit 63304cc

Browse files
d/hdinsight: force lower-casing the kind
1 parent 1a22656 commit 63304cc

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

azurerm/data_source_hdinsight_cluster.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package azurerm
33
import (
44
"fmt"
55
"log"
6+
"strings"
67

78
"github.com/hashicorp/terraform/helper/schema"
89
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
@@ -120,7 +121,9 @@ func dataSourceArmHDInsightClusterRead(d *schema.ResourceData, meta interface{})
120121

121122
if def := props.ClusterDefinition; def != nil {
122123
d.Set("component_versions", flattenHDInsightsDataSourceComponentVersions(def.ComponentVersion))
123-
d.Set("kind", def.Kind)
124+
if kind := def.Kind; kind != nil {
125+
d.Set("kind", strings.ToLower(*kind))
126+
}
124127
if err := d.Set("gateway", azure.FlattenHDInsightsConfigurations(configuration.Value)); err != nil {
125128
return fmt.Errorf("Error flattening `gateway`: %+v", err)
126129
}

azurerm/data_source_hdinsight_cluster_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_hadoop(t *testing.T) {
2323
{
2424
Config: testAccDataSourceHDInsightCluster_hadoop(rInt, rString, location),
2525
Check: resource.ComposeTestCheckFunc(
26-
resource.TestCheckResourceAttr(dataSourceName, "kind", "HADOOP"),
26+
resource.TestCheckResourceAttr(dataSourceName, "kind", "hadoop"),
2727
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
2828
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
2929
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -47,7 +47,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_hbase(t *testing.T) {
4747
{
4848
Config: testAccDataSourceHDInsightCluster_hbase(rInt, rString, location),
4949
Check: resource.ComposeTestCheckFunc(
50-
resource.TestCheckResourceAttr(dataSourceName, "kind", "HBASE"),
50+
resource.TestCheckResourceAttr(dataSourceName, "kind", "hbase"),
5151
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
5252
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
5353
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -71,7 +71,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_interactiveQuery(t *testing.T) {
7171
{
7272
Config: testAccDataSourceHDInsightCluster_interactiveQuery(rInt, rString, location),
7373
Check: resource.ComposeTestCheckFunc(
74-
resource.TestCheckResourceAttr(dataSourceName, "kind", "INTERACTIVEQUERY"),
74+
resource.TestCheckResourceAttr(dataSourceName, "kind", "interactivehive"),
7575
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
7676
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
7777
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -95,7 +95,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_kafka(t *testing.T) {
9595
{
9696
Config: testAccDataSourceHDInsightCluster_kafka(rInt, rString, location),
9797
Check: resource.ComposeTestCheckFunc(
98-
resource.TestCheckResourceAttr(dataSourceName, "kind", "KAFKA"),
98+
resource.TestCheckResourceAttr(dataSourceName, "kind", "kafka"),
9999
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
100100
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
101101
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -119,7 +119,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_mlServices(t *testing.T) {
119119
{
120120
Config: testAccDataSourceHDInsightCluster_mlServices(rInt, rString, location),
121121
Check: resource.ComposeTestCheckFunc(
122-
resource.TestCheckResourceAttr(dataSourceName, "kind", "MLSERVICES"),
122+
resource.TestCheckResourceAttr(dataSourceName, "kind", "mlservices"),
123123
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
124124
resource.TestCheckResourceAttrSet(dataSourceName, "edge_ssh_endpoint"),
125125
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -143,7 +143,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_rserver(t *testing.T) {
143143
{
144144
Config: testAccDataSourceHDInsightCluster_rserver(rInt, rString, location),
145145
Check: resource.ComposeTestCheckFunc(
146-
resource.TestCheckResourceAttr(dataSourceName, "kind", "RSERVER"),
146+
resource.TestCheckResourceAttr(dataSourceName, "kind", "rserver"),
147147
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
148148
resource.TestCheckResourceAttrSet(dataSourceName, "edge_ssh_endpoint"),
149149
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -167,7 +167,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_spark(t *testing.T) {
167167
{
168168
Config: testAccDataSourceHDInsightCluster_spark(rInt, rString, location),
169169
Check: resource.ComposeTestCheckFunc(
170-
resource.TestCheckResourceAttr(dataSourceName, "kind", "SPARK"),
170+
resource.TestCheckResourceAttr(dataSourceName, "kind", "spark"),
171171
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
172172
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
173173
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),
@@ -191,7 +191,7 @@ func TestAccDataSourceAzureRMHDInsightCluster_storm(t *testing.T) {
191191
{
192192
Config: testAccDataSourceHDInsightCluster_storm(rInt, rString, location),
193193
Check: resource.ComposeTestCheckFunc(
194-
resource.TestCheckResourceAttr(dataSourceName, "kind", "STORM"),
194+
resource.TestCheckResourceAttr(dataSourceName, "kind", "storm"),
195195
resource.TestCheckResourceAttr(dataSourceName, "tier", "standard"),
196196
resource.TestCheckResourceAttr(dataSourceName, "edge_ssh_endpoint", ""),
197197
resource.TestCheckResourceAttrSet(dataSourceName, "https_endpoint"),

0 commit comments

Comments
 (0)