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.

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

tests(s3): updated s3 test data config to use aws_service_principal data source #38693

Merged

Conversation

myerscf
Copy link
Contributor

@myerscf myerscf commented Aug 5, 2024

Description

With the release of the AWS Service Principal Name Data Source in v5.60.0 this PR updates S3 test resources to use it, in order to provide more effective testing across partitions

Relations

Relates #38307

References

N/A

Output from Acceptance Testing

%  TF_ACC=1 go test ./internal/service/s3/ -v -run="TestAccS3BucketPolicyDataSource"

=== RUN   TestAccS3BucketPolicyDataSource_basic
=== PAUSE TestAccS3BucketPolicyDataSource_basic
=== CONT  TestAccS3BucketPolicyDataSource_basic
--- PASS: TestAccS3BucketPolicyDataSource_basic (18.81s)
PASS

% TF_ACC=1 go test ./internal/service/s3/ -v -run="TestAccS3BucketPolicy"

=== RUN   TestAccS3BucketPolicyDataSource_basic
=== PAUSE TestAccS3BucketPolicyDataSource_basic
=== RUN   TestAccS3BucketPolicy_basic
=== PAUSE TestAccS3BucketPolicy_basic
=== RUN   TestAccS3BucketPolicy_disappears
=== PAUSE TestAccS3BucketPolicy_disappears
=== RUN   TestAccS3BucketPolicy_disappears_bucket
=== PAUSE TestAccS3BucketPolicy_disappears_bucket
=== RUN   TestAccS3BucketPolicy_policyUpdate
=== PAUSE TestAccS3BucketPolicy_policyUpdate
=== RUN   TestAccS3BucketPolicy_IAMRoleOrder_policyDoc
=== PAUSE TestAccS3BucketPolicy_IAMRoleOrder_policyDoc
=== RUN   TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal
=== PAUSE TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal
=== RUN   TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode
=== PAUSE TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode
=== RUN   TestAccS3BucketPolicy_migrate_noChange
=== PAUSE TestAccS3BucketPolicy_migrate_noChange
=== RUN   TestAccS3BucketPolicy_migrate_withChange
=== PAUSE TestAccS3BucketPolicy_migrate_withChange
=== RUN   TestAccS3BucketPolicy_directoryBucket
=== PAUSE TestAccS3BucketPolicy_directoryBucket
=== CONT  TestAccS3BucketPolicyDataSource_basic
=== CONT  TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal
=== CONT  TestAccS3BucketPolicy_IAMRoleOrder_policyDoc
=== CONT  TestAccS3BucketPolicy_migrate_withChange
=== CONT  TestAccS3BucketPolicy_directoryBucket
=== CONT  TestAccS3BucketPolicy_disappears
=== CONT  TestAccS3BucketPolicy_migrate_noChange
=== CONT  TestAccS3BucketPolicy_policyUpdate
=== CONT  TestAccS3BucketPolicy_basic
=== CONT  TestAccS3BucketPolicy_disappears_bucket
--- PASS: TestAccS3BucketPolicy_directoryBucket (25.59s)
=== CONT  TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode
--- PASS: TestAccS3BucketPolicy_disappears_bucket (25.67s)
--- PASS: TestAccS3BucketPolicyDataSource_basic (26.59s)
--- PASS: TestAccS3BucketPolicy_disappears (27.59s)
--- PASS: TestAccS3BucketPolicy_basic (30.34s)
--- PASS: TestAccS3BucketPolicy_migrate_withChange (41.06s)
--- PASS: TestAccS3BucketPolicy_migrate_noChange (42.28s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (45.18s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (49.67s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (56.67s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (84.02s)
PASS

.....

Signed-off-by: Fred Myerscough <myerscf@amazon.co.uk>
@myerscf myerscf requested a review from a team as a code owner August 5, 2024 18:13
Copy link

github-actions bot commented Aug 5, 2024

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/s3 Issues and PRs that pertain to the s3 service. needs-triage Waiting for first response or review from a maintainer. labels Aug 5, 2024
@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 6, 2024
Copy link
Member

@jar-b jar-b 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 PKG=s3 TESTS=TestAccS3BucketNotification_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketNotification_'  -timeout 360m

--- PASS: TestAccS3BucketNotification_directoryBucket (12.97s)
--- PASS: TestAccS3BucketNotification_eventbridge (30.08s)
--- PASS: TestAccS3BucketNotification_topic (34.72s)
--- PASS: TestAccS3BucketNotification_Topic_multiple (35.33s)
--- PASS: TestAccS3BucketNotification_lambdaFunction (43.97s)
--- PASS: TestAccS3BucketNotification_LambdaFunctionLambdaFunctionARN_alias (45.75s)
--- PASS: TestAccS3BucketNotification_queue (56.54s)
--- PASS: TestAccS3BucketNotification_update (70.79s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 77.018s
% make testacc PKG=s3 TESTS=TestAccS3BucketPolicy_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketPolicy_'  -timeout 360m

--- PASS: TestAccS3BucketPolicy_directoryBucket (26.65s)
--- PASS: TestAccS3BucketPolicy_disappears_bucket (29.43s)
--- PASS: TestAccS3BucketPolicy_disappears (31.51s)
--- PASS: TestAccS3BucketPolicy_basic (33.59s)
--- PASS: TestAccS3BucketPolicy_migrate_withChange (42.40s)
--- PASS: TestAccS3BucketPolicy_migrate_noChange (44.86s)
--- PASS: TestAccS3BucketPolicy_policyUpdate (47.84s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (50.23s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (54.35s)
--- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (87.21s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 97.084s
% make testacc PKG=s3 TESTS=TestAccS3BucketReplicationConfiguration_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketReplicationConfiguration_'  -timeout 360m

--- PASS: TestAccS3BucketReplicationConfiguration_directoryBucket (32.47s)
=== CONT  TestAccS3BucketReplicationConfiguration_disappears
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2SameRegion (45.50s)
=== CONT  TestAccS3BucketReplicationConfiguration_replicaModifications
--- PASS: TestAccS3BucketReplicationConfiguration_filter_tagFilter (71.76s)
=== CONT  TestAccS3BucketReplicationConfiguration_replicationTimeControl
--- PASS: TestAccS3BucketReplicationConfiguration_withoutPrefix (71.88s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsEmptyFilter (72.69s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutStorageClass (73.39s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_withoutId (74.00s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_emptyConfigurationBlock (75.23s)
--- PASS: TestAccS3BucketReplicationConfiguration_twoDestination (76.90s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2 (76.93s)
--- PASS: TestAccS3BucketReplicationConfiguration_multipleDestinationsNonEmptyFilter (77.25s)
--- PASS: TestAccS3BucketReplicationConfiguration_withoutId (77.28s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_emptyPrefix (77.33s)
--- PASS: TestAccS3BucketReplicationConfiguration_schemaV2DestinationMetrics (78.18s)
--- PASS: TestAccS3BucketReplicationConfiguration_disappears (51.94s)
--- PASS: TestAccS3BucketReplicationConfiguration_migrate_noChange (87.43s)
--- PASS: TestAccS3BucketReplicationConfiguration_migrate_withChange (88.09s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicaModifications (46.74s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAccessControlTranslation (98.38s)
--- PASS: TestAccS3BucketReplicationConfiguration_filter_andOperator (99.31s)
--- PASS: TestAccS3BucketReplicationConfiguration_configurationRuleDestinationAddAccessControlTranslation (100.35s)
--- PASS: TestAccS3BucketReplicationConfiguration_replicationTimeControl (31.82s)
--- PASS: TestAccS3BucketReplicationConfiguration_basic (106.55s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 113.658s
% make testacc PKG=s3 TESTS=TestAccS3BucketPolicyDataSource_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketPolicyDataSource_'  -timeout 360m

--- PASS: TestAccS3BucketPolicyDataSource_basic (22.87s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 29.389s
% make testacc PKG=s3 TESTS=TestAccS3Bucket_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3Bucket_'  -timeout 360m

--- PASS: TestAccS3Bucket_Security_corsDelete (38.17s)
=== CONT  TestAccS3Bucket_Manage_objectLock
--- PASS: TestAccS3Bucket_Basic_basic (39.27s)
=== CONT  TestAccS3Bucket_Manage_objectLockWithVersioning
--- PASS: TestAccS3Bucket_Security_corsEmptyOrigin (46.86s)
=== CONT  TestAccS3Bucket_Manage_objectLock_migrate
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenAES256IsUsed (47.04s)
=== CONT  TestAccS3Bucket_Basic_acceleration
--- PASS: TestAccS3Bucket_Security_corsSingleMethodAndEmptyOrigin (47.12s)
=== CONT  TestAccS3Bucket_Manage_objectLock_deprecatedEnabled
--- PASS: TestAccS3Bucket_Manage_objectLockWithVersioning_deprecatedEnabled (49.41s)
=== CONT  TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled
=== CONT  TestAccS3Bucket_Replication_RTC_valid
--- PASS: TestAccS3Bucket_Basic_keyEnabled (49.47s)
--- PASS: TestAccS3Bucket_Security_enableDefaultEncryptionWhenTypical (49.53s)
=== CONT  TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes
--- PASS: TestAccS3Bucket_Replication_schemaV2SameRegion (49.67s)
=== CONT  TestAccS3Bucket_Replication_expectVersioningValidationError
--- PASS: TestAccS3Bucket_Security_logging (50.14s)                                                                                                                                            14:57:12 [55/323]
=== CONT  TestAccS3Bucket_Basic_forceDestroyWithObjectVersions
--- PASS: TestAccS3Bucket_Web_routingRules (64.57s)
=== CONT  TestAccS3Bucket_Replication_withoutPrefix
--- PASS: TestAccS3Bucket_Security_disableDefaultEncryptionWhenDefaultEncryptionIsEnabled (65.62s)
=== CONT  TestAccS3Bucket_Basic_forceDestroy
--- PASS: TestAccS3Bucket_Manage_lifecycleExpireMarkerOnly (65.67s)
=== CONT  TestAccS3Bucket_Basic_namePrefix
--- PASS: TestAccS3Bucket_Security_corsUpdate (74.13s)
=== CONT  TestAccS3Bucket_Replication_withoutStorageClass
--- PASS: TestAccS3Bucket_Replication_expectVersioningValidationError (24.91s)
=== CONT  TestAccS3Bucket_Basic_nameGenerated
--- PASS: TestAccS3Bucket_Manage_versioning (76.71s)
=== CONT  TestAccS3Bucket_Duplicate_UsEast1AltAccount
    bucket_test.go:478: skipping test because at least one environment variable of [AWS_ALTERNATE_PROFILE AWS_ALTERNATE_ACCESS_KEY_ID] must be set. Usage: credentials for running acceptance testing in alterna
te AWS account.
--- SKIP: TestAccS3Bucket_Duplicate_UsEast1AltAccount (0.00s)
=== CONT  TestAccS3Bucket_Basic_emptyString
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithEmptyPrefixes (37.86s)
=== CONT  TestAccS3Bucket_tags_withSystemTags
--- PASS: TestAccS3Bucket_Manage_objectLock_deprecatedEnabled (40.96s)
=== CONT  TestAccS3Bucket_tags_ignoreTags
--- PASS: TestAccS3Bucket_Manage_objectLockWithVersioning (49.05s)
=== CONT  TestAccS3Bucket_Manage_lifecycleBasic
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectLockEnabled (40.34s)
=== CONT  TestAccS3Bucket_Manage_versioningAndMFADeleteDisabled
--- PASS: TestAccS3Bucket_Basic_forceDestroyWithObjectVersions (39.67s)
=== CONT  TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter
--- PASS: TestAccS3Bucket_Manage_objectLock_migrate (47.71s)
=== CONT  TestAccS3Bucket_Replication_basic
--- PASS: TestAccS3Bucket_Web_simple (95.20s)
=== CONT  TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation
--- PASS: TestAccS3Bucket_Web_redirect (99.15s)
=== CONT  TestAccS3Bucket_Duplicate_basic
--- PASS: TestAccS3Bucket_Basic_forceDestroy (34.23s)
=== CONT  TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration
--- PASS: TestAccS3Bucket_Manage_objectLock (68.23s)
=== CONT  TestAccS3Bucket_Manage_lifecycleRemove
--- PASS: TestAccS3Bucket_Basic_namePrefix (43.15s)
=== CONT  TestAccS3Bucket_Replication_twoDestination
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation (112.00s)
=== CONT  TestAccS3Bucket_Duplicate_UsEast1
--- PASS: TestAccS3Bucket_Basic_emptyString (41.54s)
=== CONT  TestAccS3Bucket_disappears
--- PASS: TestAccS3Bucket_Basic_nameGenerated (43.76s)
=== CONT  TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter
--- PASS: TestAccS3Bucket_Duplicate_basic (19.79s)
=== CONT  TestAccS3Bucket_Basic_requestPayer
--- PASS: TestAccS3Bucket_Basic_acceleration (73.72s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_updateToProviderOnly
--- PASS: TestAccS3Bucket_Replication_withoutPrefix (60.37s)
=== CONT  TestAccS3Bucket_tags_EmptyTag_OnUpdate_Replace
--- PASS: TestAccS3Bucket_Duplicate_UsEast1 (15.63s)
=== CONT  TestAccS3Bucket_tags_EmptyTag_OnCreate
--- PASS: TestAccS3Bucket_Manage_versioningAndMFADeleteDisabled (39.88s)
=== CONT  TestAccS3Bucket_tags_ComputedTag_OnUpdate_Replace
--- PASS: TestAccS3Bucket_Replication_withoutStorageClass (64.59s)
=== CONT  TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleAbortIncompleteMultipartUploadDaysNoExpiration (40.11s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_nonOverlapping
--- PASS: TestAccS3Bucket_tags_ignoreTags (59.11s)
=== CONT  TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock
--- PASS: TestAccS3Bucket_disappears (31.88s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_providerOnly
--- PASS: TestAccS3Bucket_Manage_lifecycleBasic (62.20s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_overlapping
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter (62.22s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_nullOverlappingResourceTag
--- PASS: TestAccS3Bucket_Manage_lifecycleRemove (51.53s)
=== CONT  TestAccS3Bucket_tags_AddOnUpdate
--- PASS: TestAccS3Bucket_tags (163.38s)
=== CONT  TestAccS3Bucket_tags_ComputedTag_OnCreate
--- PASS: TestAccS3Bucket_Replication_twoDestination (60.36s)
=== CONT  TestAccS3Bucket_tags_null
--- PASS: TestAccS3Bucket_Manage_lifecycleRuleExpirationEmptyBlock (31.39s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_emptyResourceTag
--- PASS: TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter (63.83s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_emptyProviderOnlyTag
--- PASS: TestAccS3Bucket_Basic_requestPayer (64.46s)
=== CONT  TestAccS3Bucket_Manage_versioningDisabled
--- PASS: TestAccS3Bucket_tags_DefaultTags_updateToProviderOnly (71.33s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_updateToResourceOnly
--- PASS: TestAccS3Bucket_tags_EmptyTag_OnUpdate_Replace (69.99s)
=== CONT  TestAccS3Bucket_tags_ComputedTag_OnUpdate_Add
--- PASS: TestAccS3Bucket_tags_DefaultTags_nullOverlappingResourceTag (44.38s)
=== CONT  TestAccS3Bucket_Manage_MFADeleteDisabled
--- PASS: TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation (102.32s)
=== CONT  TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag
--- PASS: TestAccS3Bucket_tags_ComputedTag_OnUpdate_Replace (83.02s)
--- PASS: TestAccS3Bucket_tags_EmptyTag_OnCreate (85.12s)
--- PASS: TestAccS3Bucket_tags_ComputedTag_OnCreate (49.34s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_emptyResourceTag (42.47s)
--- PASS: TestAccS3Bucket_Manage_versioningDisabled (40.16s)
--- PASS: TestAccS3Bucket_Replication_RTC_valid (174.35s)
--- PASS: TestAccS3Bucket_tags_null (54.88s)
--- PASS: TestAccS3Bucket_Replication_schemaV2 (224.23s)
--- PASS: TestAccS3Bucket_Replication_basic (130.31s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_emptyProviderOnlyTag (44.56s)
--- PASS: TestAccS3Bucket_tags_AddOnUpdate (68.93s)
--- PASS: TestAccS3Bucket_Manage_MFADeleteDisabled (34.72s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_nullNonOverlappingResourceTag (36.39s)
--- PASS: TestAccS3Bucket_tags_EmptyTag_OnUpdate_Add (100.80s)
--- PASS: TestAccS3Bucket_tags_withSystemTags (152.46s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_updateToResourceOnly (49.95s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_nonOverlapping (104.06s)
--- PASS: TestAccS3Bucket_tags_ComputedTag_OnUpdate_Add (55.50s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_overlapping (101.63s)
--- PASS: TestAccS3Bucket_tags_DefaultTags_providerOnly (122.91s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/s3 279.697s

@jar-b
Copy link
Member

jar-b commented Aug 6, 2024

Thanks for the updates, @myerscf! 👍

@jar-b jar-b merged commit 5874ed3 into hashicorp:main Aug 6, 2024
47 checks passed
@github-actions github-actions bot added this to the v5.62.0 milestone Aug 6, 2024
Copy link

github-actions bot commented Aug 9, 2024

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

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 Sep 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/s3 Issues and PRs that pertain to the s3 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants