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

Jump to bottom

Add namevaluesfilters package for resource filtering code #13313

Merged
merged 20 commits into from
Aug 20, 2021
Merged

Add namevaluesfilters package for resource filtering code #13313

merged 20 commits into from
Aug 20, 2021

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented May 13, 2020 •
edited
Loading

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

Closes #13304.

Release note for CHANGELOG:

NONE

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccDataSourceAwsVpc_\|TestAccAWSAutoscalingGroups_' ACCTEST_PARALLELISM=4
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 4 -run=TestAccDataSourceAwsVpc_\|TestAccAWSAutoscalingGroups_ -timeout 120m
=== RUN   TestAccAWSAutoscalingGroups_basic
=== PAUSE TestAccAWSAutoscalingGroups_basic
=== RUN   TestAccDataSourceAwsVpc_basic
=== PAUSE TestAccDataSourceAwsVpc_basic
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
=== PAUSE TestAccDataSourceAwsVpc_ipv6Associated
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
=== PAUSE TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccAWSAutoscalingGroups_basic
=== CONT  TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_ipv6Associated
=== CONT  TestAccDataSourceAwsVpc_basic
--- PASS: TestAccDataSourceAwsVpc_basic (24.45s)
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (25.11s)
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (46.55s)
--- PASS: TestAccAWSAutoscalingGroups_basic (82.98s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	83.080s

@ewbankkit ewbankkit requested a review from a team May 13, 2020 21:11
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. provider Pertains to the provider itself, rather than any interaction with AWS. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. needs-triage Waiting for first response or review from a maintainer. labels May 13, 2020
@ghost ghost added the service/ec2 Issues and PRs that pertain to the ec2 service. label May 17, 2020
@ewbankkit ewbankkit force-pushed the issue-13304 branch 2 times, most recently from fea4087 to 9d4c114 Compare May 19, 2020 20:53
ewbankkit added a commit to ewbankkit/terraform-provider-aws that referenced this pull request May 19, 2020
@ewbankkit
Wait for hashicorp#13313 for filtering package.
349228b
@ewbankkit ewbankkit mentioned this pull request May 19, 2020
Merged
@ghost ghost added documentation Introduces or discusses updates to documentation. service/rds Issues and PRs that pertain to the rds service. labels May 26, 2020
@ewbankkit ewbankkit mentioned this pull request Jun 15, 2020
Merged
@ghost ghost added the service/autoscaling Issues and PRs that pertain to the autoscaling service. label Jun 22, 2020
@ewbankkit ewbankkit changed the title [WIP] Add namevaluesfilters package for resource filtering code Add namevaluesfilters package for resource filtering code Jun 22, 2020
@ewbankkit
Copy link
Contributor Author

Removed WIP.

@ewbankkit ewbankkit removed the needs-triage Waiting for first response or review from a maintainer. label Aug 19, 2020
@ewbankkit
Copy link
Contributor Author

Rebased and removed merge conflicts.
Re-ran acceptance tests:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAutoscalingGroups_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAutoscalingGroups_ -timeout 120m
=== RUN   TestAccAWSAutoscalingGroups_basic
=== PAUSE TestAccAWSAutoscalingGroups_basic
=== CONT  TestAccAWSAutoscalingGroups_basic
--- PASS: TestAccAWSAutoscalingGroups_basic (94.05s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	94.096s
$ make testacc TEST=./aws/ TESTARGS='-run=TestAccDataSourceAwsVpc_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpc_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpc_basic
=== PAUSE TestAccDataSourceAwsVpc_basic
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
=== PAUSE TestAccDataSourceAwsVpc_ipv6Associated
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
=== PAUSE TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_basic
=== CONT  TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_ipv6Associated
--- PASS: TestAccDataSourceAwsVpc_basic (27.71s)
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (27.93s)
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (49.46s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	49.496s

@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. and removed size/XL Managed by automation to categorize the size of a PR. labels Oct 23, 2020
@ewbankkit
Copy link
Contributor Author

Rebased and removed merge conflicts.
Re-ran acceptance tests:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccDataSourceAwsVpc_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpc_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpc_basic
=== PAUSE TestAccDataSourceAwsVpc_basic
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
=== PAUSE TestAccDataSourceAwsVpc_ipv6Associated
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
=== PAUSE TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_basic
=== CONT  TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_ipv6Associated
--- PASS: TestAccDataSourceAwsVpc_basic (29.13s)
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (29.44s)
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (52.13s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	52.183s
$ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAutoscalingGroups_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAutoscalingGroups_ -timeout 120m
=== RUN   TestAccAWSAutoscalingGroups_basic
=== PAUSE TestAccAWSAutoscalingGroups_basic
=== CONT  TestAccAWSAutoscalingGroups_basic
--- PASS: TestAccAWSAutoscalingGroups_basic (66.92s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	66.972s
$ TEST=./aws SWEEP=us-west-2,us-east-1 SWEEPARGS=-sweep-run=aws_db_cluster_snapshot make sweep
WARNING: This will destroy infrastructure. Use only in development accounts.
go test ./aws -v -sweep=us-west-2,us-east-1 -sweep-run=aws_db_cluster_snapshot -timeout 60m
2020/10/24 17:18:59 [DEBUG] Running Sweepers for region (us-west-2):
2020/10/24 17:18:59 [DEBUG] Running Sweeper (aws_db_cluster_snapshot) in region (us-west-2)
2020/10/24 17:18:59 [INFO] AWS Auth provider used: "EnvProvider"
2020/10/24 17:18:59 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:18:59 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:00 Sweeper Tests ran successfully:
	- aws_db_cluster_snapshot
2020/10/24 17:19:00 [DEBUG] Running Sweepers for region (us-east-1):
2020/10/24 17:19:00 [DEBUG] Running Sweeper (aws_db_cluster_snapshot) in region (us-east-1)
2020/10/24 17:19:00 [INFO] AWS Auth provider used: "EnvProvider"
2020/10/24 17:19:00 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:00 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:01 Sweeper Tests ran successfully:
	- aws_db_cluster_snapshot
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1.803s

@ewbankkit ewbankkit requested a review from a team as a code owner January 21, 2021 21:09
Base automatically changed from master to main January 23, 2021 00:57
ewbankkit added 16 commits August 19, 2021 11:25
@ewbankkit
NameValuesFilters.Map eliminates duplicates removes empty values.
97fa902
@ewbankkit
Additional AWS services.
3ee1fb4
@ewbankkit
Support passing a '*schema.Set' to NameValuesFilters.New.
c788eec
@ewbankkit
Add 'namevaluesfilters.Ec2Tags'.
c48fbde
@ewbankkit
Update documentation.
e3a3027
@ewbankkit
r/aws_db_cluster_snapshot: Use 'namevaluefilters' in test sweeper.
624ac04
@ewbankkit
d/aws_vpc: Use 'namevaluefilters'.
2487452 
Acceptance test output:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccDataSourceAwsVpc_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws/ -v -count 1 -parallel 2 -run=TestAccDataSourceAwsVpc_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpc_basic
=== PAUSE TestAccDataSourceAwsVpc_basic
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
=== PAUSE TestAccDataSourceAwsVpc_ipv6Associated
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
=== PAUSE TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_basic
=== CONT  TestAccDataSourceAwsVpc_multipleCidr
--- PASS: TestAccDataSourceAwsVpc_basic (40.39s)
=== CONT  TestAccDataSourceAwsVpc_ipv6Associated
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (64.11s)
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (40.41s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	80.853s
@ewbankkit
d/aws_autoscaling_groups: Use 'namevaluefilters'.
3e0088c
@ewbankkit
Fix broken link in 'contribution-checklists.md'.
de2c3cf
@ewbankkit
Additional AWS services.
b6696b1
@ewbankkit
Run 'make gen'.
c0af1e7
@ewbankkit
Replace 'Merge' by 'Add'.
75dac12 
Acceptance test output:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccDataSourceAwsVpc_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccDataSourceAwsVpc_ -timeout 120m
=== RUN   TestAccDataSourceAwsVpc_basic
=== PAUSE TestAccDataSourceAwsVpc_basic
=== RUN   TestAccDataSourceAwsVpc_ipv6Associated
=== PAUSE TestAccDataSourceAwsVpc_ipv6Associated
=== RUN   TestAccDataSourceAwsVpc_multipleCidr
=== PAUSE TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_basic
=== CONT  TestAccDataSourceAwsVpc_multipleCidr
=== CONT  TestAccDataSourceAwsVpc_ipv6Associated
--- PASS: TestAccDataSourceAwsVpc_basic (29.13s)
--- PASS: TestAccDataSourceAwsVpc_ipv6Associated (29.44s)
--- PASS: TestAccDataSourceAwsVpc_multipleCidr (52.13s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	52.183s
$ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAutoscalingGroups_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAutoscalingGroups_ -timeout 120m
=== RUN   TestAccAWSAutoscalingGroups_basic
=== PAUSE TestAccAWSAutoscalingGroups_basic
=== CONT  TestAccAWSAutoscalingGroups_basic
--- PASS: TestAccAWSAutoscalingGroups_basic (66.92s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	66.972s
$ TEST=./aws SWEEP=us-west-2,us-east-1 SWEEPARGS=-sweep-run=aws_db_cluster_snapshot make sweep
WARNING: This will destroy infrastructure. Use only in development accounts.
go test ./aws -v -sweep=us-west-2,us-east-1 -sweep-run=aws_db_cluster_snapshot -timeout 60m
2020/10/24 17:18:59 [DEBUG] Running Sweepers for region (us-west-2):
2020/10/24 17:18:59 [DEBUG] Running Sweeper (aws_db_cluster_snapshot) in region (us-west-2)
2020/10/24 17:18:59 [INFO] AWS Auth provider used: "EnvProvider"
2020/10/24 17:18:59 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:18:59 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:00 Sweeper Tests ran successfully:
	- aws_db_cluster_snapshot
2020/10/24 17:19:00 [DEBUG] Running Sweepers for region (us-east-1):
2020/10/24 17:19:00 [DEBUG] Running Sweeper (aws_db_cluster_snapshot) in region (us-east-1)
2020/10/24 17:19:00 [INFO] AWS Auth provider used: "EnvProvider"
2020/10/24 17:19:00 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:00 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/24 17:19:01 Sweeper Tests ran successfully:
	- aws_db_cluster_snapshot
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1.803s
@ewbankkit
Allow 'namevaluesfilters' internal package to implement functionality…
a76445b 
… for multiple AWS services.
@ewbankkit
Call out that the 'namevaluesfilters' code is for server-side filtering.
c2a121d
@ewbankkit
Add support for 'resourcegroupstaggingapi.TagFilters'.
87e866d
@ewbankkit
Remove resource and data source changes.
2388347
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed service/autoscaling Issues and PRs that pertain to the autoscaling service. service/rds Issues and PRs that pertain to the rds service. labels Aug 19, 2021
@ewbankkit ewbankkit removed the service/ec2 Issues and PRs that pertain to the ec2 service. label Aug 19, 2021
@github-actions github-actions bot added service/ec2 Issues and PRs that pertain to the ec2 service. and removed service/ec2 Issues and PRs that pertain to the ec2 service. labels Aug 19, 2021
@ewbankkit ewbankkit merged commit 2dbfb60 into hashicorp:main Aug 20, 2021
@github-actions github-actions bot added this to the v3.56.0 milestone Aug 20, 2021
@ewbankkit ewbankkit deleted the issue-13304 branch August 20, 2021 19:26
@github-actions
Copy link

This functionality has been released in v3.56.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. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 23, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. size/XL Managed by automation to categorize the size of a PR. size/XXL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v3.56.0
Development

Successfully merging this pull request may close these issues.

Add namevaluesfilters package for resource filtering code
1 participant
@ewbankkit