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

Add ECS task definition family validation to match API requirements #18610

Merged

Conversation

tomelliff
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

Output from acceptance testing:

Acceptance tests not ran as only adding plan time validation to match the AWS API's restrictions.

I've noticed some other PRs adding validation using ExpectError to test validations but this seems a little unnecessary to me (validate funcs are unit tested in the provider SDK and acceptance testing feels like the wrong fit for this kind of thing to me) but I haven't contributed back to this provider in a while so happy to add the test if required. I also didn't see anything mentioned in https://github.com/hashicorp/terraform-provider-aws/blob/af0e82bb26b9b63233621e526a19f62a3c5e3269/docs/contributing/contribution-checklists.md

@tomelliff tomelliff requested a review from a team as a code owner April 7, 2021 14:28
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. service/ecs Issues and PRs that pertain to the ecs service. labels Apr 7, 2021
@github-actions github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label Apr 7, 2021
@breathingdust breathingdust 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 Sep 4, 2021
@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.

@YakDriver YakDriver self-assigned this Dec 17, 2021
@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 7, 2022
Copy link
Member

@YakDriver YakDriver left a comment

Choose a reason for hiding this comment

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

Looks great! 🎉

Output from acceptance tests on GovCloud:

% make testacc TESTS=TestAccECSTaskDefinition_ PKG=ecs
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ecs/... -v -count 1 -parallel 20 -run='TestAccECSTaskDefinition_' -timeout 180m
--- SKIP: TestAccECSTaskDefinition_withFSxWinFileSystem (0.00s)
--- SKIP: TestAccECSTaskDefinition_inferenceAccelerator (11.89s)
--- SKIP: TestAccECSTaskDefinition_withRuntimePlatform (0.00s)
--- SKIP: TestAccECSTaskDefinition_Fargate_withRuntimePlatformWithoutArch (0.00s)
--- PASS: TestAccECSTaskDefinition_Fargate_ephemeralStorage (27.79s)
--- PASS: TestAccECSTaskDefinition_withTaskScopedDockerVolume (27.87s)
--- PASS: TestAccECSTaskDefinition_arrays (27.87s)
--- SKIP: TestAccECSTaskDefinition_Fargate_withRuntimePlatform (0.00s)
--- PASS: TestAccECSTaskDefinition_constraint (28.04s)
--- PASS: TestAccECSTaskDefinition_withNetworkMode (32.95s)
--- PASS: TestAccECSTaskDefinition_withTaskRoleARN (33.19s)
--- PASS: TestAccECSTaskDefinition_withPidMode (33.22s)
--- PASS: TestAccECSTaskDefinition_withIPCMode (33.57s)
--- PASS: TestAccECSTaskDefinition_executionRole (33.94s)
--- PASS: TestAccECSTaskDefinition_fargate (37.90s)
--- PASS: TestAccECSTaskDefinition_withEFSVolumeMinimal (39.08s)
--- PASS: TestAccECSTaskDefinition_proxy (39.16s)
--- PASS: TestAccECSTaskDefinition_withTransitEncryptionEFSVolume (39.16s)
--- PASS: TestAccECSTaskDefinition_withEFSVolume (39.29s)
--- PASS: TestAccECSTaskDefinition_disappears (39.49s)
--- PASS: TestAccECSTaskDefinition_changeVolumesForcesNewResource (43.52s)
--- PASS: TestAccECSTaskDefinition_withEFSAccessPoint (43.72s)
--- PASS: TestAccECSTaskDefinition_basic (43.90s)
--- PASS: TestAccECSTaskDefinition_withScratchVolume (21.00s)
--- PASS: TestAccECSTaskDefinition_withDockerVolume (21.11s)
--- PASS: TestAccECSTaskDefinition_withDockerVolumeMinimal (21.04s)
--- PASS: TestAccECSTaskDefinition_tags (63.75s)
--- PASS: TestAccECSTaskDefinition_withECSService (64.81s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ecs	78.095s

Output on us-west-2:

% make testacc TESTS=TestAccECSTaskDefinition_ PKG=ecs
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ecs/... -v -count 1 -parallel 20 -run='TestAccECSTaskDefinition_' -timeout 180m
=== RUN   TestAccECSTaskDefinition_basic
=== PAUSE TestAccECSTaskDefinition_basic
=== RUN   TestAccECSTaskDefinition_withScratchVolume
=== PAUSE TestAccECSTaskDefinition_withScratchVolume
=== RUN   TestAccECSTaskDefinition_withDockerVolume
=== PAUSE TestAccECSTaskDefinition_withDockerVolume
=== RUN   TestAccECSTaskDefinition_withDockerVolumeMinimal
=== PAUSE TestAccECSTaskDefinition_withDockerVolumeMinimal
=== RUN   TestAccECSTaskDefinition_withRuntimePlatform
=== PAUSE TestAccECSTaskDefinition_withRuntimePlatform
=== RUN   TestAccECSTaskDefinition_Fargate_withRuntimePlatform
=== PAUSE TestAccECSTaskDefinition_Fargate_withRuntimePlatform
=== RUN   TestAccECSTaskDefinition_Fargate_withRuntimePlatformWithoutArch
=== PAUSE TestAccECSTaskDefinition_Fargate_withRuntimePlatformWithoutArch
=== RUN   TestAccECSTaskDefinition_withEFSVolumeMinimal
=== PAUSE TestAccECSTaskDefinition_withEFSVolumeMinimal
=== RUN   TestAccECSTaskDefinition_withEFSVolume
=== PAUSE TestAccECSTaskDefinition_withEFSVolume
=== RUN   TestAccECSTaskDefinition_withTransitEncryptionEFSVolume
=== PAUSE TestAccECSTaskDefinition_withTransitEncryptionEFSVolume
=== RUN   TestAccECSTaskDefinition_withEFSAccessPoint
=== PAUSE TestAccECSTaskDefinition_withEFSAccessPoint
=== RUN   TestAccECSTaskDefinition_withFSxWinFileSystem
=== PAUSE TestAccECSTaskDefinition_withFSxWinFileSystem
=== RUN   TestAccECSTaskDefinition_withTaskScopedDockerVolume
=== PAUSE TestAccECSTaskDefinition_withTaskScopedDockerVolume
=== RUN   TestAccECSTaskDefinition_withECSService
=== PAUSE TestAccECSTaskDefinition_withECSService
=== RUN   TestAccECSTaskDefinition_withTaskRoleARN
=== PAUSE TestAccECSTaskDefinition_withTaskRoleARN
=== RUN   TestAccECSTaskDefinition_withNetworkMode
=== PAUSE TestAccECSTaskDefinition_withNetworkMode
=== RUN   TestAccECSTaskDefinition_withIPCMode
=== PAUSE TestAccECSTaskDefinition_withIPCMode
=== RUN   TestAccECSTaskDefinition_withPidMode
=== PAUSE TestAccECSTaskDefinition_withPidMode
=== RUN   TestAccECSTaskDefinition_constraint
=== PAUSE TestAccECSTaskDefinition_constraint
=== RUN   TestAccECSTaskDefinition_changeVolumesForcesNewResource
=== PAUSE TestAccECSTaskDefinition_changeVolumesForcesNewResource
=== RUN   TestAccECSTaskDefinition_arrays
=== PAUSE TestAccECSTaskDefinition_arrays
=== RUN   TestAccECSTaskDefinition_fargate
=== PAUSE TestAccECSTaskDefinition_fargate
=== RUN   TestAccECSTaskDefinition_Fargate_ephemeralStorage
=== PAUSE TestAccECSTaskDefinition_Fargate_ephemeralStorage
=== RUN   TestAccECSTaskDefinition_executionRole
=== PAUSE TestAccECSTaskDefinition_executionRole
=== RUN   TestAccECSTaskDefinition_disappears
=== PAUSE TestAccECSTaskDefinition_disappears
=== RUN   TestAccECSTaskDefinition_tags
=== PAUSE TestAccECSTaskDefinition_tags
=== RUN   TestAccECSTaskDefinition_proxy
=== PAUSE TestAccECSTaskDefinition_proxy
=== RUN   TestAccECSTaskDefinition_inferenceAccelerator
=== PAUSE TestAccECSTaskDefinition_inferenceAccelerator
=== CONT  TestAccECSTaskDefinition_basic
=== CONT  TestAccECSTaskDefinition_withTaskRoleARN
=== CONT  TestAccECSTaskDefinition_withRuntimePlatform
=== CONT  TestAccECSTaskDefinition_Fargate_withRuntimePlatformWithoutArch
=== CONT  TestAccECSTaskDefinition_withECSService
=== CONT  TestAccECSTaskDefinition_withEFSVolumeMinimal
=== CONT  TestAccECSTaskDefinition_withTaskScopedDockerVolume
=== CONT  TestAccECSTaskDefinition_withFSxWinFileSystem
=== CONT  TestAccECSTaskDefinition_withEFSAccessPoint
=== CONT  TestAccECSTaskDefinition_withTransitEncryptionEFSVolume
=== CONT  TestAccECSTaskDefinition_withEFSVolume
=== CONT  TestAccECSTaskDefinition_fargate
=== CONT  TestAccECSTaskDefinition_inferenceAccelerator
=== CONT  TestAccECSTaskDefinition_proxy
=== CONT  TestAccECSTaskDefinition_tags
=== CONT  TestAccECSTaskDefinition_disappears
=== CONT  TestAccECSTaskDefinition_executionRole
=== CONT  TestAccECSTaskDefinition_Fargate_ephemeralStorage
=== CONT  TestAccECSTaskDefinition_withDockerVolume
=== CONT  TestAccECSTaskDefinition_withScratchVolume
--- PASS: TestAccECSTaskDefinition_withScratchVolume (22.47s)
=== CONT  TestAccECSTaskDefinition_withDockerVolumeMinimal
--- PASS: TestAccECSTaskDefinition_withTaskScopedDockerVolume (25.78s)
=== CONT  TestAccECSTaskDefinition_Fargate_withRuntimePlatform
--- PASS: TestAccECSTaskDefinition_inferenceAccelerator (25.86s)
=== CONT  TestAccECSTaskDefinition_arrays
--- PASS: TestAccECSTaskDefinition_withRuntimePlatform (26.00s)
=== CONT  TestAccECSTaskDefinition_withPidMode
=== CONT  TestAccECSTaskDefinition_changeVolumesForcesNewResource
--- PASS: TestAccECSTaskDefinition_Fargate_ephemeralStorage (26.00s)
--- PASS: TestAccECSTaskDefinition_withDockerVolume (26.08s)
=== CONT  TestAccECSTaskDefinition_constraint
--- PASS: TestAccECSTaskDefinition_Fargate_withRuntimePlatformWithoutArch (26.13s)
=== CONT  TestAccECSTaskDefinition_withNetworkMode
--- PASS: TestAccECSTaskDefinition_withTaskRoleARN (26.90s)
=== CONT  TestAccECSTaskDefinition_withIPCMode
--- PASS: TestAccECSTaskDefinition_executionRole (26.96s)
--- PASS: TestAccECSTaskDefinition_fargate (37.79s)
--- PASS: TestAccECSTaskDefinition_proxy (38.27s)
--- PASS: TestAccECSTaskDefinition_disappears (39.48s)
--- PASS: TestAccECSTaskDefinition_withEFSVolumeMinimal (39.60s)
--- PASS: TestAccECSTaskDefinition_withTransitEncryptionEFSVolume (39.88s)
--- PASS: TestAccECSTaskDefinition_withEFSVolume (40.24s)
--- PASS: TestAccECSTaskDefinition_basic (40.70s)
--- PASS: TestAccECSTaskDefinition_withEFSAccessPoint (43.05s)
--- PASS: TestAccECSTaskDefinition_withDockerVolumeMinimal (22.79s)
--- PASS: TestAccECSTaskDefinition_arrays (22.56s)
--- PASS: TestAccECSTaskDefinition_Fargate_withRuntimePlatform (22.68s)
--- PASS: TestAccECSTaskDefinition_constraint (24.56s)
--- PASS: TestAccECSTaskDefinition_withIPCMode (24.25s)
--- PASS: TestAccECSTaskDefinition_withNetworkMode (25.04s)
--- PASS: TestAccECSTaskDefinition_withPidMode (25.17s)
--- PASS: TestAccECSTaskDefinition_changeVolumesForcesNewResource (32.09s)
--- PASS: TestAccECSTaskDefinition_tags (59.37s)
--- PASS: TestAccECSTaskDefinition_withECSService (103.21s)
--- PASS: TestAccECSTaskDefinition_withFSxWinFileSystem (3410.94s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ecs	3412.244s

@YakDriver YakDriver force-pushed the add-ecs-task-def-family-validation branch from 47869b6 to d9e6ddb Compare January 7, 2022 18:29
@github-actions github-actions bot added the tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. label Jan 7, 2022
@YakDriver YakDriver added this to the v3.72.0 milestone Jan 7, 2022
@YakDriver YakDriver merged commit 6d88292 into hashicorp:main Jan 7, 2022
@github-actions
Copy link

This functionality has been released in v3.72.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 May 27, 2022
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/ecs Issues and PRs that pertain to the ecs service. size/XS 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.

4 participants