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 aws_s3_bucket_cors_configuration resource #12141

Merged
merged 4 commits into from
Jan 27, 2022

Conversation

drexler
Copy link
Contributor

@drexler drexler commented Feb 24, 2020

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

Relates #4418
Relates #22776

Release note for CHANGELOG:

**New Resource:** `aws_s3_bucket_cors_configuration`

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSS3BucketCorsConfiguration'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSS3BucketCorsConfiguration -timeout 120m
=== RUN   TestAccAWSS3BucketCorsConfiguration_CreationWithMissingField
=== PAUSE TestAccAWSS3BucketCorsConfiguration_CreationWithMissingField
=== RUN   TestAccAWSS3BucketCorsConfiguration_UpdateWithMissingCorsField
=== PAUSE TestAccAWSS3BucketCorsConfiguration_UpdateWithMissingCorsField
=== RUN   TestAccAWSS3BucketCorsConfiguration_CorsPolicyCreation
=== PAUSE TestAccAWSS3BucketCorsConfiguration_CorsPolicyCreation
=== RUN   TestAccAWSS3BucketCorsConfiguration_CorsPolicyUpdate
=== PAUSE TestAccAWSS3BucketCorsConfiguration_CorsPolicyUpdate
=== CONT  TestAccAWSS3BucketCorsConfiguration_CreationWithMissingField
=== CONT  TestAccAWSS3BucketCorsConfiguration_CorsPolicyCreation
=== CONT  TestAccAWSS3BucketCorsConfiguration_CorsPolicyUpdate
=== CONT  TestAccAWSS3BucketCorsConfiguration_UpdateWithMissingCorsField
--- PASS: TestAccAWSS3BucketCorsConfiguration_UpdateWithMissingCorsField (2.49s)
--- PASS: TestAccAWSS3BucketCorsConfiguration_CreationWithMissingField (2.66s)
--- PASS: TestAccAWSS3BucketCorsConfiguration_CorsPolicyUpdate (21.59s)
--- PASS: TestAccAWSS3BucketCorsConfiguration_CorsPolicyCreation (22.14s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	22.212s
...

@drexler drexler requested a review from a team February 24, 2020 03:16
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Feb 24, 2020
@drexler drexler changed the title S3 cors resource Add aws_s3_bucket_cors_configuration resource Feb 24, 2020
@drexler
Copy link
Contributor Author

drexler commented Feb 24, 2020

The failed check is due to a code lint problem from the most recent merge into master. I will rebase this PR once that's been resolved. @bflad let me know if you want me to fold a fix to that here.

@bflad
Copy link
Contributor

bflad commented Feb 24, 2020

@drexler thanks for the heads up -- fixed on master and will re-run CI for this pull request.

@bflad bflad added new-resource Introduces a new resource. proposal Proposes new design or functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Feb 24, 2020
@drexler
Copy link
Contributor Author

drexler commented Mar 23, 2020

@bflad mind reviewing this?

@pgmillon
Copy link

Since there's no changes on the aws_s3_bucket resource, wouldn't there be a lifecycle conflict between aws_s3_bucket that deletes any existing CORS rules (since cors_rules isn't set) and aws_s3_bucket_cors_configuration that expects CORS rule to be present ?

@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:57
@breathingdust breathingdust requested a review from a team as a code owner January 23, 2021 00:57
@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 19, 2022
@anGie44 anGie44 modified the milestone: v4.0.0 Jan 19, 2022
@anGie44 anGie44 changed the base branch from main to release/4.x January 27, 2022 04:13
@anGie44
Copy link
Contributor

anGie44 commented Jan 27, 2022

Hi @drexler , thanks so much for this PR! we're finally getting around to the major release work that aims to support more independent S3 bucket resources so I'll be actively reviewing this PR and get it ready for merging. I went about creating #22619 without seeing this PR first, so I may port some tests over from there but will use your contributions here as the base. I'll make an attempt to rebase if I have permissions to edit this PR, otherwise I'll need to cherry pick the commits in a new PR and go from there.

@anGie44
Copy link
Contributor

anGie44 commented Jan 27, 2022

Output of acceptance tests (commercial):

--- PASS: TestAccS3BucketCorsConfiguration_disappears (26.74s)
--- PASS: TestAccS3BucketCorsConfiguration_MultipleRules (29.61s)
--- PASS: TestAccS3BucketCorsConfiguration_basic (29.61s)
--- PASS: TestAccS3BucketCorsConfiguration_SingleRule (30.52s)
--- PASS: TestAccS3BucketCorsConfiguration_update (73.78s)

Output of acceptance tests (gov cloud):

--- PASS: TestAccS3BucketCorsConfiguration_disappears (28.17s)
--- PASS: TestAccS3BucketCorsConfiguration_MultipleRules (31.30s)
--- PASS: TestAccS3BucketCorsConfiguration_basic (31.41s)
--- PASS: TestAccS3BucketCorsConfiguration_SingleRule (31.44s)
--- PASS: TestAccS3BucketCorsConfiguration_update (76.20s)

@anGie44 anGie44 added this to the v4.0.0 milestone Jan 27, 2022
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 @drexler , LGTM 🎸

@anGie44 anGie44 merged commit c76e0f4 into hashicorp:release/4.x Jan 27, 2022
anGie44 added a commit that referenced this pull request Jan 28, 2022
* docs: document S3 CORS configuration resource

* r/s3_bucket_cors_configuration: CR updates

* r/s3_bucket_cors_configuration: update ID methods to generic ones; docs formatting

* correct error message

Co-authored-by: Angie Pinilla <[email protected]>
anGie44 added a commit that referenced this pull request Jan 28, 2022
* docs: document S3 CORS configuration resource

* r/s3_bucket_cors_configuration: CR updates

* r/s3_bucket_cors_configuration: update ID methods to generic ones; docs formatting

* correct error message

Co-authored-by: Angie Pinilla <[email protected]>
anGie44 added a commit that referenced this pull request Jan 31, 2022
* docs: document S3 CORS configuration resource

* r/s3_bucket_cors_configuration: CR updates

* r/s3_bucket_cors_configuration: update ID methods to generic ones; docs formatting

* correct error message

Co-authored-by: Angie Pinilla <[email protected]>
@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. proposal Proposes new design or functionality. 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.

6 participants