Skip to content

Commit df05a43

Browse files
moremagicmoremagic
committed
Fixed to use constant value for ClusterType
1 parent 6f86efb commit df05a43

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎internal/service/kafka/cluster.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,11 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta int
560560
}
561561

562562
clusterType := d.Get("cluster_type").(string)
563-
if clusterType == "serverless" {
563+
if clusterType == kafka.ClusterTypeServerless {
564564
if v, ok := d.GetOk("serverless"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
565565
inputV2.Serverless = expandServerlessRequest(v.([]interface{})[0].(map[string]interface{}))
566566
}
567-
} else if clusterType == "provisioned" {
567+
} else if clusterType == kafka.ClusterTypeProvisioned {
568568
if v, ok := d.GetOk("provisioned"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
569569
inputV2.Provisioned = expandProvisionedRequest(v.([]interface{})[0].(map[string]interface{}))
570570
}
@@ -624,13 +624,13 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
624624
d.Set("current_version", cluster.CurrentVersion)
625625

626626
if cluster.Provisioned != nil {
627-
d.Set("cluster_type", aws.String("provisioned"))
627+
d.Set("cluster_type", aws.String(kafka.ClusterTypeProvisioned))
628628
if err := d.Set("provisioned", []interface{}{flattenProvisioned(cluster.Provisioned)}); err != nil {
629629
return diag.Errorf("setting provisioned: %s", err)
630630
}
631631
}
632632
if cluster.Serverless != nil {
633-
d.Set("cluster_type", aws.String("serverless"))
633+
d.Set("cluster_type", aws.String(kafka.ClusterTypeServerless))
634634
if err := d.Set("serverless", []interface{}{flattenServerless(cluster.Serverless)}); err != nil {
635635
return diag.Errorf("setting serverless: %s", err)
636636
}

‎internal/service/kafka/cluster_test.go

+28-28
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestAccKafkaCluster_Basic_Provisioned(t *testing.T) {
6969
resource.TestMatchResourceAttr(resourceName, "bootstrap_brokers_tls", clusterBoostrapBrokersTLSRegexp),
7070
testAccCheckResourceAttrIsSortedCSV(resourceName, "bootstrap_brokers_tls"),
7171
resource.TestCheckResourceAttr(resourceName, "cluster_name", rName),
72-
resource.TestCheckResourceAttr(resourceName, "cluster_type", "provisioned"),
72+
resource.TestCheckResourceAttr(resourceName, "cluster_type", kafka.ClusterTypeProvisioned),
7373
resource.TestCheckResourceAttr(resourceName, "provisioned.0.broker_node_group_info.#", "1"),
7474
resource.TestCheckResourceAttr(resourceName, "provisioned.0.broker_node_group_info.0.az_distribution", kafka.BrokerAZDistributionDefault),
7575
resource.TestCheckResourceAttr(resourceName, "provisioned.0.broker_node_group_info.0.ebs_volume_size", "10"),
@@ -133,7 +133,7 @@ func TestAccKafkaCluster_Basic_Serverless(t *testing.T) {
133133
resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers_public_tls", ""),
134134
resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers_sasl_scram", ""),
135135
resource.TestCheckResourceAttr(resourceName, "cluster_name", rName),
136-
resource.TestCheckResourceAttr(resourceName, "cluster_type", "serverless"),
136+
resource.TestCheckResourceAttr(resourceName, "cluster_type", kafka.ClusterTypeServerless),
137137
resource.TestCheckResourceAttr(resourceName, "serverless.0.client_authentication.0.sasl.0.iam", "true"),
138138
resource.TestCheckResourceAttr(resourceName, "serverless.0.vpc_configs.0.security_group_ids.#", "1"),
139139
resource.TestCheckTypeSetElemAttrPair(resourceName, "serverless.0.vpc_configs.0.security_group_ids.*", "aws_security_group.example_sg", "id"),
@@ -1473,7 +1473,7 @@ func testAccClusterConfig_basicProvisioned(rName string) string {
14731473
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
14741474
resource "aws_msk_cluster" "test" {
14751475
cluster_name = %[1]q
1476-
cluster_type = "provisioned"
1476+
cluster_type = "PROVISIONED"
14771477
14781478
provisioned {
14791479
kafka_version = "2.7.1"
@@ -1493,7 +1493,7 @@ func testAccClusterConfig_basicServerless(rName string) string {
14931493
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
14941494
resource "aws_msk_cluster" "test" {
14951495
cluster_name = %[1]q
1496-
cluster_type = "serverless"
1496+
cluster_type = "SERVERLESS"
14971497
14981498
serverless {
14991499
client_authentication {
@@ -1515,7 +1515,7 @@ func testAccClusterConfig_deprecatedBrokerNodeGroupInfoEBSVolumeSize(rName strin
15151515
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
15161516
resource "aws_msk_cluster" "test" {
15171517
cluster_name = %[1]q
1518-
cluster_type = "provisioned"
1518+
cluster_type = "PROVISIONED"
15191519
15201520
provisioned {
15211521
kafka_version = "2.7.1"
@@ -1535,7 +1535,7 @@ func testAccClusterConfig_brokerNodeGroupInfoStorageInfoVolumeSizeOnly(rName str
15351535
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
15361536
resource "aws_msk_cluster" "test" {
15371537
cluster_name = %[1]q
1538-
cluster_type = "provisioned"
1538+
cluster_type = "PROVISIONED"
15391539
15401540
provisioned {
15411541
kafka_version = "2.7.1"
@@ -1559,7 +1559,7 @@ func testAccClusterConfig_brokerNodeGroupInfoStorageInfoVolumeSizeSetAndProvThro
15591559
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
15601560
resource "aws_msk_cluster" "test" {
15611561
cluster_name = %[1]q
1562-
cluster_type = "provisioned"
1562+
cluster_type = "PROVISIONED"
15631563
15641564
provisioned {
15651565
kafka_version = "2.7.1"
@@ -1586,7 +1586,7 @@ func testAccClusterConfig_brokerNodeGroupInfoStorageInfoVolumeSizeSetAndProvThro
15861586
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
15871587
resource "aws_msk_cluster" "test" {
15881588
cluster_name = %[1]q
1589-
cluster_type = "provisioned"
1589+
cluster_type = "PROVISIONED"
15901590
15911591
provisioned {
15921592
kafka_version = "2.7.1"
@@ -1614,7 +1614,7 @@ func testAccClusterConfig_brokerNodeGroupInfoInstanceType(rName string, t string
16141614
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
16151615
resource "aws_msk_cluster" "test" {
16161616
cluster_name = %[1]q
1617-
cluster_type = "provisioned"
1617+
cluster_type = "PROVISIONED"
16181618
16191619
provisioned {
16201620
kafka_version = "2.7.1"
@@ -1649,7 +1649,7 @@ func testAccClusterConfig_brokerNodeGroupInfoNoPublicAccessSASLIAM(rName string)
16491649
fmt.Sprintf(`
16501650
resource "aws_msk_cluster" "test" {
16511651
cluster_name = %[1]q
1652-
cluster_type = "provisioned"
1652+
cluster_type = "PROVISIONED"
16531653
16541654
provisioned {
16551655
kafka_version = "2.7.1"
@@ -1683,7 +1683,7 @@ func testAccClusterConfig_brokerNodeGroupInfoPublicAccessSASLIAM(rName string, p
16831683
fmt.Sprintf(`
16841684
resource "aws_msk_cluster" "test" {
16851685
cluster_name = %[1]q
1686-
cluster_type = "provisioned"
1686+
cluster_type = "PROVISIONED"
16871687
16881688
provisioned {
16891689
kafka_version = "2.7.1"
@@ -1742,7 +1742,7 @@ func testAccClusterConfig_clientAuthenticationTLSCertificateAuthorityARNs(rName,
17421742
fmt.Sprintf(`
17431743
resource "aws_msk_cluster" "test" {
17441744
cluster_name = %[1]q
1745-
cluster_type = "provisioned"
1745+
cluster_type = "PROVISIONED"
17461746
17471747
provisioned {
17481748
kafka_version = "2.7.1"
@@ -1782,7 +1782,7 @@ func testAccClusterConfig_rootCANoClientAuthentication(rName, commonName string)
17821782
fmt.Sprintf(`
17831783
resource "aws_msk_cluster" "test" {
17841784
cluster_name = %[1]q
1785-
cluster_type = "provisioned"
1785+
cluster_type = "PROVISIONED"
17861786
17871787
provisioned {
17881788
kafka_version = "2.7.1"
@@ -1809,7 +1809,7 @@ func testAccClusterConfig_clientAuthenticationSASLScram(rName string, scramEnabl
18091809
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
18101810
resource "aws_msk_cluster" "test" {
18111811
cluster_name = %[1]q
1812-
cluster_type = "provisioned"
1812+
cluster_type = "PROVISIONED"
18131813
18141814
provisioned {
18151815
kafka_version = "2.7.1"
@@ -1837,7 +1837,7 @@ func testAccClusterConfig_clientAuthenticationSASLIAM(rName string, saslEnabled
18371837
18381838
resource "aws_msk_cluster" "test" {
18391839
cluster_name = %[1]q
1840-
cluster_type = "provisioned"
1840+
cluster_type = "PROVISIONED"
18411841
18421842
provisioned {
18431843
kafka_version = "2.7.1"
@@ -1872,7 +1872,7 @@ PROPERTIES
18721872
18731873
resource "aws_msk_cluster" "test" {
18741874
cluster_name = %[1]q
1875-
cluster_type = "provisioned"
1875+
cluster_type = "PROVISIONED"
18761876
18771877
provisioned {
18781878
kafka_version = "2.7.1"
@@ -1915,7 +1915,7 @@ PROPERTIES
19151915
19161916
resource "aws_msk_cluster" "test" {
19171917
cluster_name = %[1]q
1918-
cluster_type = "provisioned"
1918+
cluster_type = "PROVISIONED"
19191919
19201920
provisioned {
19211921
kafka_version = "2.7.1"
@@ -1948,7 +1948,7 @@ resource "aws_kms_key" "example_key" {
19481948
19491949
resource "aws_msk_cluster" "test" {
19501950
cluster_name = %[1]q
1951-
cluster_type = "provisioned"
1951+
cluster_type = "PROVISIONED"
19521952
19531953
provisioned {
19541954
kafka_version = "2.7.1"
@@ -1973,7 +1973,7 @@ func testAccClusterConfig_encryptionInfoEncryptionInTransitClientBroker(rName, c
19731973
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
19741974
resource "aws_msk_cluster" "test" {
19751975
cluster_name = %[1]q
1976-
cluster_type = "provisioned"
1976+
cluster_type = "PROVISIONED"
19771977
19781978
provisioned {
19791979
kafka_version = "2.7.1"
@@ -1999,7 +1999,7 @@ func testAccClusterConfig_encryptionInfoEncryptionInTransitIn(rName string, inCl
19991999
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
20002000
resource "aws_msk_cluster" "test" {
20012001
cluster_name = %[1]q
2002-
cluster_type = "provisioned"
2002+
cluster_type = "PROVISIONED"
20032003
20042004
provisioned {
20052005
kafka_version = "2.7.1"
@@ -2025,7 +2025,7 @@ func testAccClusterConfig_enhancedMonitoring(rName, enhancedMonitoring string) s
20252025
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
20262026
resource "aws_msk_cluster" "test" {
20272027
cluster_name = %[1]q
2028-
cluster_type = "provisioned"
2028+
cluster_type = "PROVISIONED"
20292029
20302030
provisioned {
20312031
kafka_version = "2.7.1"
@@ -2047,7 +2047,7 @@ func testAccClusterConfig_numberOfBrokerNodes(rName string, brokerCount int) str
20472047
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
20482048
resource "aws_msk_cluster" "test" {
20492049
cluster_name = %[1]q
2050-
cluster_type = "provisioned"
2050+
cluster_type = "PROVISIONED"
20512051
20522052
provisioned {
20532053
kafka_version = "2.7.1"
@@ -2068,7 +2068,7 @@ func testAccClusterConfig_openMonitoring(rName string, jmxExporterEnabled bool,
20682068
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
20692069
resource "aws_msk_cluster" "test" {
20702070
cluster_name = %[1]q
2071-
cluster_type = "provisioned"
2071+
cluster_type = "PROVISIONED"
20722072
20732073
provisioned {
20742074
kafka_version = "2.7.1"
@@ -2169,7 +2169,7 @@ resource "aws_kinesis_firehose_delivery_stream" "test" {
21692169
21702170
resource "aws_msk_cluster" "test" {
21712171
cluster_name = %[1]q
2172-
cluster_type = "provisioned"
2172+
cluster_type = "PROVISIONED"
21732173
21742174
provisioned {
21752175
kafka_version = "2.7.1"
@@ -2207,7 +2207,7 @@ func testAccClusterConfig_version(rName string, kafkaVersion string) string {
22072207
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
22082208
resource "aws_msk_cluster" "test" {
22092209
cluster_name = %[1]q
2210-
cluster_type = "provisioned"
2210+
cluster_type = "PROVISIONED"
22112211
22122212
provisioned {
22132213
kafka_version = %[2]q
@@ -2256,7 +2256,7 @@ PROPERTIES
22562256
22572257
resource "aws_msk_cluster" "test" {
22582258
cluster_name = %[1]q
2259-
cluster_type = "provisioned"
2259+
cluster_type = "PROVISIONED"
22602260
22612261
provisioned {
22622262
kafka_version = %[2]q
@@ -2287,7 +2287,7 @@ func testAccClusterConfig_tags1(rName, tagKey1, tagValue1 string) string {
22872287
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
22882288
resource "aws_msk_cluster" "test" {
22892289
cluster_name = %[1]q
2290-
cluster_type = "provisioned"
2290+
cluster_type = "PROVISIONED"
22912291
22922292
provisioned {
22932293
kafka_version = "2.7.1"
@@ -2312,7 +2312,7 @@ func testAccClusterConfig_tags2(rName, tagKey1, tagValue1, tagKey2, tagValue2 st
23122312
return acctest.ConfigCompose(testAccClusterBaseConfig(rName), fmt.Sprintf(`
23132313
resource "aws_msk_cluster" "test" {
23142314
cluster_name = %[1]q
2315-
cluster_type = "provisioned"
2315+
cluster_type = "PROVISIONED"
23162316
23172317
provisioned {
23182318
kafka_version = "2.7.1"

0 commit comments

Comments
 (0)