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

service/s3: update to using typelist #13425

Merged
merged 6 commits into from
Jun 3, 2020
Merged

service/s3: update to using typelist #13425

merged 6 commits into from
Jun 3, 2020

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented May 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

Relates #9956

Release note for CHANGELOG:

service/s3: correct typeset usage with typelist in cases where max_items is 1

Output from acceptance testing:

--- FAIL: TestAccAWSS3BucketNotification_update (17.10s) -- failed in TC, but passes locally
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Empty (3.39s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Empty (3.78s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_basic (17.67s)
--- PASS: TestAccAWSS3BucketMetric_basic (18.11s)
--- PASS: TestAccAWSS3BucketMetric_WithEmptyFilter (18.18s)
--- PASS: TestAccAWSS3BucketInventory_encryptWithSSES3 (21.30s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Full (21.72s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_Default (21.90s)
--- PASS: TestAccAWSS3BucketInventory_basic (22.23s)
--- PASS: TestAccAWSS3BucketInventory_encryptWithSSEKMS (22.16s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndSingleTag (25.50s)
--- PASS: TestAccAWSS3BucketObject_noNameNoKey (4.46s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_removed (27.78s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefixAndMultipleTags (29.63s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Prefix (29.61s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterSingleTag (26.00s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterMultipleTags (26.39s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_MultipleTags (30.46s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_SingleTag (30.60s)
--- PASS: TestAccAWSS3BucketMetric_WithFilterPrefix (30.67s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_PrefixAndTags (31.44s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_WithFilter_Remove (31.83s)
--- PASS: TestAccAWSS3BucketObject_empty (15.29s)
--- PASS: TestAccAWSS3BucketNotification_Queue (19.65s)
--- PASS: TestAccAWSS3BucketNotification_Topic (18.35s)
--- PASS: TestAccAWSS3BucketObject_source (14.96s)
--- PASS: TestAccAWSS3BucketNotification_Topic_Multiple (18.72s)
--- PASS: TestAccAWSS3BucketObject_etagEncryption (14.44s)
--- PASS: TestAccAWSS3BucketObject_content (15.28s)
--- PASS: TestAccAWSS3BucketAnalyticsConfiguration_updateBasic (44.19s)
--- PASS: TestAccAWSS3BucketObject_withContentCharacteristics (15.38s)
--- PASS: TestAccAWSS3BucketObject_NonVersioned (15.42s)
--- PASS: TestAccAWSS3BucketObject_contentBase64 (15.85s)
--- PASS: TestAccAWSS3BucketObject_kms (14.80s)
--- PASS: TestAccAWSS3BucketObject_sse (14.65s)
--- PASS: TestAccAWSS3BucketNotification_LambdaFunction_LambdaFunctionArn_Alias (30.45s)
--- PASS: TestAccAWSS3BucketObject_updateSameFile (24.69s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioning (25.30s)
--- PASS: TestAccAWSS3BucketNotification_LambdaFunction (38.86s)
--- PASS: TestAccAWSS3BucketObject_updatesWithVersioningViaAccessPoint (28.99s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_bucketDisappears (13.60s)
--- PASS: TestAccAWSS3BucketPolicy_basic (19.23s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_disappears (17.83s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_basic (19.44s)
--- PASS: TestAccAWSS3BucketObject_updates (35.62s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithOn (25.35s)
--- PASS: TestAccAWSS3BucketObject_metadata (35.54s)
--- PASS: TestAccAWSS3BucketObject_acl (36.56s)
--- PASS: TestAccAWSS3BucketPolicy_policyUpdate (30.01s)
--- PASS: TestAccAWSS3Bucket_basic (17.66s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockLegalHoldStartWithNone (36.71s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (19.05s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithNone (41.37s)
--- PASS: TestAccAWSS3Bucket_namePrefix (18.33s)
--- PASS: TestAccAWSS3Bucket_generatedName (16.99s)
--- PASS: TestAccAWSS3MultiBucket_withTags (20.05s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicAcls (38.08s)
--- PASS: TestAccAWSS3BucketObject_tags (48.33s)
--- PASS: TestAccAWSS3BucketObject_tagsLeadingSlash (47.45s)
--- PASS: TestAccAWSS3BucketObject_ObjectLockRetentionStartWithSet (43.94s)
--- PASS: TestAccAWSS3Bucket_region (17.93s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_BlockPublicPolicy (38.89s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_IgnorePublicAcls (39.17s)
--- PASS: TestAccAWSS3BucketPublicAccessBlock_RestrictPublicBuckets (39.50s)
--- PASS: TestAccAWSS3BucketObject_storageClass (56.88s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (26.55s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (11.26s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (26.36s)
--- PASS: TestAccAWSS3Bucket_acceleration (30.07s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (17.14s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (19.21s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (26.83s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (28.32s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (16.76s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (18.62s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (50.73s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (28.36s)
--- PASS: TestAccAWSS3Bucket_Policy (38.08s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (29.07s)
--- PASS: TestAccAWSS3Bucket_UpdateGrant (40.95s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (16.68s)
--- PASS: TestAWSS3BucketName (0.00s)
--- PASS: TestBucketRegionalDomainName (0.00s)
--- PASS: TestWebsiteEndpoint (0.00s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (38.50s)
--- PASS: TestAccAWSS3Bucket_Logging (21.90s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (29.15s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (39.77s)
--- PASS: TestAccAWSS3Bucket_Versioning (35.41s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (13.50s)
--- PASS: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (26.37s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (12.47s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (12.18s)
--- PASS: TestAccAWSS3Bucket_LifecycleBasic (33.51s)
--- PASS: TestAccAWSS3Bucket_objectLock (22.08s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (29.85s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (86.23s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (42.92s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (43.88s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (66.38s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (70.88s)
--- PASS: TestAccAWSS3Bucket_Replication (114.12s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (113.04s)

@ghost ghost added size/L Managed by automation to categorize the size of a PR. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels May 20, 2020
@anGie44 anGie44 added the technical-debt Addresses areas of the codebase that need refactoring or redesign. label May 20, 2020
@anGie44 anGie44 marked this pull request as ready for review May 20, 2020 15:12
@anGie44 anGie44 requested a review from a team May 20, 2020 15:12
@gdavison gdavison self-assigned this Jun 1, 2020
gdavison
gdavison approved these changes Jun 2, 2020
View reviewed changes
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenAES256IsUsed (16.91s)
--- PASS: TestAccAWSS3Bucket_region (19.18s)
--- PASS: TestAccAWSS3Bucket_basic (19.36s)
--- PASS: TestAccAWSS3Bucket_Bucket_EmptyString (19.87s)
--- PASS: TestAccAWSS3Bucket_namePrefix (20.34s)
--- PASS: TestAccAWSS3Bucket_generatedName (21.10s)
--- PASS: TestAccAWSS3Bucket_enableDefaultEncryption_whenTypical (21.67s)
--- PASS: TestAccAWSS3Bucket_GrantToAcl (28.47s)
--- PASS: TestAccAWSS3Bucket_WebsiteRoutingRules (29.06s)
--- PASS: TestAccAWSS3Bucket_UpdateAcl (29.59s)
--- PASS: TestAccAWSS3Bucket_shouldFailNotFound (11.00s)
--- PASS: TestAccAWSS3Bucket_AclToGrant (30.20s)
--- PASS: TestAccAWSS3Bucket_acceleration (32.58s)
--- PASS: TestAccAWSS3Bucket_RequestPayer (32.39s)
--- PASS: TestAccAWSS3Bucket_Cors_Delete (16.98s)
--- PASS: TestAccAWSS3Bucket_Cors_EmptyOrigin (18.16s)
--- PASS: TestAccAWSS3Bucket_Website_Simple (38.73s)
--- PASS: TestAccAWSS3Bucket_WebsiteRedirect (39.45s)
--- PASS: TestAccAWSS3Bucket_Policy (42.25s)
--- PASS: TestAccAWSS3Bucket_UpdateGrant (42.60s)
--- PASS: TestAccAWSS3Bucket_Logging (21.49s)
--- PASS: TestAccAWSS3Bucket_LifecycleRule_Expiration_EmptyConfigurationBlock (15.59s)
--- PASS: TestAccAWSS3Bucket_disableDefaultEncryption_whenDefaultEncryptionIsEnabled (27.81s)
--- FAIL: TestAccAWSS3Bucket_LifecycleBasic (24.78s)
--- PASS: TestAccAWSS3Bucket_forceDestroy (12.66s)
--- PASS: TestAccAWSS3Bucket_Versioning (33.31s)
--- FAIL: TestAccAWSS3Bucket_LifecycleExpireMarkerOnly (24.70s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithEmptyPrefixes (11.45s)
--- PASS: TestAccAWSS3Bucket_forceDestroyWithObjectLockEnabled (12.52s)
--- PASS: TestAccAWSS3Bucket_Cors_Update (37.56s)
--- PASS: TestAccAWSS3Bucket_tagsWithNoSystemTags (60.43s)
--- PASS: TestAccAWSS3Bucket_ReplicationExpectVersioningValidationError (29.55s)
--- PASS: TestAccAWSS3Bucket_objectLock (30.44s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutStorageClass (43.17s)
--- PASS: TestAccAWSS3Bucket_ReplicationWithoutPrefix (41.45s)
--- PASS: TestAccAWSS3Bucket_tagsWithSystemTags (83.44s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AddAccessControlTranslation (68.10s)
--- PASS: TestAccAWSS3Bucket_ReplicationConfiguration_Rule_Destination_AccessControlTranslation (70.59s)
--- PASS: TestAccAWSS3Bucket_Replication (113.75s)
--- PASS: TestAccAWSS3Bucket_ReplicationSchemaV2 (124.19s)
--- PASS: TestAccAWSS3MultiBucket_withTags (20.73s)

The failed tests are unfortunately the tests affected by this PR, but also pre-existing failures

aws/resource_aws_s3_bucket.go Show resolved Hide resolved
@anGie44 anGie44 merged commit 96b93a8 into master Jun 3, 2020
@anGie44 anGie44 deleted the ap_typelist_s3 branch June 3, 2020 17:44
@anGie44 anGie44 added this to the v2.65.0 milestone Jun 3, 2020
@ghost
Copy link

ghost commented Jun 5, 2020

This has been released in version 2.65.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 for triage. Thanks!

@ghost
Copy link

ghost commented Jul 4, 2020

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 feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Jul 4, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gdavison gdavison gdavison approved these changes

Assignees

@gdavison gdavison

Labels
service/s3 Issues and PRs that pertain to the s3 service. size/L Managed by automation to categorize the size of a PR. technical-debt Addresses areas of the codebase that need refactoring or redesign. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v2.65.0
Development

Successfully merging this pull request may close these issues.
2 participants
@anGie44 @gdavison