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

r/aws_apigatewayv2_integration: Different range of valid values and defaults for 'timeout_milliseconds' between HTTP and WebSocket APIs #16017

Merged
merged 1 commit into from
Nov 4, 2020
Merged

r/aws_apigatewayv2_integration: Different range of valid values and defaults for 'timeout_milliseconds' between HTTP and WebSocket APIs #16017

merged 1 commit into from
Nov 4, 2020

Conversation

ewbankkit
Copy link
Contributor

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 #16002.

Release note for CHANGELOG:

resource/aws_apigatewayv2_integration: `timeout_milliseconds` has different valid ranges and default values between HTTP and WebSocket APIs. `timeout_milliseconds` is now `Computed`, meaning Terraform will only perform drift detection of its value when present in a configuration.

Output from acceptance testing:

$ make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAPIGatewayV2Integration_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 1 -run=TestAccAWSAPIGatewayV2Integration_ -timeout 120m
=== RUN   TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_basicHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_disappears
=== PAUSE TestAccAWSAPIGatewayV2Integration_disappears
=== RUN   TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== PAUSE TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== CONT  TestAccAWSAPIGatewayV2Integration_basicWebSocket
--- PASS: TestAccAWSAPIGatewayV2Integration_basicWebSocket (29.37s)
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaHttp
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaHttp (46.22s)
=== CONT  TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
--- PASS: TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration (35.78s)
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkHttp (373.24s)
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket (683.60s)
=== CONT  TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
--- PASS: TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp (33.91s)
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaWebSocket (38.50s)
=== CONT  TestAccAWSAPIGatewayV2Integration_disappears
--- PASS: TestAccAWSAPIGatewayV2Integration_disappears (16.60s)
=== CONT  TestAccAWSAPIGatewayV2Integration_basicHttp
--- PASS: TestAccAWSAPIGatewayV2Integration_basicHttp (20.01s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	1277.308s

@ewbankkit ewbankkit requested a review from a team as a code owner November 4, 2020 16:14
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. service/apigatewayv2 Issues and PRs that pertain to the apigatewayv2 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Nov 4, 2020
ewbankkit
ewbankkit commented Nov 4, 2020
View reviewed changes
aws/resource_aws_apigatewayv2_integration.go
ValidateFunc: validation.IntBetween(50, 29000),
Type: schema.TypeInt,
Optional: true,
Computed: true,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed ValidateFunc as there's no way of making it dependent on the API type and the range 29000 to 30000 is invalid for WebSocket APIs.

@ewbankkit
r/aws_apigatewayv2_integration: Different range of valid values and d…
caa31be 
…efaults for 'timeout_milliseconds' between HTTP and WebSocket APIs.
@ewbankkit ewbankkit force-pushed the b-aws_apigatewayv2_integration-timeout-default-and-max branch from e91bfd1 to caa31be Compare November 4, 2020 16:19
@ghost ghost added size/S Managed by automation to categorize the size of a PR. and removed size/XS Managed by automation to categorize the size of a PR. labels Nov 4, 2020
DrFaust92
DrFaust92 approved these changes Nov 4, 2020
View reviewed changes
Copy link
Collaborator

@DrFaust92 DrFaust92 left a comment

Choose a reason for hiding this comment

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

LGTM

--- PASS: TestAccAWSAPIGatewayV2Integration_disappears (70.42s)--- PASS: TestAccAWSAPIGatewayV2Integration_basicWebSocket (77.25s)--- PASS: TestAccAWSAPIGatewayV2Integration_basicHttp (79.30s)
--- PASS: TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration (84.02s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaHttp (104.42s)
--- PASS: TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp (108.62s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaWebSocket (133.69s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkHttp (367.23s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket (754.98s)

@breathingdust
Copy link
Member

LGTM 🚀 Thanks @ewbankkit

Verified Acceptance Tests in Commercial (us-west-2)

make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAPIGatewayV2Integration_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayV2Integration_ -timeout 120m
=== RUN   TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_basicHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_disappears
=== PAUSE TestAccAWSAPIGatewayV2Integration_disappears
=== RUN   TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== PAUSE TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== CONT  TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== CONT  TestAccAWSAPIGatewayV2Integration_basicHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_disappears
--- PASS: TestAccAWSAPIGatewayV2Integration_disappears (18.29s)
--- PASS: TestAccAWSAPIGatewayV2Integration_basicWebSocket (18.91s)
--- PASS: TestAccAWSAPIGatewayV2Integration_basicHttp (20.59s)
--- PASS: TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration (33.71s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaWebSocket (36.36s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaHttp (41.14s)
--- PASS: TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp (61.92s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkHttp (310.69s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket (655.79s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	657.414s

Verified Acceptance Tests in GovCloud (us-gov-west-1)

make testacc TEST=./aws/ TESTARGS='-run=TestAccAWSAPIGatewayV2Integration_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayV2Integration_ -timeout 120m
=== RUN   TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_basicHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_basicHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_disappears
=== PAUSE TestAccAWSAPIGatewayV2Integration_disappears
=== RUN   TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== RUN   TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== PAUSE TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== RUN   TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== PAUSE TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== CONT  TestAccAWSAPIGatewayV2Integration_basicWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp
=== CONT  TestAccAWSAPIGatewayV2Integration_LambdaWebSocket
=== CONT  TestAccAWSAPIGatewayV2Integration_disappears
=== CONT  TestAccAWSAPIGatewayV2Integration_basicHttp
--- PASS: TestAccAWSAPIGatewayV2Integration_disappears (13.27s)
--- PASS: TestAccAWSAPIGatewayV2Integration_basicHttp (14.98s)
--- PASS: TestAccAWSAPIGatewayV2Integration_IntegrationTypeHttp (23.02s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaHttp (29.69s)
--- PASS: TestAccAWSAPIGatewayV2Integration_LambdaWebSocket (34.45s)
--- PASS: TestAccAWSAPIGatewayV2Integration_basicWebSocket (46.02s)
--- PASS: TestAccAWSAPIGatewayV2Integration_AwsServiceIntegration (54.71s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkHttp (343.23s)
--- PASS: TestAccAWSAPIGatewayV2Integration_VpcLinkWebSocket (649.66s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	651.515s

@breathingdust breathingdust added this to the v3.14.0 milestone Nov 4, 2020
@breathingdust breathingdust merged commit 517e368 into hashicorp:master Nov 4, 2020
breathingdust added a commit that referenced this pull request Nov 4, 2020
@breathingdust
Update CHANGELOG.md #16017
75026f0
@ewbankkit ewbankkit deleted the b-aws_apigatewayv2_integration-timeout-default-and-max branch November 5, 2020 13:33
@ghost
Copy link

ghost commented Nov 6, 2020

This has been released in version 3.14.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
Copy link

ghost commented Dec 5, 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 as resolved and limited conversation to collaborators Dec 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@DrFaust92 DrFaust92 DrFaust92 approved these changes

Assignees
No one assigned
Labels
service/apigatewayv2 Issues and PRs that pertain to the apigatewayv2 service. size/S 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.14.0
Development

Successfully merging this pull request may close these issues.

aws_apigatewayv2_integration timeout_milliseconds input should have a ceiling of 30,000
3 participants
@ewbankkit @breathingdust @DrFaust92