Order bootstrap brokers from msk

aws/data_source_aws_msk_cluster.go

@@ -2,6 +2,8 @@ package aws
 
 import (
 	"fmt"
+	"sort"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/kafka"
@@ -103,7 +105,7 @@ func dataSourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error
 	}
 
 	d.Set("arn", aws.StringValue(cluster.ClusterArn))
-	d.Set("bootstrap_brokers", aws.StringValue(bootstrapBrokersoOutput.BootstrapBrokerString))
+	d.Set("bootstrap_brokers", sortDataSourceBrokers(aws.StringValue(bootstrapBrokersoOutput.BootstrapBrokerString)))
 	d.Set("bootstrap_brokers_sasl_scram", aws.StringValue(bootstrapBrokersoOutput.BootstrapBrokerStringSaslScram))
 	d.Set("bootstrap_brokers_tls", aws.StringValue(bootstrapBrokersoOutput.BootstrapBrokerStringTls))
 	d.Set("cluster_name", aws.StringValue(cluster.ClusterName))
@@ -120,3 +122,9 @@ func dataSourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error
 
 	return nil
 }
+
+func sortDataSourceBrokers(s string) string {
+	splitBootstrapBrokers := strings.Split(s, ",")
+	sort.Strings(splitBootstrapBrokers)
+	return strings.Join(splitBootstrapBrokers, ",")
+}

aws/data_source_aws_msk_cluster_test.go

@@ -61,3 +61,10 @@ data "aws_msk_cluster" "test" {
 }
 `, rName)
 }
+
+func TestAccMskClusterDataSource_SortBrokers(t *testing.T) {
+	testString := "this:123,is:147,just.a.test:443"
+	if "is:147,just.a.test:443,this:123" != sortDataSourceBrokers(testString) {
+		t.Fail()
+	}
+}

aws/resource_aws_msk_cluster.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sort"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -455,7 +457,7 @@ func resourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error {
 	cluster := out.ClusterInfo
 
 	d.Set("arn", aws.StringValue(cluster.ClusterArn))
-	d.Set("bootstrap_brokers", aws.StringValue(brokerOut.BootstrapBrokerString))
+	d.Set("bootstrap_brokers", sortResourceBrokers(aws.StringValue(brokerOut.BootstrapBrokerString)))
 	d.Set("bootstrap_brokers_sasl_scram", aws.StringValue(brokerOut.BootstrapBrokerStringSaslScram))
 	d.Set("bootstrap_brokers_tls", aws.StringValue(brokerOut.BootstrapBrokerStringTls))
 
@@ -1206,3 +1208,9 @@ func waitForMskClusterOperation(conn *kafka.Kafka, clusterOperationARN string) e
 
 	return err
 }
+
+func sortResourceBrokers(s string) string {
+	splitBootstrapBrokers := strings.Split(s, ",")
+	sort.Strings(splitBootstrapBrokers)
+	return strings.Join(splitBootstrapBrokers, ",")
+}

aws/resource_aws_msk_cluster_test.go

@@ -753,6 +753,13 @@ func testAccCheckMskClusterDestroy(s *terraform.State) error {
 	return nil
 }
 
+func TestAccMskClusterReource_SortBrokers(t *testing.T) {
+	testString := "this:123,is:147,just.a.test:443"
+	if "is:147,just.a.test:443,this:123" != sortResourceBrokers(testString) {
+		t.Fail()
+	}
+}
+
 func testAccCheckMskClusterExists(n string, cluster *kafka.ClusterInfo) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -1423,5 +1430,4 @@ resource "aws_msk_cluster" "test" {
   }
 }
 `, rName)
-
 }