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

Rename s3_bucket_object to s3_object #22850

Merged
merged 17 commits into from
Jan 31, 2022
Merged

Rename s3_bucket_object to s3_object #22850

merged 17 commits into from
Jan 31, 2022

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Jan 31, 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 #15458
Relates #22776

Output from acceptance testing (us-west-2):

% make testacc TESTS=TestAccS3Object PKG=s3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3Object'  -timeout 180m
--- PASS: TestAccS3ObjectDataSource_singleSlashAsKey (37.47s)
--- PASS: TestAccS3Object_objectBucketKeyEnabled (38.45s)
--- PASS: TestAccS3ObjectCopy_basic (38.80s)
--- PASS: TestAccS3Object_defaultBucketSSE (40.43s)
--- PASS: TestAccS3Object_bucketBucketKeyEnabled (40.56s)
--- SKIP: TestAccS3Object_nonVersioned (0.00s)
--- PASS: TestAccS3ObjectsDataSource_maxKeys (59.75s)
--- PASS: TestAccS3ObjectsDataSource_all (63.36s)
--- PASS: TestAccS3ObjectsDataSource_basic (64.64s)
--- PASS: TestAccS3ObjectsDataSource_encoded (64.71s)
--- PASS: TestAccS3ObjectsDataSource_prefixes (64.94s)
--- PASS: TestAccS3ObjectsDataSource_startAfter (65.30s)
--- PASS: TestAccS3ObjectsDataSource_fetchOwner (65.38s)
--- PASS: TestAccS3ObjectsDataSource_basicViaAccessPoint (66.11s)
--- PASS: TestAccS3Object_objectLockLegalHoldStartWithOn (69.59s)
--- PASS: TestAccS3Object_ignoreTags (70.09s)
--- PASS: TestAccS3Object_updatesWithVersioningViaAccessPoint (70.33s)
--- PASS: TestAccS3Object_updatesWithVersioning (71.52s)
--- PASS: TestAccS3ObjectDataSource_bucketKeyEnabled (33.13s)
--- PASS: TestAccS3Object_noNameNoKey (1.82s)
--- PASS: TestAccS3Object_objectLockRetentionStartWithNone (89.98s)
--- PASS: TestAccS3Object_updateSameFile (55.89s)
--- PASS: TestAccS3Object_objectLockLegalHoldStartWithNone (93.54s)
--- PASS: TestAccS3Object_contentBase64 (29.81s)
--- PASS: TestAccS3Object_withContentCharacteristics (30.17s)
--- PASS: TestAccS3Object_updates (58.71s)
--- PASS: TestAccS3Object_etagEncryption (32.85s)
--- PASS: TestAccS3Object_content (32.14s)
--- PASS: TestAccS3Object_source (30.88s)
--- PASS: TestAccS3ObjectDataSource_objectLockLegalHoldOn (36.23s)
--- PASS: TestAccS3Object_empty (32.77s)
--- PASS: TestAccS3ObjectDataSource_objectLockLegalHoldOff (35.01s)
--- PASS: TestAccS3ObjectDataSource_allParams (34.52s)
--- PASS: TestAccS3Object_objectLockRetentionStartWithSet (115.90s)
--- PASS: TestAccS3ObjectDataSource_leadingSlash (57.77s)
--- PASS: TestAccS3ObjectDataSource_multipleSlashes (62.00s)
--- PASS: TestAccS3Object_sourceHashTrigger (60.26s)
--- PASS: TestAccS3Object_kms (33.70s)
--- PASS: TestAccS3ObjectDataSource_basicViaAccessPoint (34.62s)
--- PASS: TestAccS3ObjectCopy_BucketKeyEnabled_object (33.06s)
--- PASS: TestAccS3ObjectDataSource_kmsEncrypted (36.54s)
--- PASS: TestAccS3ObjectDataSource_basic (34.57s)
--- PASS: TestAccS3ObjectDataSource_readableBody (35.75s)
--- PASS: TestAccS3Object_sse (31.74s)
--- PASS: TestAccS3ObjectCopy_BucketKeyEnabled_bucket (34.49s)
--- PASS: TestAccS3Object_tagsMultipleSlashes (107.55s)
--- PASS: TestAccS3Object_tagsLeadingMultipleSlashes (105.79s)
--- PASS: TestAccS3Object_metadata (77.43s)
--- PASS: TestAccS3Object_acl (74.22s)
--- PASS: TestAccS3Object_tags (99.61s)
--- PASS: TestAccS3Object_tagsLeadingSingleSlash (96.51s)
--- PASS: TestAccS3Object_storageClass (116.84s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	211.668s
% make testacc TESTS=TestAccS3Bucket PKG=s3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3Bucket'  -timeout 180m
--- SKIP: TestAccS3BucketReplicationConfiguration_existingObjectReplication (0.00s)
--- PASS: TestAccS3Bucket_Basic_shouldFailNotFound (31.99s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (47.48s)
--- PASS: TestAccS3Bucket_Basic_forceDestroy (47.86s)
--- PASS: TestAccS3BucketVersioning_disappears (50.03s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_basic (50.71s)
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (56.16s)
--- PASS: TestAccS3Bucket_Manage_versioningAndMfaDeleteDisabled (56.80s)
--- PASS: TestAccS3BucketVersioning_MFADelete (56.93s)
--- PASS: TestAccS3BucketVersioning_basic (57.10s)
--- PASS: TestAccS3Bucket_Manage_MfaDeleteDisabled (57.23s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (57.46s)
--- PASS: TestAccS3Bucket_Basic_keyEnabled (63.03s)
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (71.23s)
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (73.10s)
--- PASS: TestAccS3Bucket_Manage_objectLock (100.58s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (53.81s)
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (29.87s)
--- PASS: TestAccS3Bucket_Basic_acceleration (103.22s)
--- PASS: TestAccS3Bucket_Manage_versioning (110.32s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (63.38s)
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (97.01s)
--- PASS: TestAccS3BucketVersioning_update (133.13s)
--- PASS: TestAccS3Bucket_Security_grantToACL (91.17s)
--- PASS: TestAccS3Bucket_Security_aclToGrant (91.43s)
--- PASS: TestAccS3Bucket_Web_routingRules (102.28s)
--- PASS: TestAccS3Bucket_Security_updateACL (95.67s)
--- PASS: TestAccS3Bucket_Basic_requestPayer (99.72s)
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (82.64s)
--- PASS: TestAccS3Bucket_Replication_twoDestination (85.44s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (83.17s)
--- PASS: TestAccS3Bucket_Basic_generatedName (60.67s)
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (84.20s)
--- PASS: TestAccS3Bucket_Web_redirect (149.55s)
--- PASS: TestAccS3Bucket_Security_policy (143.81s)
--- PASS: TestAccS3Bucket_Web_simple (150.75s)
--- PASS: TestAccS3Bucket_Tags_ignoreTags (48.81s)
--- PASS: TestAccS3Bucket_Basic_namePrefix (61.00s)
--- PASS: TestAccS3Bucket_Tags_basic (64.75s)
--- PASS: TestAccS3Bucket_Security_updateGrant (156.96s)
--- PASS: TestAccS3Bucket_Basic_emptyString (57.71s)
--- PASS: TestAccS3Bucket_Basic_basic (56.99s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (45.19s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (153.34s)
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (157.52s)
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (61.84s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (268.90s)
--- PASS: TestAccS3BucketNotification_update (140.86s)
--- PASS: TestAccS3BucketCorsConfiguration_MultipleRules (50.37s)
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (98.11s)
--- PASS: TestAccS3BucketNotification_Topic_multiple (50.07s)
--- PASS: TestAccS3BucketNotification_topic (50.84s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (322.95s)
--- PASS: TestAccS3Bucket_Replication_basic (256.18s)
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (140.09s)
--- PASS: TestAccS3Bucket_Tags_withNoSystemTags (188.53s)  
--- PASS: TestAccS3BucketNotification_LambdaFunctionLambdaFunctionARN_alias (38.13s)
--- PASS: TestAccS3BucketReplicationConfiguration_disappears (36.40s)
--- PASS: TestAccS3BucketNotification_lambdaFunction (48.51s)
--- PASS: TestAccS3BucketNotification_queue (72.46s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2SameRegion (175.06s)
--- PASS: TestAccS3BucketMetric_withFilterSingleTag (57.14s)
--- PASS: TestAccS3Bucket_Tags_withSystemTags (204.55s)
--- PASS: TestAccS3BucketMetric_withFilterMultipleTags (56.50s)
--- PASS: TestAccS3BucketMetric_withFilterPrefixAndSingleTag (52.94s)
--- PASS: TestAccS3BucketMetric_withFilterPrefixAndMultipleTags (53.26s)
--- PASS: TestAccS3BucketMetric_withEmptyFilter (1.34s)
--- PASS: TestAccS3BucketMetric_withFilterPrefix (54.73s)
--- PASS: TestAccS3BucketPublicAccessBlock_Disappears_bucket (21.34s)
--- PASS: TestAccS3BucketMetric_basic (29.13s)
--- PASS: TestAccS3BucketPublicAccessBlock_restrictPublicBuckets (80.85s)
--- PASS: TestAccS3BucketPublicAccessBlock_disappears (28.91s)
--- PASS: TestAccS3BucketPublicAccessBlock_ignorePublicACLs (81.41s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicPolicy (80.56s)
--- PASS: TestAccS3BucketInventory_encryptWithSSEKMS (29.99s)
--- PASS: TestAccS3BucketPublicAccessBlock_blockPublicACLs (80.21s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutPrefix (315.91s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_tagFilter (307.98s)
--- PASS: TestAccS3BucketInventory_encryptWithSSES3 (31.28s)
--- PASS: TestAccS3BucketPublicAccessBlock_basic (32.74s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2DestinationMetrics (306.11s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2 (308.96s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutStorageClass (306.04s)
--- PASS: TestAccS3BucketPolicy_basic (35.00s)
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_disappears (31.04s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicaModifications (306.94s)
--- PASS: TestAccS3BucketInventory_basic (35.36s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_andOperator (356.25s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicationTimeControl (297.27s)
--- PASS: TestAccS3BucketOwnershipControls_Disappears_bucket (27.65s)
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_basic (38.10s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (65.80s)
--- PASS: TestAccS3BucketOwnershipControls_Rule_objectOwnership (65.57s)
--- PASS: TestAccS3BucketOwnershipControls_disappears (37.35s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_empty (1.55s)
--- PASS: TestAccS3BucketOwnershipControls_basic (40.19s)
--- PASS: TestAccS3Bucket_Security_corsDelete (37.07s)
--- PASS: TestAccS3BucketDataSource_website (40.67s)
--- PASS: TestAccS3BucketReplicationConfiguration_twoDestination (287.30s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsNonEmptyFilter (284.53s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAddAccessControlTranslation (331.32s)
--- PASS: TestAccS3BucketDataSource_basic (44.69s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAccessControlTranslation (334.30s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_empty (1.62s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (116.23s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (106.08s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsEmptyFilter (283.08s)
--- PASS: TestAccS3Bucket_Security_logging (67.27s)
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (50.71s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_default (48.36s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithStorageClassAnalysis_full (50.67s)
--- PASS: TestAccS3Bucket_Security_corsUpdate (85.01s)
--- PASS: TestAccS3BucketCorsConfiguration_SingleRule (49.89s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_multipleTags (78.86s)
--- PASS: TestAccS3BucketCorsConfiguration_disappears (42.30s)
--- PASS: TestAccS3BucketCorsConfiguration_basic (46.27s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_remove (78.71s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_removed (76.15s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_prefixAndTags (81.50s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_prefix (78.49s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_WithFilter_singleTag (79.43s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (190.23s)
--- PASS: TestAccS3BucketIntelligentTieringConfiguration_Filter (163.99s)
--- PASS: TestAccS3BucketCorsConfiguration_update (95.29s)
--- PASS: TestAccS3BucketAnalyticsConfiguration_updateBasic (98.66s)
--- PASS: TestAccS3BucketReplicationConfiguration_basic (330.44s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/s3	721.275s

@YakDriver YakDriver requested a review from ewbankkit as a code owner January 31, 2022 17:50
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. examples Introduces or discusses updates to examples. linter Pertains to changes to or issues with the various linters. provider Pertains to the provider itself, rather than any interaction with AWS. service/apigateway Issues and PRs that pertain to the apigateway service. service/apigatewayv2 Issues and PRs that pertain to the apigatewayv2 service. service/cloudformation Issues and PRs that pertain to the cloudformation service. service/cloudtrail Issues and PRs that pertain to the cloudtrail service. service/codebuild Issues and PRs that pertain to the codebuild service. service/configservice Issues and PRs that pertain to the configservice service. service/databasemigrationservice service/ec2 Issues and PRs that pertain to the ec2 service. labels Jan 31, 2022
@github-actions github-actions bot added service/emr Issues and PRs that pertain to the emr service. service/gamelift Issues and PRs that pertain to the gamelift service. service/guardduty Issues and PRs that pertain to the guardduty service. service/imagebuilder Issues and PRs that pertain to the imagebuilder service. service/kafkaconnect Issues and PRs that pertain to the kafkaconnect service. service/kinesisanalyticsv2 Issues and PRs that pertain to the kinesisanalyticsv2 service. service/lambda Issues and PRs that pertain to the lambda service. service/mwaa Issues and PRs that pertain to the mwaa service. service/quicksight Issues and PRs that pertain to the quicksight service. service/rds Issues and PRs that pertain to the rds service. service/s3 Issues and PRs that pertain to the s3 service. service/sagemaker Issues and PRs that pertain to the sagemaker service. service/servicecatalog Issues and PRs that pertain to the servicecatalog service. service/signer Issues and PRs that pertain to the signer service. service/ssm Issues and PRs that pertain to the ssm service. service/storagegateway Issues and PRs that pertain to the storagegateway service. service/synthetics Issues and PRs that pertain to the synthetics service. sweeper Pertains to changes to or issues with the sweeper. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/XL Managed by automation to categorize the size of a PR. labels Jan 31, 2022
@YakDriver YakDriver added this to the v4.0.0 milestone Jan 31, 2022
@YakDriver YakDriver merged commit bfb1b63 into release/4.x Jan 31, 2022
@YakDriver YakDriver deleted the f-rename-s3-bucket-object branch January 31, 2022 18:30
github-actions bot pushed a commit that referenced this pull request Jan 31, 2022
Update CHANGELOG.md for #22850
e1f74b5
anGie44 pushed a commit that referenced this pull request Jan 31, 2022
@anGie44
Update CHANGELOG.md for #22850
585486e
@YakDriver YakDriver mentioned this pull request Feb 1, 2022
Merged
@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 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit Awaiting requested review from ewbankkit

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. examples Introduces or discusses updates to examples. linter Pertains to changes to or issues with the various linters. provider Pertains to the provider itself, rather than any interaction with AWS. service/apigateway Issues and PRs that pertain to the apigateway service. service/apigatewayv2 Issues and PRs that pertain to the apigatewayv2 service. service/cloudformation Issues and PRs that pertain to the cloudformation service. service/cloudtrail Issues and PRs that pertain to the cloudtrail service. service/codebuild Issues and PRs that pertain to the codebuild service. service/configservice Issues and PRs that pertain to the configservice service. service/ec2 Issues and PRs that pertain to the ec2 service. service/elasticbeanstalk Issues and PRs that pertain to the elasticbeanstalk service. service/emr Issues and PRs that pertain to the emr service. service/gamelift Issues and PRs that pertain to the gamelift service. service/guardduty Issues and PRs that pertain to the guardduty service. service/imagebuilder Issues and PRs that pertain to the imagebuilder service. service/kafkaconnect Issues and PRs that pertain to the kafkaconnect service. service/kinesisanalyticsv2 Issues and PRs that pertain to the kinesisanalyticsv2 service. service/lambda Issues and PRs that pertain to the lambda service. service/mwaa Issues and PRs that pertain to the mwaa service. service/quicksight Issues and PRs that pertain to the quicksight service. service/rds Issues and PRs that pertain to the rds service. service/s3 Issues and PRs that pertain to the s3 service. service/sagemaker Issues and PRs that pertain to the sagemaker service. service/servicecatalog Issues and PRs that pertain to the servicecatalog service. service/signer Issues and PRs that pertain to the signer service. service/ssm Issues and PRs that pertain to the ssm service. service/storagegateway Issues and PRs that pertain to the storagegateway service. service/synthetics Issues and PRs that pertain to the synthetics service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v4.0.0
Development

Successfully merging this pull request may close these issues.
1 participant
@YakDriver