-
Notifications
You must be signed in to change notification settings - Fork 9.6k
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
provider/aws: Support MFA delete for s3 bucket versioning #10020
Conversation
Is this still WIP? |
506d31a
to
25518f9
Compare
25518f9
to
44c4fc2
Compare
Fixes #7902 ``` % make testacc TEST=./builtin/providers/aws % TESTARGS='-run=TestAccAWSS3Bucket_' % ✹ ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /terraform/vendor/) 2016/12/12 12:11:45 Generated command/internal_plugin_list.go TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSS3Bucket_ -timeout 120m === RUN TestAccAWSS3Bucket_importBasic --- PASS: TestAccAWSS3Bucket_importBasic (55.74s) === RUN TestAccAWSS3Bucket_importWithPolicy --- PASS: TestAccAWSS3Bucket_importWithPolicy (63.34s) === RUN TestAccAWSS3Bucket_Notification --- PASS: TestAccAWSS3Bucket_Notification (165.15s) === RUN TestAccAWSS3Bucket_NotificationWithoutFilter --- PASS: TestAccAWSS3Bucket_NotificationWithoutFilter (63.22s) === RUN TestAccAWSS3Bucket_basic --- PASS: TestAccAWSS3Bucket_basic (47.82s) === RUN TestAccAWSS3Bucket_region --- PASS: TestAccAWSS3Bucket_region (18.88s) === RUN TestAccAWSS3Bucket_acceleration --- PASS: TestAccAWSS3Bucket_acceleration (34.56s) === RUN TestAccAWSS3Bucket_RequestPayer --- PASS: TestAccAWSS3Bucket_RequestPayer (90.26s) === RUN TestAccAWSS3Bucket_Policy --- PASS: TestAccAWSS3Bucket_Policy (120.25s) === RUN TestAccAWSS3Bucket_UpdateAcl --- PASS: TestAccAWSS3Bucket_UpdateAcl (87.51s) === RUN TestAccAWSS3Bucket_Website_Simple --- PASS: TestAccAWSS3Bucket_Website_Simple (138.38s) === RUN TestAccAWSS3Bucket_WebsiteRedirect --- PASS: TestAccAWSS3Bucket_WebsiteRedirect (139.44s) === RUN TestAccAWSS3Bucket_WebsiteRoutingRules --- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (97.82s) === RUN TestAccAWSS3Bucket_shouldFailNotFound --- PASS: TestAccAWSS3Bucket_shouldFailNotFound (26.84s) === RUN TestAccAWSS3Bucket_Versioning --- PASS: TestAccAWSS3Bucket_Versioning (131.89s) === RUN TestAccAWSS3Bucket_Cors --- PASS: TestAccAWSS3Bucket_Cors (92.71s) === RUN TestAccAWSS3Bucket_Logging --- PASS: TestAccAWSS3Bucket_Logging (86.46s) === RUN TestAccAWSS3Bucket_Lifecycle --- PASS: TestAccAWSS3Bucket_Lifecycle (132.70s) === RUN TestAccAWSS3Bucket_Replication --- PASS: TestAccAWSS3Bucket_Replication (122.70s) === RUN TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError --- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (39.04s) ```
44c4fc2
to
e519758
Compare
Hi @catsby Thanks for the ping here - finally got this working now :) P. |
Awesome @stack72 ! thanks :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks sane to me, just a question about BC.
Would also love to see a test that exercises the new property, personally, but that may just be me.
@@ -147,24 +147,24 @@ func resourceAwsS3Bucket() *schema.Resource { | |||
}, | |||
|
|||
"versioning": { | |||
Type: schema.TypeSet, | |||
Type: schema.TypeList, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gonna put my ignorance on display here for a moment: would this break configs/require a migration?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically yes, as we are moving from the hashcode to an int - but I figured as it was a 0.8 release and we only ever allow 1 set of versioning, that we wouldn't cause any issue here
Pre this PR I had a bucket that had the following state:
|
Post this PR, changing the set to a list has no effect:
|
Took @paddyforan through this to clear up his question :) |
Yup, questions cleared up, post-merge LGTM :) (Test explanation is: MFA means the tests wouldn't run right because it involves manual interaction. Oops.) |
I'm going to lock this issue 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 similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. |
Fixes #7902