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

EBS Snapshots Create Volume Permission: Fail if the account is snapshot owner #12103

Merged
merged 8 commits into from
Jun 6, 2022
Merged

EBS Snapshots Create Volume Permission: Fail if the account is snapshot owner #12103

merged 8 commits into from
Jun 6, 2022

Conversation

shedimon
Copy link
Contributor

@shedimon shedimon commented Feb 20, 2020 •
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 #12102

Release note for CHANGELOG:

resource/aws_snapshot_create_volume_permission: Check if the account is snapshot owner

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAWSSnapshotCreateVolumePermission_Basic'                                                        
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSSnapshotCreateVolumePermission_Basic -timeout 120m
=== RUN   TestAccAWSSnapshotCreateVolumePermission_Basic
=== PAUSE TestAccAWSSnapshotCreateVolumePermission_Basic
=== CONT  TestAccAWSSnapshotCreateVolumePermission_Basic
--- PASS: TestAccAWSSnapshotCreateVolumePermission_Basic (121.88s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	124.033s

@shedimon shedimon requested a review from a team February 20, 2020 16:18
@ghost ghost added needs-triage Waiting for first response or review from a maintainer. size/S Managed by automation to categorize the size of a PR. labels Feb 20, 2020
@shedimon shedimon mentioned this pull request Feb 20, 2020
Closed
bflad added a commit that referenced this pull request Mar 4, 2020
@bflad
provider: Additional hashibot pull request labeling
a49012a 
Reference: #11567 (missing aws_cur_report service label)
Reference: #12103 (missing aws_snapshot_create_volume_permission service label)
Reference: #12020 / #12224 (missing aws_subnet_ids service label)
@bflad bflad mentioned this pull request Mar 4, 2020
Merged
bflad added a commit that referenced this pull request Mar 10, 2020
@bflad
provider: Additional hashibot pull request labeling (#12241)
4f26bb3 
Reference: #11567 (missing aws_cur_report service label)
Reference: #12103 (missing aws_snapshot_create_volume_permission service label)
Reference: #12020 / #12224 (missing aws_subnet_ids service label)
@Tensho
Copy link
Contributor

Tensho commented May 12, 2020

@gdavison @bflad Please could you provide some feedback here?

@shedimon
Copy link
Contributor Author

@gdavison @bflad Can you please check this one out?

@shedimonG
Copy link

@gdavison @bflad Could you please check out this one?

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
@breathingdust breathingdust added service/ec2 Issues and PRs that pertain to the ec2 service. bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Oct 6, 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.

@ewbankkit
Copy link
Contributor

Note for HashiCorp maintainers: The acceptance tests for this resource share with the account ID 111122223333. Our security folks get nervous when we run these acceptance tests. Modify to share with the configured alternative account(s).

@ewbankkit
Revert "resourceAwsSnapshotCreateVolumePermission: Fail if the accoun…
c454c09 
…t is snapshot owner"

This reverts commit 15deb64.
@ewbankkit
Merge branch 'main' into HEAD
4c72bcc
@ewbankkit
d/aws_ebs_snapshot_ids: Tidy up.
e5a9b15 
Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2EBSSnapshotIDsDataSource_' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2EBSSnapshotIDsDataSource_ -timeout 180m
=== RUN   TestAccEC2EBSSnapshotIDsDataSource_basic
=== PAUSE TestAccEC2EBSSnapshotIDsDataSource_basic
=== RUN   TestAccEC2EBSSnapshotIDsDataSource_sorted
=== PAUSE TestAccEC2EBSSnapshotIDsDataSource_sorted
=== RUN   TestAccEC2EBSSnapshotIDsDataSource_empty
=== PAUSE TestAccEC2EBSSnapshotIDsDataSource_empty
=== CONT  TestAccEC2EBSSnapshotIDsDataSource_basic
=== CONT  TestAccEC2EBSSnapshotIDsDataSource_empty
--- PASS: TestAccEC2EBSSnapshotIDsDataSource_empty (14.20s)
=== CONT  TestAccEC2EBSSnapshotIDsDataSource_sorted
--- PASS: TestAccEC2EBSSnapshotIDsDataSource_basic (55.92s)
--- PASS: TestAccEC2EBSSnapshotIDsDataSource_sorted (72.67s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	93.012s
@ewbankkit
d/aws_ebs_snapshot: Tidy up.
b97c637 
Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2EBSSnapshotDataSource_' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2EBSSnapshotDataSource_ -timeout 180m
=== RUN   TestAccEC2EBSSnapshotDataSource_basic
=== PAUSE TestAccEC2EBSSnapshotDataSource_basic
=== RUN   TestAccEC2EBSSnapshotDataSource_filter
=== PAUSE TestAccEC2EBSSnapshotDataSource_filter
=== RUN   TestAccEC2EBSSnapshotDataSource_mostRecent
=== PAUSE TestAccEC2EBSSnapshotDataSource_mostRecent
=== CONT  TestAccEC2EBSSnapshotDataSource_basic
=== CONT  TestAccEC2EBSSnapshotDataSource_mostRecent
--- PASS: TestAccEC2EBSSnapshotDataSource_basic (58.73s)
=== CONT  TestAccEC2EBSSnapshotDataSource_filter
--- PASS: TestAccEC2EBSSnapshotDataSource_mostRecent (74.99s)
--- PASS: TestAccEC2EBSSnapshotDataSource_filter (55.59s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	123.516s
@ewbankkit
r/aws_snapshot_create_volume_permission: Tidy up.
2d09692 
Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2EBSSnapshotCreateVolumePermission_' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2EBSSnapshotCreateVolumePermission_ -timeout 180m
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_disappears
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_disappears
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_disappears
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_disappears (73.08s)
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_basic (73.37s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	86.886s
@ewbankkit
r/aws_snapshot_create_volume_permission: Error if 'account_id' is the…
23ec2a2 
… snapshot's owner.

Acceptance test output:

% make testacc TESTARGS='-run=TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError' PKG=ec2 ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError -timeout 180m
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError (49.27s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	58.255s
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. service/ec2ebs Issues and PRs that pertain to the ec2ebs service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/XL Managed by automation to categorize the size of a PR. and removed size/S Managed by automation to categorize the size of a PR. labels Jun 6, 2022
ewbankkit
ewbankkit approved these changes Jun 6, 2022
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccEC2EBSSnapshotCreateVolumePermission_' PKG=ec2 ACCTEST_PARALLELISM=2 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 2  -run=TestAccEC2EBSSnapshotCreateVolumePermission_ -timeout 180m
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_disappears
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_disappears
=== RUN   TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
=== PAUSE TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_basic
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_snapshotOwnerExpectError (54.21s)
=== CONT  TestAccEC2EBSSnapshotCreateVolumePermission_disappears
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_basic (69.24s)
--- PASS: TestAccEC2EBSSnapshotCreateVolumePermission_disappears (60.37s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	122.124s

@ewbankkit
Copy link
Contributor 

% make providerlint golangci-lint
==> Checking source code with providerlint...
==> Checking source code with golangci-lint...

@ewbankkit
Copy link
Contributor

@shedimon Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 8a2de07 into hashicorp:main Jun 6, 2022
@github-actions github-actions bot added this to the v4.18.0 milestone Jun 6, 2022
@github-actions
Copy link

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

@shedimon shedimon deleted the fix-ebs-snapshot-perm branch June 10, 2022 07:38
@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 Jul 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
bug Addresses a defect in current functionality. documentation Introduces or discusses updates to documentation. service/ec2ebs Issues and PRs that pertain to the ec2ebs service. service/ec2 Issues and PRs that pertain to the ec2 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
Milestone
v4.18.0
Development

Successfully merging this pull request may close these issues.

EBS Snapshots Create Volume Permission hangs for Owner account
6 participants
@shedimon @Tensho @shedimonG @zhelding @ewbankkit @breathingdust