Merge pull request #38042 from alex-px/b-kafka-broker-nodes

filter out non broker nodes
hashicorp · Aug 7, 2024 · 9ab6e1e · 9ab6e1e
2 parents a860e75 + 8aa806f
commit 9ab6e1e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.changelog/38042.txt b/.changelog/38042.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_msk_broker_nodes: Filter out nodes with no broker info
+```
diff --git a/internal/service/kafka/broker_nodes_data_source.go b/internal/service/kafka/broker_nodes_data_source.go
@@ -84,7 +84,11 @@ func dataSourceBrokerNodesRead(ctx context.Context, d *schema.ResourceData, meta
 			return sdkdiag.AppendErrorf(diags, "listing MSK Cluster (%s) Broker Nodes: %s", clusterARN, err)
 		}
 
-		nodeInfos = append(nodeInfos, page.NodeInfoList...)
+		for _, nodeInfo := range page.NodeInfoList {
+			if nodeInfo.BrokerNodeInfo != nil {
+				nodeInfos = append(nodeInfos, nodeInfo)
+			}
+		}
 	}
 
 	// node list is returned unsorted sort on broker id
@@ -96,17 +100,16 @@ func dataSourceBrokerNodesRead(ctx context.Context, d *schema.ResourceData, meta
 
 	tfList := []interface{}{}
 	for _, apiObject := range nodeInfos {
-		if brokerNodeInfo := apiObject.BrokerNodeInfo; brokerNodeInfo != nil {
-			tfMap := map[string]interface{}{
-				"attached_eni_id":       aws.ToString(brokerNodeInfo.AttachedENIId),
-				"broker_id":             aws.ToFloat64(brokerNodeInfo.BrokerId),
-				"client_subnet":         aws.ToString(brokerNodeInfo.ClientSubnet),
-				"client_vpc_ip_address": aws.ToString(brokerNodeInfo.ClientVpcIpAddress),
-				names.AttrEndpoints:     brokerNodeInfo.Endpoints,
-				"node_arn":              aws.ToString(apiObject.NodeARN),
-			}
-			tfList = append(tfList, tfMap)
+		brokerNodeInfo := apiObject.BrokerNodeInfo
+		tfMap := map[string]interface{}{
+			"attached_eni_id":       aws.ToString(brokerNodeInfo.AttachedENIId),
+			"broker_id":             aws.ToFloat64(brokerNodeInfo.BrokerId),
+			"client_subnet":         aws.ToString(brokerNodeInfo.ClientSubnet),
+			"client_vpc_ip_address": aws.ToString(brokerNodeInfo.ClientVpcIpAddress),
+			names.AttrEndpoints:     brokerNodeInfo.Endpoints,
+			"node_arn":              aws.ToString(apiObject.NodeARN),
 		}
+		tfList = append(tfList, tfMap)
 	}
 
 	d.SetId(clusterARN)