Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filter out non broker nodes #38042

Merged
merged 4 commits into from
Aug 7, 2024
Merged

filter out non broker nodes #38042

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1631a4
filter out non broker nodes
alex-px Jun 19, 2024
214bf9d
filter out non broker nodes; update changelog
alex-px Jun 19, 2024
6374cc5
Merge branch 'main' into b-kafka-broker-nodes
jar-b Aug 7, 2024
8aa806f
chore: tweak changelog
jar-b Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/38042.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
data-source/aws_msk_broker_nodes: Filter out nodes other than BrokerNodes
```
25 changes: 14 additions & 11 deletions internal/service/kafka/broker_nodes_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down