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

r/apigateway_stage - add waf_acl_arn attribute + use waiter and finder #18561

Merged
merged 7 commits into from
Jan 21, 2022

Conversation

DrFaust92
Copy link
Collaborator

@DrFaust92 DrFaust92 commented Apr 3, 2021

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

Output from acceptance testing:

$ make testacc TESTS='-run=TestAccAWSAPIGatewayStage_' PKG=apigateway
--- PASS: TestAccAPIGatewayStage_disappears (87.64s)
--- PASS: TestAccAPIGatewayStage_disappears_restApi (105.02s)
--- PASS: TestAccAPIGatewayStage_Disappears_referencingDeployment (145.40s)
--- PASS: TestAccAPIGatewayStage_basic (201.95s)
--- PASS: TestAccAPIGatewayStage_tags (221.94s)
--- PASS: TestAccAPIGatewayStage_AccessLogSettings_kinesis (434.72s)
--- PASS: TestAccAPIGatewayStage_cache (579.27s)
--- PASS: TestAccAPIGatewayStage_waf (148.21s)
$ make testacc TESTS='-run=TestAccAPIGatewayMethodSettings_' PKG=apigateway
--- PASS: TestAccAPIGatewayMethodSettings_disappears (110.07s)
--- PASS: TestAccAPIGatewayMethodSettings_basic (204.77s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimitDisabledByDefault (212.01s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_dataTraceEnabled (217.98s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cacheDataEncrypted (264.31s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_metricsEnabled (295.99s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cacheTTLInSeconds (326.32s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimit (346.26s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimit (399.56s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cachingEnabled (432.36s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_multiple (468.40s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_unauthorizedCacheControlHeaderStrategy (580.57s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_requireAuthorizationForCacheControl (628.97s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_loggingLevel (774.11s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimitDisabledByDefault (825.79s)
$ make testacc TESTS='-run=TestAccAPIGatewayDeployment_' PKG=apigateway
--- PASS: TestAccAPIGatewayDeployment_Disappears_restAPI (81.53s)
--- PASS: TestAccAPIGatewayDeployment_variables (81.98s)
--- PASS: TestAccAPIGatewayDeployment_stageDescription (109.59s)
--- PASS: TestAccAPIGatewayDeployment_description (137.19s)
--- PASS: TestAccAPIGatewayDeployment_basic (170.62s)
--- PASS: TestAccAPIGatewayDeployment_stageName (228.28s)
--- PASS: TestAccAPIGatewayDeployment_triggers (263.37s)
--- PASS: TestAccAPIGatewayDeployment_StageName_emptyString (301.29s)

@ghost ghost added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/apigateway Issues and PRs that pertain to the apigateway service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Apr 3, 2021
@DrFaust92 DrFaust92 marked this pull request as ready for review April 4, 2021 06:02
@DrFaust92 DrFaust92 requested a review from a team as a code owner April 4, 2021 06:02
@DrFaust92 DrFaust92 changed the title r/apigateway_stage - add waf_acl_arn attribute r/apigateway_stage - add waf_acl_arn attribute + use waiter and finder packages Apr 4, 2021
@DrFaust92 DrFaust92 force-pushed the r/apigw_stage_web_acl_arn branch 2 times, most recently from 60e36b7 to 2b7a2cf Compare May 27, 2021 19:53
@DrFaust92 DrFaust92 force-pushed the r/apigw_stage_web_acl_arn branch from 2b7a2cf to a6958b3 Compare June 17, 2021 06:43
@DrFaust92 DrFaust92 added the enhancement Requests to existing resources that expand the functionality or scope. label Sep 10, 2021
@DrFaust92 DrFaust92 force-pushed the r/apigw_stage_web_acl_arn branch from a6958b3 to bbf3668 Compare September 10, 2021 16:37
@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

@DrFaust92 DrFaust92 force-pushed the r/apigw_stage_web_acl_arn branch from bbf3668 to 6431cb8 Compare December 26, 2021 21:02
@DrFaust92 DrFaust92 marked this pull request as draft December 26, 2021 21:27
@DrFaust92 DrFaust92 changed the title r/apigateway_stage - add waf_acl_arn attribute + use waiter and finder packages r/apigateway_stage - add waf_acl_arn attribute + use waiter and finder Dec 26, 2021
@DrFaust92 DrFaust92 marked this pull request as ready for review December 26, 2021 22:31
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccAWSAPIGatewayStage_\|TestAccAPIGatewayMethodSettings_\|TestAccAPIGatewayDeployment_' PKG=apigateway ACCTEST_PARALLELISM=5
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/apigateway/... -v -count 1 -parallel 5 -run=TestAccAWSAPIGatewayStage_\|TestAccAPIGatewayMethodSettings_\|TestAccAPIGatewayDeployment_ -timeout 180m
=== RUN   TestAccAPIGatewayDeployment_basic
=== PAUSE TestAccAPIGatewayDeployment_basic
=== RUN   TestAccAPIGatewayDeployment_Disappears_restAPI
=== PAUSE TestAccAPIGatewayDeployment_Disappears_restAPI
=== RUN   TestAccAPIGatewayDeployment_triggers
=== PAUSE TestAccAPIGatewayDeployment_triggers
=== RUN   TestAccAPIGatewayDeployment_description
=== PAUSE TestAccAPIGatewayDeployment_description
=== RUN   TestAccAPIGatewayDeployment_stageDescription
=== PAUSE TestAccAPIGatewayDeployment_stageDescription
=== RUN   TestAccAPIGatewayDeployment_stageName
=== PAUSE TestAccAPIGatewayDeployment_stageName
=== RUN   TestAccAPIGatewayDeployment_StageName_emptyString
=== PAUSE TestAccAPIGatewayDeployment_StageName_emptyString
=== RUN   TestAccAPIGatewayDeployment_variables
=== PAUSE TestAccAPIGatewayDeployment_variables
=== RUN   TestAccAPIGatewayMethodSettings_basic
=== PAUSE TestAccAPIGatewayMethodSettings_basic
=== RUN   TestAccAPIGatewayMethodSettings_Settings_cacheDataEncrypted
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_cacheDataEncrypted
=== RUN   TestAccAPIGatewayMethodSettings_Settings_cacheTTLInSeconds
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_cacheTTLInSeconds
=== RUN   TestAccAPIGatewayMethodSettings_Settings_cachingEnabled
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_cachingEnabled
=== RUN   TestAccAPIGatewayMethodSettings_Settings_dataTraceEnabled
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_dataTraceEnabled
=== RUN   TestAccAPIGatewayMethodSettings_Settings_loggingLevel
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_loggingLevel
=== RUN   TestAccAPIGatewayMethodSettings_Settings_metricsEnabled
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_metricsEnabled
=== RUN   TestAccAPIGatewayMethodSettings_Settings_multiple
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_multiple
=== RUN   TestAccAPIGatewayMethodSettings_Settings_requireAuthorizationForCacheControl
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_requireAuthorizationForCacheControl
=== RUN   TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimit
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimit
=== RUN   TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimitDisabledByDefault
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimitDisabledByDefault
=== RUN   TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimit
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimit
=== RUN   TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimitDisabledByDefault
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimitDisabledByDefault
=== RUN   TestAccAPIGatewayMethodSettings_Settings_unauthorizedCacheControlHeaderStrategy
=== PAUSE TestAccAPIGatewayMethodSettings_Settings_unauthorizedCacheControlHeaderStrategy
=== RUN   TestAccAPIGatewayMethodSettings_disappears
=== PAUSE TestAccAPIGatewayMethodSettings_disappears
=== CONT  TestAccAPIGatewayDeployment_basic
=== CONT  TestAccAPIGatewayMethodSettings_Settings_dataTraceEnabled
=== CONT  TestAccAPIGatewayMethodSettings_disappears
=== CONT  TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimitDisabledByDefault
=== CONT  TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimitDisabledByDefault
--- PASS: TestAccAPIGatewayDeployment_basic (33.53s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_unauthorizedCacheControlHeaderStrategy
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimitDisabledByDefault (65.31s)
=== CONT  TestAccAPIGatewayDeployment_StageName_emptyString
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimitDisabledByDefault (65.53s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_cachingEnabled
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cachingEnabled (66.80s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_cacheTTLInSeconds
--- PASS: TestAccAPIGatewayMethodSettings_disappears (165.49s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_cacheDataEncrypted
--- PASS: TestAccAPIGatewayMethodSettings_Settings_unauthorizedCacheControlHeaderStrategy (153.18s)
=== CONT  TestAccAPIGatewayMethodSettings_basic
--- PASS: TestAccAPIGatewayMethodSettings_Settings_dataTraceEnabled (187.03s)
=== CONT  TestAccAPIGatewayDeployment_variables
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cacheDataEncrypted (84.73s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimit
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingRateLimit (40.85s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_metricsEnabled
--- PASS: TestAccAPIGatewayDeployment_variables (120.55s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_loggingLevel
--- PASS: TestAccAPIGatewayMethodSettings_Settings_metricsEnabled (47.47s)
=== CONT  TestAccAPIGatewayDeployment_description
--- PASS: TestAccAPIGatewayDeployment_description (36.63s)
=== CONT  TestAccAPIGatewayDeployment_stageName
--- PASS: TestAccAPIGatewayMethodSettings_Settings_loggingLevel (90.96s)
=== CONT  TestAccAPIGatewayDeployment_stageDescription
--- PASS: TestAccAPIGatewayDeployment_stageName (56.45s)
=== CONT  TestAccAPIGatewayDeployment_triggers
--- PASS: TestAccAPIGatewayDeployment_stageDescription (62.86s)
=== CONT  TestAccAPIGatewayDeployment_Disappears_restAPI
--- PASS: TestAccAPIGatewayDeployment_Disappears_restAPI (43.55s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_multiple
--- PASS: TestAccAPIGatewayDeployment_triggers (90.78s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimit
--- PASS: TestAccAPIGatewayMethodSettings_Settings_multiple (47.19s)
=== CONT  TestAccAPIGatewayMethodSettings_Settings_requireAuthorizationForCacheControl
--- PASS: TestAccAPIGatewayMethodSettings_Settings_throttlingBurstLimit (62.44s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_requireAuthorizationForCacheControl (65.03s)
--- PASS: TestAccAPIGatewayDeployment_StageName_emptyString (686.26s)
--- PASS: TestAccAPIGatewayMethodSettings_basic (623.03s)
--- PASS: TestAccAPIGatewayMethodSettings_Settings_cacheTTLInSeconds (692.29s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/apigateway	828.102s

@ewbankkit
Copy link
Contributor

@DrFaust92 Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 6ece474 into hashicorp:main Jan 21, 2022
@github-actions github-actions bot added this to the v3.74.0 milestone Jan 21, 2022
@github-actions
Copy link

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

@DrFaust92 DrFaust92 deleted the r/apigw_stage_web_acl_arn branch February 12, 2022 12:49
@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 May 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/apigateway Issues and PRs that pertain to the apigateway service. size/XL 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
Development

Successfully merging this pull request may close these issues.

3 participants