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.

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

d/aws_vpc: allow for multiple cidr blocks #5098

Merged
merged 2 commits into from
Jul 6, 2018

Conversation

kl4w
Copy link
Contributor

@kl4w kl4w commented Jul 5, 2018

Fixes #5042

Changes proposed in this pull request:

  • allow for multiple cidr blocks

Output from acceptance testing:

make testacc TEST=./aws TESTARGS='-run=TestAccDataSourceAwsVpc_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccDataSourceAwsVpc_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpc_basic
--- PASS: TestAccDataSourceAwsVpc_basic (26.17s)
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (25.49s)
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (49.62s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	101.320s

@ghost ghost added the size/M Managed by automation to categorize the size of a PR. label Jul 5, 2018
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/ec2 Issues and PRs that pertain to the ec2 service. labels Jul 5, 2018
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with one small adjustment on merge, thanks @kl4w! 🚀

=== RUN   TestAccDataSourceAwsVpc_basic
--- PASS: TestAccDataSourceAwsVpc_basic (29.87s)
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (43.53s)

}
cidrAssociations = append(cidrAssociations, association)
}
d.Set("cidr_block_associations", cidrAssociations)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When using d.Set() with aggregate types (TypeList, TypeSet, TypeMap), we should perform error checking to prevent issues where the code is not properly able to set the Terraform state. e.g.

if err := d.Set("cidr_block_associations", cidrAssociations); err != nil {
  return fmt.Errorf("error setting cidr_block_associations: %s", err)
}

Luckily this was working just fine before so will adjust this on merge. 👍

@bflad bflad added this to the v1.27.0 milestone Jul 6, 2018
@bflad bflad merged commit 1ff5555 into hashicorp:master Jul 6, 2018
bflad added a commit that referenced this pull request Jul 6, 2018
@kl4w kl4w deleted the additional-vpc-cidr-block branch July 6, 2018 18:06
@bflad
Copy link
Contributor

bflad commented Jul 11, 2018

This has been released in version 1.27.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@ghost
Copy link

ghost commented Apr 4, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Apr 4, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/ec2 Issues and PRs that pertain to the ec2 service. size/M Managed by automation to categorize the size of a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

d/aws_vpc: Additional IPv4 CIDR blocks
2 participants