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/s3_bucket_acl: support pre-2018 naming for buckets in us-east-1 #23678

Merged
merged 2 commits into from
Mar 15, 2022
Merged

r/s3_bucket_acl: support pre-2018 naming for buckets in us-east-1 #23678

merged 2 commits into from
Mar 15, 2022

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented Mar 15, 2022 •
edited
Loading

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 #23676

Output from acceptance testing:

--- PASS: TestAccS3BucketAcl_disappears (16.56s)
--- PASS: TestAccS3BucketAcl_basic (22.07s)
--- PASS: TestAccS3BucketAcl_ACLToGrant (39.02s)
--- PASS: TestAccS3BucketAcl_grantToACL (39.02s)
--- PASS: TestAccS3BucketAcl_updateGrant (42.81s)
--- PASS: TestAccS3BucketAcl_updateACL (53.28s)

--- PASS: TestBucketACLParseResourceID (0.04s)
    --- PASS: TestBucketACLParseResourceID/empty_ID (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket_and_account_ID_format_with_slash_separator (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_account_ID,_and_ACL_format_with_slash_separators (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_account_ID,_and_ACL_format_with_mixed_separators (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_ACL,_and_account_ID_format (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot_and_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dots,_hyphen,_and_numbers (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_number_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_number_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket,_bucket_owner,_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_numbers,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1) (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscores (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_and_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dots,_hyphen,_and_numbers (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_acl_that_has_underscores (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_number_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_number_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1),_bucket_owner,_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1),_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_numbers,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
PASS

@anGie44 anGie44 added the bug Addresses a defect in current functionality. label Mar 15, 2022
@github-actions github-actions bot added service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/M Managed by automation to categorize the size of a PR. labels Mar 15, 2022
@anGie44 anGie44 changed the title r/s3_bucket_acl: support pre-2018 naming for buckets in us-east-1 r/s3_bucket_acl: support pre-2018 naming for buckets in us-east-1 Mar 15, 2022
anGie44 added a commit that referenced this pull request Mar 15, 2022
@anGie44
Update CHANGELOG for #23678
b6918c8
@anGie44 anGie44 added this to the v4.6.0 milestone Mar 15, 2022
@anGie44 anGie44 force-pushed the s3-bucket-acl-import-id branch from b6918c8 to 502a8e8 Compare March 15, 2022 01:31
@YakDriver YakDriver self-assigned this Mar 15, 2022
YakDriver
YakDriver approved these changes Mar 15, 2022
View reviewed changes
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.

LGTM 🎉

Output from tests:

% make testacc TESTS=TestBucketACLParseResourceID PKG=s3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestBucketACLParseResourceID'  -timeout 180m
--- PASS: TestBucketACLParseResourceID (0.02s)
    --- PASS: TestBucketACLParseResourceID/empty_ID (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket_and_account_ID_format_with_slash_separator (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_account_ID,_and_ACL_format_with_slash_separators (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_account_ID,_and_ACL_format_with_mixed_separators (0.00s)
    --- PASS: TestBucketACLParseResourceID/incorrect_bucket,_ACL,_and_account_ID_format (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot_and_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dots,_hyphen,_and_numbers (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_number_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_number_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket,_bucket_owner,_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_that_has_dot,_hyphen,_and_numbers,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1) (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscores (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_and_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dots,_hyphen,_and_numbers (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_acl_that_has_underscores (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_number_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_number_and_bucket_owner (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1),_bucket_owner,_and_acl (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1),_bucket_owner,_and_acl_that_has_hyphens (0.00s)
    --- PASS: TestBucketACLParseResourceID/valid_ID_with_bucket_(pre-2018,_us-east-1)_that_has_underscore,_dot,_hyphen,_and_numbers,_bucket_owner,_and_acl_that_has_hyphens (0.00s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	1.355s
% make testacc TESTS=TestAccS3BucketAcl PKG=s3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketAcl'  -timeout 180m
--- PASS: TestAccS3BucketAcl_disappears (15.69s)
--- PASS: TestAccS3BucketAcl_basic (21.58s)
--- PASS: TestAccS3BucketAcl_updateACL (38.01s)
--- PASS: TestAccS3BucketAcl_ACLToGrant (38.02s)
--- PASS: TestAccS3BucketAcl_grantToACL (38.70s)
--- PASS: TestAccS3BucketAcl_updateGrant (42.70s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	44.102s

@anGie44 anGie44 merged commit a8b99f0 into main Mar 15, 2022
@anGie44 anGie44 deleted the s3-bucket-acl-import-id branch March 15, 2022 16:30
github-actions bot pushed a commit that referenced this pull request Mar 15, 2022
Update CHANGELOG.md for #23678
af6585b
@github-actions
Copy link

This functionality has been released in v4.6.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

github-actions bot commented May 9, 2022

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 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@YakDriver YakDriver YakDriver approved these changes

Assignees

@YakDriver YakDriver

Labels
bug Addresses a defect in current functionality. service/s3 Issues and PRs that pertain to the s3 service. size/M 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
v4.6.0
2 participants
@anGie44 @YakDriver