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

fix: add missing 'id' values in pool map (#32106) #32133

Merged
merged 8 commits into from
Oct 30, 2023
Merged

fix: add missing 'id' values in pool map (#32106) #32133

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee92dc3
fix: add missing 'id' values in pool map (#32106)
trc-ikeskin Jun 21, 2023
eeb1f41
adding tests for 'id' attribute
trc-ikeskin Jun 21, 2023
aed1c27
docs: add changelog entry for PR #32133
trc-ikeskin Jun 21, 2023
7db5ab4
Merge branch 'main' into HEAD
ewbankkit Oct 30, 2023
761d9ad
Update .changelog/32133.txt
ewbankkit Oct 30, 2023
2c2ad01
Update 32133.txt
ewbankkit Oct 30, 2023
b7e8d14
d/aws_vpc_ipam_pools: ipam_pools.id is Computed.
ewbankkit Oct 30, 2023
5181fd0
Merge commit 'b7e8d14082f507a39021465ab1df4bed908e4317' into HEAD
ewbankkit Oct 30, 2023
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/32133.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_vpc_ipam_pools: Fix missing 'id' attributes for individual IPAM pools
ewbankkit marked this conversation as resolved.
Show resolved Hide resolved
```
13 changes: 5 additions & 8 deletions internal/service/ec2/ipam_pools_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ func DataSourceIPAMPools() *schema.Resource {
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"id": {
Type: schema.TypeString,
Optional: true,
},
"address_family": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -58,10 +62,6 @@ func DataSourceIPAMPools() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"id": {
Type: schema.TypeString,
Optional: true,
},
"ipam_scope_id": {
Type: schema.TypeString,
Computed: true,
Expand All @@ -70,10 +70,6 @@ func DataSourceIPAMPools() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"ipam_pool_id": {
Type: schema.TypeString,
Computed: true,
},
"locale": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -140,6 +136,7 @@ func flattenIPAMPools(ctx context.Context, c []*ec2.IpamPool, ignoreTagsConfig *
func flattenIPAMPool(ctx context.Context, p *ec2.IpamPool, ignoreTagsConfig *tftags.IgnoreConfig) map[string]interface{} {
pool := make(map[string]interface{})

pool["id"] = aws.StringValue(p.IpamPoolId)
pool["address_family"] = aws.StringValue(p.AddressFamily)
pool["allocation_default_netmask_length"] = aws.Int64Value(p.AllocationDefaultNetmaskLength)
pool["allocation_max_netmask_length"] = aws.Int64Value(p.AllocationMaxNetmaskLength)
Expand Down
1 change: 1 addition & 0 deletions internal/service/ec2/ipam_pools_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func TestAccIPAMPoolsDataSource_basic(t *testing.T) {

// DS 2 filters on 1 specific pool to validate attributes
resource.TestCheckResourceAttr(dataSourceNameTwo, "ipam_pools.#", "1"),
resource.TestCheckResourceAttrPair(dataSourceNameTwo, "ipam_pools.0.id", resourceName, "id"),
resource.TestCheckResourceAttrPair(dataSourceNameTwo, "ipam_pools.0.address_family", resourceName, "address_family"),
resource.TestCheckResourceAttrPair(dataSourceNameTwo, "ipam_pools.0.allocation_default_netmask_length", resourceName, "allocation_default_netmask_length"),
resource.TestCheckResourceAttrPair(dataSourceNameTwo, "ipam_pools.0.allocation_max_netmask_length", resourceName, "allocation_max_netmask_length"),
Expand Down