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 resource aws_s3_bucket_versioning #5132

Merged
merged 3 commits into from
Jan 21, 2022

Conversation

devonbleak
Copy link
Contributor

@devonbleak devonbleak commented Jul 9, 2018

Partially Fixes #4418
Relates #20433

Changes proposed in this pull request:

  • Add resource aws_s3_bucket_versioning

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS="-run TestAccAWSS3BucketVersioning -count=1"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run TestAccAWSS3BucketVersioning -count=1 -timeout 120m
=== RUN   TestAccAWSS3BucketVersioning_basic
--- PASS: TestAccAWSS3BucketVersioning_basic (92.86s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       93.568s

I omitted anything to do with mfa_delete as there's currently no way to actually enabled/disable this via terraform.

The S3 API in us-west-2 has some major inconsistencies with updating versioning on buckets, especially between ~11a and ~4p PT on weekdays. I've added a constant for the number of confirmations required before moving on from applying the change to help with this as the acceptance tests were failing both in the status check function and in the testing framework as it got the old value back when it checked whether there were still pending changes in the plan after applying. I have it set to 10 currently and actually did see one instance of the old value being returned between the 9th and 10th confirmations during testing, but so far this seems to be a good number as the old value hasn't leaked since I set it that high (I got consistent failures at 7 or lower).

@ghost ghost added the size/L Managed by automation to categorize the size of a PR. label Jul 9, 2018
@bflad bflad added new-resource Introduces a new resource. service/s3 Issues and PRs that pertain to the s3 service. labels Jul 10, 2018
@aeschright aeschright requested a review from a team June 25, 2019 21:27
@teamterraform
Copy link

Notification of Recent and Upcoming Changes to Contributions

Thank you for this contribution! There have been a few recent development changes that affect this pull request. We apologize for the inconvenience, especially if there have been long review delays up until now. Please note that this is automated message from an unmonitored account. See the FAQ for additional information on the maintainer team and review prioritization.

If you are unable to complete these updates, please leave a comment for the community and maintainers so someone can potentially continue the work. The maintainers will encourage other contributors to use the existing contribution as the base for additional changes as appropriate. Otherwise, contributions that do not receive updated code or comments from the original contributor may be closed in the future so the maintainers can focus on active items.

For the most up to date information about Terraform AWS Provider development, see the Contributing Guide. Additional technical debt changes can be tracked with the technical-debt label on issues.

As part of updating a pull request with these changes, the most current unit testing and linting will run. These may report issues that were not previously reported.

Action Required: Terraform 0.12 Syntax

Reference: #8950
Reference: #14417

Version 3 and later of the Terraform AWS Provider, which all existing contributions would potentially be added, only supports Terraform 0.12 and later. Certain syntax elements of Terraform 0.11 and earlier show deprecation warnings during runs with Terraform 0.12. Documentation and test configurations, such as those including deprecated string interpolations (some_attribute = "${aws_service_thing.example.id}") should be updated to the newer syntax (some_attribute = aws_service_thing.example.id). Contribution testing will automatically fail on older syntax in the near future. Please see the referenced issues for additional information.

Action Required: Terraform Plugin SDK Version 2

Reference: #14551

The Terraform AWS Provider has been upgraded to the latest version of the Terraform Plugin SDK. Generally, most changes to contributions should only involve updating Go import paths in source code files. Please see the referenced issue for additional information.

Action Required: Removal of website/aws.erb File

Reference: #14712

Any changes to the website/aws.erb file are no longer necessary and should be removed from this contribution to prevent merge issues in the near future when the file is removed from the repository. Please see the referenced issue for additional information.

Upcoming Change of Git Branch Naming

Reference: #14292

Development environments will need their upstream Git branch updated from master to main in the near future. Please see the referenced issue for additional information and scheduling.

Upcoming Change of GitHub Organization

Reference: #14715

This repository will be migrating from https://github.com/terraform-providers/terraform-provider-aws to https://github.com/hashicorp/terraform-provider-aws. No practitioner or developer action is anticipated and most GitHub functionality will automatically redirect to the new location. Go import paths including terraform-providers can remain for now. Please see the referenced issue for additional information and scheduling.

Base automatically changed from master to main January 23, 2021 00:55
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:55
@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.

@anGie44 anGie44 self-assigned this Jan 18, 2022
@anGie44 anGie44 added this to the v4.0.0 milestone Jan 19, 2022
@anGie44 anGie44 changed the base branch from main to release/4.x January 19, 2022 03:52
@anGie44
Copy link
Contributor

anGie44 commented Jan 20, 2022

Hi @devonbleak , thank you for this PR! As we're getting around to the 4.0 major release, I'm going to resolve any conflicts here and review the changes

@anGie44 anGie44 added the pre-service-packages Includes pre-Service Packages aspects. label Jan 20, 2022
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/L Managed by automation to categorize the size of a PR. pre-service-packages Includes pre-Service Packages aspects. labels Jan 20, 2022
@anGie44 anGie44 force-pushed the r/aws_s3_bucket_versioning branch from fcbec09 to 77d36b7 Compare January 20, 2022 20:42
@devonbleak
Copy link
Contributor Author

Hi @devonbleak , thank you for this PR! As we're getting around to the 4.0 major release, I'm going to resolve any conflicts here and review the changes

Thanks Angie!

Hopefully the tests can get cleaned up - the API inconsistencies when I first did this made it super painful.

@anGie44
Copy link
Contributor

anGie44 commented Jan 21, 2022

Sure thing! I think we might be in luck in that enabling/disabling versioning seem to work as expected without having waiters. AWS does note that enabling can take time to propagate when doing so for the first time, so i've added that note in the docs as well.

Output of acceptance tests (commercial):

--- PASS: TestParseResourceID (0.00s)
    --- PASS: TestParseResourceID/empty_ID (0.00s)
    --- PASS: TestParseResourceID/incorrect_format (0.00s)
    --- PASS: TestParseResourceID/valid_ID_with_bucket (0.00s)
    --- PASS: TestParseResourceID/valid_ID_with_bucket_and_bucket_owner (0.00s)
--- PASS: TestAccS3BucketVersioning_disappears (28.30s)
--- PASS: TestAccS3BucketVersioning_MFADelete (30.54s)
--- PASS: TestAccS3BucketVersioning_basic (30.58s)
--- PASS: TestAccS3BucketVersioning_update (79.77s)

--- PASS: TestAccS3Bucket_Basic_basic (29.67s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (30.09s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (30.12s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (30.23s)
--- PASS: TestAccS3Bucket_Manage_versioning (61.18s)

Output of acceptance tests (gov-cloud):

--- PASS: TestAccS3BucketVersioning_disappears (28.18s)
--- PASS: TestAccS3BucketVersioning_MFADelete (30.47s)
--- PASS: TestAccS3BucketVersioning_basic (30.47s)
--- PASS: TestAccS3BucketVersioning_update (74.59s)

@anGie44 anGie44 force-pushed the r/aws_s3_bucket_versioning branch 3 times, most recently from 34cdd41 to d0b57c2 Compare January 21, 2022 05:37
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Thanks again @devonbleak for submitting this PR! This looks ready to go 🚀 (one of the links in the mardown-link-check CI job is erroring out but unrelated to these changes).

@anGie44 anGie44 force-pushed the r/aws_s3_bucket_versioning branch 2 times, most recently from 4b4336f to 60cd5e0 Compare January 21, 2022 15:05
@anGie44 anGie44 force-pushed the r/aws_s3_bucket_versioning branch 3 times, most recently from c63a4be to 0e8be46 Compare January 21, 2022 15:15
@anGie44 anGie44 force-pushed the r/aws_s3_bucket_versioning branch from f9c590d to d227d57 Compare January 21, 2022 15:59
@anGie44 anGie44 merged this pull request into hashicorp:release/4.x Jan 21, 2022
anGie44 added a commit that referenced this pull request Jan 21, 2022
ewbankkit pushed a commit that referenced this pull request Jan 24, 2022
anGie44 added a commit that referenced this pull request Jan 25, 2022
anGie44 added a commit that referenced this pull request Jan 26, 2022
anGie44 added a commit that referenced this pull request Jan 28, 2022
anGie44 added a commit that referenced this pull request Jan 28, 2022
anGie44 added a commit that referenced this pull request Jan 31, 2022
@github-actions
Copy link

This functionality has been released in v4.0.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 20, 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. new-resource Introduces a new resource. provider Pertains to the provider itself, rather than any interaction with AWS. service/s3 Issues and PRs that pertain to the s3 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.

[Discuss/Feature] Additional S3 Bucket Resources
5 participants