Added CIDR block set to datasource VPC peering #13420

AlbertoSH · 2020-05-20T07:41:32Z

Current data source aws_vpc_peering_connection only provides cidr_block and peer_cidr_block. This works fine for most scenarios in which you have two VPCs with just their primary CIDR, but when you attach secondary CIDRs, that info is missing

This PR adds both a cidr_block_set and a cidr_block_set attributes to the data source exposing those values

Community Note

Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Release note for CHANGELOG:

- Added `cidr_block_set` & `peer_cidr_block_set` to `aws_vpc_peering_connection` data source.

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccDataSourceAwsVpcPeeringConnection'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpcPeeringConnection -timeout 120m
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_basic
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_basic
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_basic
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_basic (69.24s)
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets (95.30s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	97.233s

AlbertoSH · 2020-05-20T07:52:52Z

If you consider so, I can move the included checks into a new test so the existing one remains as simple as it was before

My Golang capabilities are quite limited, I did my best 🙃

ewbankkit · 2020-05-20T12:42:54Z

@AlbertoSH Thanks for submitting this. The Go looks perfect 😄.
Yes, we prefer additional test(s) for new attributes to ensure that we introduce no regressions.
Also, please update the relevant documentation: website/docs/d/vpc.html.markdown.

AlbertoSH · 2020-05-20T13:55:59Z

Hi @ewbankkit

I moved the checks to a new test & updated the docs. I left the existing test as it was and both tests are green (I updated the PR description with this new output)

$ make testacc TEST=./aws TESTARGS='-run=TestAccDataSourceAwsVpcPeeringConnection'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpcPeeringConnection -timeout 120m
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_basic
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_basic
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_basic
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_basic (69.24s)
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets (95.30s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	97.233s

ewbankkit · 2020-05-20T17:22:39Z

Verified acceptance tests:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccDataSourceAwsVpcPeeringConnection_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws/ -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpcPeeringConnection_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_basic
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_basic
=== RUN   TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== PAUSE TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_basic
=== CONT  TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_basic (41.27s)
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets (64.32s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	64.353s

ewbankkit · 2020-05-20T17:23:18Z

aws/data_source_aws_vpc_peering_connection_test.go

@@ -41,6 +41,25 @@ func TestAccDataSourceAwsVpcPeeringConnection_basic(t *testing.T) {
 	})
 }

+func TestAccDataSourceAwsVpcPeeringConnection_cidBlockSets(t *testing.T) {


Nit: Rename to TestAccDataSourceAwsVpcPeeringConnection_cidrBlockSets().

Good catch!
Renamed

AlbertoSH · 2020-05-27T14:48:39Z

Hi @ewbankkit
Is there anything else needed to merge the PR? We (my team) would like to have this feature available in a regular provider release 🙂

Amzani · 2020-06-03T07:39:25Z

Hey guys,

Any updates on this.
We really need it.

artem-timchenko · 2020-07-12T08:34:57Z

Hi guys,
Any plans to merge this? This feature will be really helpful

Amzani · 2020-08-10T10:05:51Z

@ewbankkit when do you guys plan to merge this ?

ewbankkit · 2020-08-10T16:19:23Z

@AlbertoSH This is looking good. Can you please convert the new acceptance tests config to Terraform 0.12 syntax?

For example

"${aws_vpc.foo.id}"

to

aws_vpc.foo.id

AlbertoSH · 2020-08-12T08:55:12Z

@ewbankkit There you go!
:)

…pc_peering

DrFaust92

LGTM

--- PASS: TestAccDataSourceAwsVpcPeeringConnection_basic (71.73s)
--- PASS: TestAccDataSourceAwsVpcPeeringConnection_cidrBlockSets (98.37s)

bflad

Hi @AlbertoSH 👋 Thank you for submitting this, overall this was looking good, just some minor changes we will complete on merge. 👍

bflad · 2021-01-25T14:06:28Z

aws/data_source_aws_vpc_peering_connection.go

@@ -40,6 +40,19 @@ func dataSourceAwsVpcPeeringConnection() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"cidr_block_set": {
+				Type:     schema.TypeList,
+				Optional: true,


Since the attribute is not used for configuring the data source, Optional should be removed. 👍

Suggested change

Optional: true,

bflad · 2021-01-25T14:06:47Z

aws/data_source_aws_vpc_peering_connection.go

@@ -60,6 +73,19 @@ func dataSourceAwsVpcPeeringConnection() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"peer_cidr_block_set": {
+				Type:     schema.TypeList,
+				Optional: true,


Similarly:

Suggested change

Optional: true,

bflad · 2021-01-25T14:12:24Z

website/docs/d/vpc_peering_connection.html.markdown

@@ -82,6 +82,10 @@ All of the argument attributes except `filter` are also exported as result attri
 * `requester` - A configuration block that describes [VPC Peering Connection]
 (https://docs.aws.amazon.com/vpc/latest/peering/what-is-vpc-peering.html) options set for the requester VPC.

+* `cidr_block_set` - (Optional) The list of all CIDR blocks of the requester VPC of the specific VPC Peering Connection to retrieve. 


Suggested change

* `cidr_block_set` - (Optional) The list of all CIDR blocks of the requester VPC of the specific VPC Peering Connection to retrieve.

* `cidr_block_set` - List of all CIDR blocks of the requester VPC.

bflad · 2021-01-25T14:12:39Z

website/docs/d/vpc_peering_connection.html.markdown

@@ -82,6 +82,10 @@ All of the argument attributes except `filter` are also exported as result attri
 * `requester` - A configuration block that describes [VPC Peering Connection]
 (https://docs.aws.amazon.com/vpc/latest/peering/what-is-vpc-peering.html) options set for the requester VPC.

+* `cidr_block_set` - (Optional) The list of all CIDR blocks of the requester VPC of the specific VPC Peering Connection to retrieve. 
+
+* `peer_cidr_block_set` - (Optional) The list of all CIDR blocks of the accepter VPC of the specific VPC Peering Connection to retrieve.


Suggested change

* `peer_cidr_block_set` - (Optional) The list of all CIDR blocks of the accepter VPC of the specific VPC Peering Connection to retrieve.

* `peer_cidr_block_set` - List of all CIDR blocks of the accepter VPC.

ghost · 2021-01-28T22:14:45Z

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

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

ghost · 2021-02-24T17:10:00Z

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!

Added CIDR block set to datasource VPC peering

3da7baa

AlbertoSH requested a review from a team May 20, 2020 07:41

sanzalb added 2 commits May 20, 2020 15:53

Moved CIDR block set checks to another test

46c6b0e

Updated docs

9cdcec2

ghost added the documentation Introduces or discusses updates to documentation. label May 20, 2020

ewbankkit reviewed May 20, 2020

View reviewed changes

Fix typo

b6f983b

anGie44 force-pushed the master branch from 54db70d to 48ba2f7 Compare July 21, 2020 18:26

ewbankkit requested review from DrFaust92 and removed request for a team August 10, 2020 16:15

Updated to Terraform 0.12 syntax

550b971

Merge branch 'master' into feature/add_cidr_block_set_to_datasource_v…

62b9b1c

…pc_peering

DrFaust92 added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Oct 23, 2020

DrFaust92 approved these changes Oct 23, 2020

View reviewed changes

bflad self-assigned this Jan 22, 2021

Base automatically changed from master to main January 23, 2021 00:57

breathingdust requested a review from a team as a code owner January 23, 2021 00:57

bflad reviewed Jan 25, 2021

View reviewed changes

bflad merged commit bfe78e0 into hashicorp:main Jan 25, 2021

github-actions bot added this to the v3.26.0 milestone Jan 25, 2021

ghost locked as resolved and limited conversation to collaborators Feb 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added CIDR block set to datasource VPC peering #13420

Added CIDR block set to datasource VPC peering #13420

AlbertoSH commented May 20, 2020 •

edited

Loading

AlbertoSH commented May 20, 2020

ewbankkit commented May 20, 2020

AlbertoSH commented May 20, 2020

ewbankkit commented May 20, 2020

ewbankkit May 20, 2020

AlbertoSH May 22, 2020

AlbertoSH commented May 27, 2020

Amzani commented Jun 3, 2020

artem-timchenko commented Jul 12, 2020

Amzani commented Aug 10, 2020

ewbankkit commented Aug 10, 2020

AlbertoSH commented Aug 12, 2020

DrFaust92 left a comment

bflad left a comment

bflad Jan 25, 2021

bflad Jan 25, 2021

bflad Jan 25, 2021

bflad Jan 25, 2021

ghost commented Jan 28, 2021

ghost commented Feb 24, 2021

	* `cidr_block_set` - (Optional) The list of all CIDR blocks of the requester VPC of the specific VPC Peering Connection to retrieve.
	* `cidr_block_set` - List of all CIDR blocks of the requester VPC.

	* `peer_cidr_block_set` - (Optional) The list of all CIDR blocks of the accepter VPC of the specific VPC Peering Connection to retrieve.
	* `peer_cidr_block_set` - List of all CIDR blocks of the accepter VPC.

Added CIDR block set to datasource VPC peering #13420

Added CIDR block set to datasource VPC peering #13420

Conversation

AlbertoSH commented May 20, 2020 • edited Loading

Community Note

AlbertoSH commented May 20, 2020

ewbankkit commented May 20, 2020

AlbertoSH commented May 20, 2020

ewbankkit commented May 20, 2020

ewbankkit May 20, 2020

Choose a reason for hiding this comment

AlbertoSH May 22, 2020

Choose a reason for hiding this comment

AlbertoSH commented May 27, 2020

Amzani commented Jun 3, 2020

artem-timchenko commented Jul 12, 2020

Amzani commented Aug 10, 2020

ewbankkit commented Aug 10, 2020

AlbertoSH commented Aug 12, 2020

DrFaust92 left a comment

Choose a reason for hiding this comment

bflad left a comment

Choose a reason for hiding this comment

bflad Jan 25, 2021

Choose a reason for hiding this comment

bflad Jan 25, 2021

Choose a reason for hiding this comment

bflad Jan 25, 2021

Choose a reason for hiding this comment

bflad Jan 25, 2021

Choose a reason for hiding this comment

ghost commented Jan 28, 2021

ghost commented Feb 24, 2021

AlbertoSH commented May 20, 2020 •

edited

Loading