feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source #36062

acwwat · 2024-03-04T03:36:32Z

Description

This PR is to set the name argument to optional for the aws_ram_resource_share data source, so that it matches the AWS API spec.

Relations

Closes #33153.
Closes #33483.
Closes #36070.
Closes #35296.

References

Referred to GetResourceShares in API reference to confirm specs and behavior.

Output from Acceptance Testing

$ make testacc TESTARGS="-run=TestAccRAMResourceShareDataSource_" PKG=ram
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ram/... -v -count 1 -parallel 20  -run=TestAccRAMResourceShareDataSource_ -timeout 360m
=== RUN   TestAccRAMResourceShareDataSource_basic
=== PAUSE TestAccRAMResourceShareDataSource_basic
=== RUN   TestAccRAMResourceShareDataSource_tags
=== PAUSE TestAccRAMResourceShareDataSource_tags
=== RUN   TestAccRAMResourceShareDataSource_resources
=== PAUSE TestAccRAMResourceShareDataSource_resources
=== RUN   TestAccRAMResourceShareDataSource_status
=== PAUSE TestAccRAMResourceShareDataSource_status
=== CONT  TestAccRAMResourceShareDataSource_basic
=== CONT  TestAccRAMResourceShareDataSource_resources
=== CONT  TestAccRAMResourceShareDataSource_tags
=== CONT  TestAccRAMResourceShareDataSource_status
--- PASS: TestAccRAMResourceShareDataSource_status (62.28s)
--- PASS: TestAccRAMResourceShareDataSource_basic (74.17s)
--- PASS: TestAccRAMResourceShareDataSource_tags (84.13s)
--- PASS: TestAccRAMResourceShareDataSource_resources (142.50s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/ram        142.659s

$

github-actions · 2024-03-04T03:36:49Z

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.

…_share data source

% make testacc TESTARGS='-run=TestAccRAMResourceShareDataSource_' PKG=ram ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2 -run=TestAccRAMResourceShareDataSource_ -timeout 360m === RUN TestAccRAMResourceShareDataSource_basic === PAUSE TestAccRAMResourceShareDataSource_basic === RUN TestAccRAMResourceShareDataSource_tags === PAUSE TestAccRAMResourceShareDataSource_tags === RUN TestAccRAMResourceShareDataSource_resources === PAUSE TestAccRAMResourceShareDataSource_resources === RUN TestAccRAMResourceShareDataSource_status === PAUSE TestAccRAMResourceShareDataSource_status === CONT TestAccRAMResourceShareDataSource_basic === CONT TestAccRAMResourceShareDataSource_resources --- PASS: TestAccRAMResourceShareDataSource_basic (22.08s) === CONT TestAccRAMResourceShareDataSource_status --- PASS: TestAccRAMResourceShareDataSource_resources (31.19s) === CONT TestAccRAMResourceShareDataSource_tags --- PASS: TestAccRAMResourceShareDataSource_status (20.36s) --- PASS: TestAccRAMResourceShareDataSource_tags (33.33s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ram 71.779s

% make testacc TESTARGS='-run=TestAccRAMSharingWithOrganization_serial' PKG=ram ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2 -run=TestAccRAMSharingWithOrganization_serial -timeout 360m === RUN TestAccRAMSharingWithOrganization_serial === PAUSE TestAccRAMSharingWithOrganization_serial === CONT TestAccRAMSharingWithOrganization_serial === RUN TestAccRAMSharingWithOrganization_serial/basic === RUN TestAccRAMSharingWithOrganization_serial/disappears --- PASS: TestAccRAMSharingWithOrganization_serial (62.85s) --- PASS: TestAccRAMSharingWithOrganization_serial/basic (33.02s) --- PASS: TestAccRAMSharingWithOrganization_serial/disappears (29.83s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ram 69.848s

% make testacc TESTARGS='-run=TestAccRAMPrincipalAssociation_duplicate' PKG=ram ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2 -run=TestAccRAMPrincipalAssociation_duplicate -timeout 360m === RUN TestAccRAMPrincipalAssociation_duplicate === PAUSE TestAccRAMPrincipalAssociation_duplicate === CONT TestAccRAMPrincipalAssociation_duplicate --- PASS: TestAccRAMPrincipalAssociation_duplicate (28.71s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ram 35.841s

…orm resources.

% make testacc TESTARGS='-run=TestAccRAMResourceAssociation_duplicate' PKG=ram ACCTEST_PARALLELISM=2 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2 -run=TestAccRAMResourceAssociation_duplicate -timeout 360m === RUN TestAccRAMResourceAssociation_duplicate === PAUSE TestAccRAMResourceAssociation_duplicate === CONT TestAccRAMResourceAssociation_duplicate --- PASS: TestAccRAMResourceAssociation_duplicate (27.12s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ram 34.588s

…rm resources.

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccRAMResourceShareDataSource_' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMResourceShareDataSource_ -timeout 360m
=== RUN   TestAccRAMResourceShareDataSource_basic
=== PAUSE TestAccRAMResourceShareDataSource_basic
=== RUN   TestAccRAMResourceShareDataSource_tags
=== PAUSE TestAccRAMResourceShareDataSource_tags
=== RUN   TestAccRAMResourceShareDataSource_resources
=== PAUSE TestAccRAMResourceShareDataSource_resources
=== RUN   TestAccRAMResourceShareDataSource_status
=== PAUSE TestAccRAMResourceShareDataSource_status
=== CONT  TestAccRAMResourceShareDataSource_basic
=== CONT  TestAccRAMResourceShareDataSource_resources
--- PASS: TestAccRAMResourceShareDataSource_basic (22.08s)
=== CONT  TestAccRAMResourceShareDataSource_status
--- PASS: TestAccRAMResourceShareDataSource_resources (31.19s)
=== CONT  TestAccRAMResourceShareDataSource_tags
--- PASS: TestAccRAMResourceShareDataSource_status (20.36s)
--- PASS: TestAccRAMResourceShareDataSource_tags (33.33s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	71.779s

% make testacc TESTARGS='-run=TestAccRAMResourceShare_' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMResourceShare_ -timeout 360m
=== RUN   TestAccRAMResourceShare_basic
=== PAUSE TestAccRAMResourceShare_basic
=== RUN   TestAccRAMResourceShare_permission
=== PAUSE TestAccRAMResourceShare_permission
=== RUN   TestAccRAMResourceShare_allowExternalPrincipals
=== PAUSE TestAccRAMResourceShare_allowExternalPrincipals
=== RUN   TestAccRAMResourceShare_name
=== PAUSE TestAccRAMResourceShare_name
=== RUN   TestAccRAMResourceShare_tags
=== PAUSE TestAccRAMResourceShare_tags
=== RUN   TestAccRAMResourceShare_disappears
=== PAUSE TestAccRAMResourceShare_disappears
=== CONT  TestAccRAMResourceShare_basic
=== CONT  TestAccRAMResourceShare_name
--- PASS: TestAccRAMResourceShare_basic (23.95s)
=== CONT  TestAccRAMResourceShare_allowExternalPrincipals
--- PASS: TestAccRAMResourceShare_name (37.23s)
=== CONT  TestAccRAMResourceShare_disappears
--- PASS: TestAccRAMResourceShare_disappears (20.75s)
=== CONT  TestAccRAMResourceShare_tags
--- PASS: TestAccRAMResourceShare_allowExternalPrincipals (36.64s)
=== CONT  TestAccRAMResourceShare_permission
--- PASS: TestAccRAMResourceShare_permission (22.81s)
--- PASS: TestAccRAMResourceShare_tags (48.71s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	113.847s

% make testacc TESTARGS='-run=TestAccRAMSharingWithOrganization_serial' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMSharingWithOrganization_serial -timeout 360m
=== RUN   TestAccRAMSharingWithOrganization_serial
=== PAUSE TestAccRAMSharingWithOrganization_serial
=== CONT  TestAccRAMSharingWithOrganization_serial
=== RUN   TestAccRAMSharingWithOrganization_serial/basic
=== RUN   TestAccRAMSharingWithOrganization_serial/disappears
--- PASS: TestAccRAMSharingWithOrganization_serial (62.85s)
    --- PASS: TestAccRAMSharingWithOrganization_serial/basic (33.02s)
    --- PASS: TestAccRAMSharingWithOrganization_serial/disappears (29.83s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	69.848s

% make testacc TESTARGS='-run=TestAccRAMResourceShareAccepter_' PKG=ram ACCTEST_PARALLELISM=2 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMResourceShareAccepter_ -timeout 360m
=== RUN   TestAccRAMResourceShareAccepter_basic
=== PAUSE TestAccRAMResourceShareAccepter_basic
=== RUN   TestAccRAMResourceShareAccepter_disappears
=== PAUSE TestAccRAMResourceShareAccepter_disappears
=== RUN   TestAccRAMResourceShareAccepter_resourceAssociation
=== PAUSE TestAccRAMResourceShareAccepter_resourceAssociation
=== CONT  TestAccRAMResourceShareAccepter_basic
=== CONT  TestAccRAMResourceShareAccepter_resourceAssociation
--- PASS: TestAccRAMResourceShareAccepter_basic (40.32s)
=== CONT  TestAccRAMResourceShareAccepter_disappears
--- PASS: TestAccRAMResourceShareAccepter_resourceAssociation (42.29s)
--- PASS: TestAccRAMResourceShareAccepter_disappears (151.63s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	198.903s

% make testacc TESTARGS='-run=TestAccRAMResourceAssociation_' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMResourceAssociation_ -timeout 360m
=== RUN   TestAccRAMResourceAssociation_basic
=== PAUSE TestAccRAMResourceAssociation_basic
=== RUN   TestAccRAMResourceAssociation_disappears
=== PAUSE TestAccRAMResourceAssociation_disappears
=== RUN   TestAccRAMResourceAssociation_duplicate
=== PAUSE TestAccRAMResourceAssociation_duplicate
=== CONT  TestAccRAMResourceAssociation_basic
=== CONT  TestAccRAMResourceAssociation_duplicate
--- PASS: TestAccRAMResourceAssociation_duplicate (18.07s)
=== CONT  TestAccRAMResourceAssociation_disappears
--- PASS: TestAccRAMResourceAssociation_basic (31.49s)
--- PASS: TestAccRAMResourceAssociation_disappears (27.48s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	53.148s

% make testacc TESTARGS='-run=TestAccRAMPrincipalAssociation_' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMPrincipalAssociation_ -timeout 360m
=== RUN   TestAccRAMPrincipalAssociation_basic
=== PAUSE TestAccRAMPrincipalAssociation_basic
=== RUN   TestAccRAMPrincipalAssociation_AccountID
=== PAUSE TestAccRAMPrincipalAssociation_AccountID
=== RUN   TestAccRAMPrincipalAssociation_disappears
=== PAUSE TestAccRAMPrincipalAssociation_disappears
=== CONT  TestAccRAMPrincipalAssociation_basic
=== CONT  TestAccRAMPrincipalAssociation_disappears
--- PASS: TestAccRAMPrincipalAssociation_disappears (23.80s)
=== CONT  TestAccRAMPrincipalAssociation_AccountID
    principal_association_test.go:58: 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 alternate AWS account.
--- SKIP: TestAccRAMPrincipalAssociation_AccountID (0.00s)
--- PASS: TestAccRAMPrincipalAssociation_basic (26.39s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	33.299s

% make testacc TESTARGS='-run=TestAccRAMPrincipalAssociation_' PKG=ram ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.21.8 test ./internal/service/ram/... -v -count 1 -parallel 2  -run=TestAccRAMPrincipalAssociation_ -timeout 360m
=== RUN   TestAccRAMPrincipalAssociation_basic
=== PAUSE TestAccRAMPrincipalAssociation_basic
=== RUN   TestAccRAMPrincipalAssociation_AccountID
=== PAUSE TestAccRAMPrincipalAssociation_AccountID
=== RUN   TestAccRAMPrincipalAssociation_disappears
=== PAUSE TestAccRAMPrincipalAssociation_disappears
=== CONT  TestAccRAMPrincipalAssociation_basic
=== CONT  TestAccRAMPrincipalAssociation_disappears
=== NAME  TestAccRAMPrincipalAssociation_basic
    principal_association_test.go:117: Sharing with AWS Organization not found, skipping acceptance test: reading IAM Role (AWSServiceRoleForResourceAccessManager): couldn't find resource
--- SKIP: TestAccRAMPrincipalAssociation_basic (1.57s)
=== CONT  TestAccRAMPrincipalAssociation_AccountID
=== NAME  TestAccRAMPrincipalAssociation_disappears
    principal_association_test.go:117: Sharing with AWS Organization not found, skipping acceptance test: reading IAM Role (AWSServiceRoleForResourceAccessManager): couldn't find resource
--- SKIP: TestAccRAMPrincipalAssociation_disappears (1.58s)
--- PASS: TestAccRAMPrincipalAssociation_AccountID (30.37s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ram	38.839s

ewbankkit · 2024-03-14T17:05:19Z

@acwwat Thanks for the contribution 🎉 👏.

github-actions · 2024-03-14T22:01:50Z

This functionality has been released in v5.41.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 · 2024-04-23T02:06:01Z

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.

terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Mar 4, 2024

feat: Mark name arg as optional to match AWS API for aws_ram_resource…

39b240b

…_share data source

acwwat force-pushed the f-aws_ram_resource_share-data_source_name_optional branch from b7e7f76 to 39b240b Compare March 4, 2024 03:39

acwwat changed the title ~~[WIP] feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source~~ feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source Mar 4, 2024

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 Mar 7, 2024

ewbankkit added 19 commits March 13, 2024 13:19

Merge branch 'main' into HEAD

5523c20

Tweak CHANGELOG entry.

6653ae0

Tweak 'testAccResourceShareDataSourceConfig_tagsWithoutName'.

af04347

ram: Reduce visibility.

f052992

r/aws_ram_resource_share: Tidy up.

acdbe8c

Cosmetics.

240bde8

'FindResourceShareTimeout' -> 'resourceSharePropagationTimeout'.

2e4c9ea

'FindInvitationTimeout' -> 'resourceShareInvitationPropagationTimeout'.

96c9319

ram: Add 'consts.go'.

b13dd48

Add 'option.Unwrap'.

e8f0f2c

Add 'tfresource.AssertMaybeSinglePtrResult'.

bc75b04

Tweak 'tfresource.RetryGWhen'.

b14050c

r/aws_ram_resource_share_accepter: Tidy up.

33bd11a

r/aws_ram_resource_share_accepter: Fix acceptance tests.

e084a82

r/aws_ram_resource_association: Tidy up.

f3cc15f

r/aws_ram_resource_association: Fix acceptance tests.

642077d

Add 'IsAWSAccountID'.

f68d43c

ewbankkit added 10 commits March 14, 2024 09:14

Use 'IsAWSAccountID'.

df6bb85

r/aws_ram_principal_association: Tidy up.

d99ba73

Add CHANGELOG entry for hashicorp#36070.

4085948

r/aws_ram_principal_association: Additional acceptance tests.

1002297

Add 'TestAccRAMPrincipalAssociation_duplicate'.

857044b

r/aws_ram_principal_association: Prevent creation of duplicate Terraf…

5c33065

…orm resources.

Add 'TestAccRAMResourceAssociation_duplicate'.

47b1a1b

r/aws_ram_resource_association: Prevent creation of duplicate Terrafo…

c1b883d

…rm resources.

ewbankkit added the bug Addresses a defect in current functionality. label Mar 14, 2024

ewbankkit approved these changes Mar 14, 2024

View reviewed changes

Fix semgrep 'ci.aws-in-func-name'.

56129a9

ewbankkit merged commit 9623cda into hashicorp:main Mar 14, 2024
30 checks passed

github-actions bot added this to the v5.41.0 milestone Mar 14, 2024

acwwat deleted the f-aws_ram_resource_share-data_source_name_optional branch March 22, 2024 06:06

github-actions bot locked as resolved and limited conversation to collaborators Apr 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source #36062

feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source #36062

acwwat commented Mar 4, 2024 •

edited by ewbankkit

github-actions bot commented Mar 4, 2024

ewbankkit left a comment

ewbankkit commented Mar 14, 2024

github-actions bot commented Mar 14, 2024

github-actions bot commented Apr 23, 2024

feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source #36062

feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source #36062

Conversation

acwwat commented Mar 4, 2024 • edited by ewbankkit

Description

Relations

References

Output from Acceptance Testing

github-actions bot commented Mar 4, 2024

Community Note

ewbankkit left a comment

Choose a reason for hiding this comment

ewbankkit commented Mar 14, 2024

github-actions bot commented Mar 14, 2024

github-actions bot commented Apr 23, 2024

acwwat commented Mar 4, 2024 •

edited by ewbankkit