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

aws_secretsmanager_* - migrate to aws-sdk-go-v2 #35174

Merged
merged 39 commits into from
Jan 12, 2024
Merged

aws_secretsmanager_* - migrate to aws-sdk-go-v2 #35174

merged 39 commits into from
Jan 12, 2024

Conversation

aristosvo
Copy link
Contributor

@aristosvo aristosvo commented Jan 7, 2024 •
edited by ewbankkit

Description

Update of secretsmanager package to AWS Go SDK to v2

  • The namevaluesfilters generation is split into a new namevaluesfiltersv2 version

Relations

Relates #32467.
Relates #32917.
Closes #35172.
Closes #35117.
Closes #34602.
Closes #35105.
Closes #34961.

References

Output from Acceptance Testing

% make testacc TESTS=TestAccSecretsManager PKG=secretsmanager
...
--- PASS: TestAccSecretsManagerRandomPasswordDataSource_basic (11.50s)
--- PASS: TestAccSecretsManagerSecret_withNamePrefix (17.65s)
--- PASS: TestAccSecretsManagerSecretVersionDataSource_basic (17.78s)
--- PASS: TestAccSecretsManagerSecretVersion_base64Binary (16.38s)
--- PASS: TestAccSecretsManagerSecretVersionDataSource_versionStage (14.40s)
--- PASS: TestAccSecretsManagerSecretVersion_versionStages (36.10s)
--- PASS: TestAccSecretsManagerSecretVersion_basicString (16.18s)
--- PASS: TestAccSecretsManagerSecretsDataSource_filter (50.64s)
--- PASS: TestAccSecretsManagerSecretPolicy_disappears (20.20s)
--- PASS: TestAccSecretsManagerSecret_basic (16.59s)
--- PASS: TestAccSecretsManagerSecretRotation_duration (46.22s)
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpressionHours (62.49s)
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpressionToDays (61.56s)
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpression (60.76s)
--- PASS: TestAccSecretsManagerSecretRotationDataSource_basic (45.05s)
--- PASS: TestAccSecretsManagerSecretRotation_basic (46.43s)
--- PASS: TestAccSecretsManagerSecret_basicReplica (16.49s)
--- PASS: TestAccSecretsManagerSecretVersionDataSource_versionID (14.37s)
--- PASS: TestAccSecretsManagerSecretDataSource_name (13.90s)
--- PASS: TestAccSecretsManagerSecret_overwriteReplica (54.22s)
--- PASS: TestAccSecretsManagerSecretPolicy_basic (33.26s)
--- PASS: TestAccSecretsManagerSecretPolicy_blockPublicPolicy (47.43s)
--- PASS: TestAccSecretsManagerSecretDataSource_basic (5.46s)
--- PASS: TestAccSecretsManagerSecretDataSource_policy (14.45s)
--- PASS: TestAccSecretsManagerSecretDataSource_arn (14.08s)
--- PASS: TestAccSecretsManagerSecret_description (25.93s)
--- PASS: TestAccSecretsManagerSecret_tags (36.02s)
--- PASS: TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate (27.11s)
--- PASS: TestAccSecretsManagerRandomPasswordDataSource_exclude (9.59s)
--- PASS: TestAccSecretsManagerSecret_policy (51.19s)
--- PASS: TestAccSecretsManagerSecret_kmsKeyID (32.22s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager     326.184s

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 7, 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 size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/directconnect Issues and PRs that pertain to the directconnect service. service/secretsmanager Issues and PRs that pertain to the secretsmanager service. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. client-connections Pertains to the AWS Client and service connections. generators Relates to code generators. labels Jan 7, 2024
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Jan 7, 2024
@aristosvo aristosvo changed the title [WIP] - r/aws_secretsmanager - migrate to aws-sdk-go-v2 [WIP] - r/aws_secretsmanager_* - migrate to aws-sdk-go-v2 Jan 7, 2024
@aristosvo aristosvo changed the title [WIP] - r/aws_secretsmanager_* - migrate to aws-sdk-go-v2 [WIP] - aws_secretsmanager_* - migrate to aws-sdk-go-v2 Jan 7, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 7, 2024

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

@aristosvo aristosvo force-pushed the secretsmanager/aws-sdk-go-v2 branch 2 times, most recently from 73159c2 to c8725f6 Compare January 7, 2024 20:02
@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. service/lambda Issues and PRs that pertain to the lambda service. and removed repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. labels Jan 7, 2024
@aristosvo aristosvo marked this pull request as ready for review January 8, 2024 19:33
@ewbankkit
d/aws_secretsmanager_secret: Tidy up.
1de9398
@ewbankkit
r/aws_secretsmanager_secret_policy: Tidy up.
23667ce
@ewbankkit
Add 'verify.ValidBase64String'.
6bf98fb
@ewbankkit
Add 'TestAccSecretsManagerSecretPolicy_Disappears_secret' and 'TestAc…
2dee720 
…cSecretsManagerSecret_disappears'.
@ewbankkit
r/aws_secretsmanager_secret_version: Tidy up.
924a79e
@ewbankkit
d/aws_secretsmanager_secret_version: Tidy up.
36e763e
@ewbankkit
d/aws_secretsmanager_secrets: Tidy up.
d10988f
@ewbankkit
r/aws_secretsmanager_secret_rotation: Tidy up.
ce3897a
@ewbankkit
d/aws_secretsmanager_secret_rotation: Tidy up.
de602c1
@ewbankkit
secretsmanager: Tidy up sweepers.
18f7aea
@ewbankkit
secretsmanager: Tidy up sweepers.
16b5fd7
@ewbankkit
Remove unused code.
04bd5ac
@ewbankkit
Add (and comment out) 'TestAccSecretsManagerSecretVersion_multipleVer…
a13e9c9 
…sions'.
@ewbankkit
Merge remote-tracking branch 'fidelity-contributions/fix_issue-34602'…
91696b9 
… into HEAD

# Conflicts:
#	internal/service/secretsmanager/secret_data_source.go
#	internal/service/secretsmanager/secret_version_data_source.go
@ewbankkit
Add CHANGELOG entries.
18e734b
@ewbankkit
Merge remote-tracking branch 'obounaim/f-aws_secretsmanager_rotate' i…
75e2768 
…nto HEAD

# Conflicts:
#	internal/service/secretsmanager/secret_rotation.go
@ewbankkit
r/aws_secretsmanager_secret_rotation: Add state migrater for 'rotate_…
c700959 
…immediately'.
@github-actions github-actions bot added the verify Pertains to the verify package (i.e., provider-level validating, diff suppression, etc.) label Jan 12, 2024
This was referenced Jan 12, 2024
Merged
Closed
ewbankkit
ewbankkit approved these changes Jan 12, 2024
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit 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 TESTARGS='-run=TestAccSecretsManager' PKG=secretsmanager ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/secretsmanager/... -v -count 1 -parallel 3  -run=TestAccSecretsManager -timeout 360m
=== RUN   TestAccSecretsManagerRandomPasswordDataSource_basic
=== PAUSE TestAccSecretsManagerRandomPasswordDataSource_basic
=== RUN   TestAccSecretsManagerRandomPasswordDataSource_exclude
=== PAUSE TestAccSecretsManagerRandomPasswordDataSource_exclude
=== RUN   TestAccSecretsManagerSecretDataSource_basic
=== PAUSE TestAccSecretsManagerSecretDataSource_basic
=== RUN   TestAccSecretsManagerSecretDataSource_arn
=== PAUSE TestAccSecretsManagerSecretDataSource_arn
=== RUN   TestAccSecretsManagerSecretDataSource_name
=== PAUSE TestAccSecretsManagerSecretDataSource_name
=== RUN   TestAccSecretsManagerSecretDataSource_policy
=== PAUSE TestAccSecretsManagerSecretDataSource_policy
=== RUN   TestAccSecretsManagerSecretPolicy_basic
=== PAUSE TestAccSecretsManagerSecretPolicy_basic
=== RUN   TestAccSecretsManagerSecretPolicy_blockPublicPolicy
=== PAUSE TestAccSecretsManagerSecretPolicy_blockPublicPolicy
=== RUN   TestAccSecretsManagerSecretPolicy_disappears
=== PAUSE TestAccSecretsManagerSecretPolicy_disappears
=== RUN   TestAccSecretsManagerSecretPolicy_Disappears_secret
=== PAUSE TestAccSecretsManagerSecretPolicy_Disappears_secret
=== RUN   TestAccSecretsManagerSecretRotationDataSource_basic
=== PAUSE TestAccSecretsManagerSecretRotationDataSource_basic
=== RUN   TestAccSecretsManagerSecretRotation_basic
=== PAUSE TestAccSecretsManagerSecretRotation_basic
=== RUN   TestAccSecretsManagerSecretRotation_upgradePreRotateImmediately
=== PAUSE TestAccSecretsManagerSecretRotation_upgradePreRotateImmediately
=== RUN   TestAccSecretsManagerSecretRotation_rotateImmediately
=== PAUSE TestAccSecretsManagerSecretRotation_rotateImmediately
=== RUN   TestAccSecretsManagerSecretRotation_disappears
=== PAUSE TestAccSecretsManagerSecretRotation_disappears
=== RUN   TestAccSecretsManagerSecretRotation_Disappears_secret
=== PAUSE TestAccSecretsManagerSecretRotation_Disappears_secret
=== RUN   TestAccSecretsManagerSecretRotation_scheduleExpression
=== PAUSE TestAccSecretsManagerSecretRotation_scheduleExpression
=== RUN   TestAccSecretsManagerSecretRotation_scheduleExpressionToDays
=== PAUSE TestAccSecretsManagerSecretRotation_scheduleExpressionToDays
=== RUN   TestAccSecretsManagerSecretRotation_scheduleExpressionHours
=== PAUSE TestAccSecretsManagerSecretRotation_scheduleExpressionHours
=== RUN   TestAccSecretsManagerSecretRotation_duration
=== PAUSE TestAccSecretsManagerSecretRotation_duration
=== RUN   TestAccSecretsManagerSecret_basic
=== PAUSE TestAccSecretsManagerSecret_basic
=== RUN   TestAccSecretsManagerSecret_withNamePrefix
=== PAUSE TestAccSecretsManagerSecret_withNamePrefix
=== RUN   TestAccSecretsManagerSecret_disappears
=== PAUSE TestAccSecretsManagerSecret_disappears
=== RUN   TestAccSecretsManagerSecret_description
=== PAUSE TestAccSecretsManagerSecret_description
=== RUN   TestAccSecretsManagerSecret_basicReplica
=== PAUSE TestAccSecretsManagerSecret_basicReplica
=== RUN   TestAccSecretsManagerSecret_overwriteReplica
=== PAUSE TestAccSecretsManagerSecret_overwriteReplica
=== RUN   TestAccSecretsManagerSecret_kmsKeyID
=== PAUSE TestAccSecretsManagerSecret_kmsKeyID
=== RUN   TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate
=== PAUSE TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate
=== RUN   TestAccSecretsManagerSecret_tags
=== PAUSE TestAccSecretsManagerSecret_tags
=== RUN   TestAccSecretsManagerSecret_policy
=== PAUSE TestAccSecretsManagerSecret_policy
=== RUN   TestAccSecretsManagerSecretVersionDataSource_basic
=== PAUSE TestAccSecretsManagerSecretVersionDataSource_basic
=== RUN   TestAccSecretsManagerSecretVersionDataSource_versionID
=== PAUSE TestAccSecretsManagerSecretVersionDataSource_versionID
=== RUN   TestAccSecretsManagerSecretVersionDataSource_versionStage
=== PAUSE TestAccSecretsManagerSecretVersionDataSource_versionStage
=== RUN   TestAccSecretsManagerSecretVersion_basicString
=== PAUSE TestAccSecretsManagerSecretVersion_basicString
=== RUN   TestAccSecretsManagerSecretVersion_base64Binary
=== PAUSE TestAccSecretsManagerSecretVersion_base64Binary
=== RUN   TestAccSecretsManagerSecretVersion_versionStages
=== PAUSE TestAccSecretsManagerSecretVersion_versionStages
=== RUN   TestAccSecretsManagerSecretVersion_disappears
=== PAUSE TestAccSecretsManagerSecretVersion_disappears
=== RUN   TestAccSecretsManagerSecretVersion_Disappears_secret
=== PAUSE TestAccSecretsManagerSecretVersion_Disappears_secret
=== RUN   TestAccSecretsManagerSecretsDataSource_filter
=== PAUSE TestAccSecretsManagerSecretsDataSource_filter
=== CONT  TestAccSecretsManagerRandomPasswordDataSource_basic
=== CONT  TestAccSecretsManagerSecret_policy
=== CONT  TestAccSecretsManagerSecretVersion_base64Binary
--- PASS: TestAccSecretsManagerRandomPasswordDataSource_basic (13.96s)
=== CONT  TestAccSecretsManagerSecretVersion_disappears
--- PASS: TestAccSecretsManagerSecretVersion_base64Binary (24.00s)
=== CONT  TestAccSecretsManagerSecretVersion_versionStages
--- PASS: TestAccSecretsManagerSecretVersion_disappears (20.49s)
=== CONT  TestAccSecretsManagerSecretVersion_Disappears_secret
--- PASS: TestAccSecretsManagerSecretVersion_Disappears_secret (21.75s)
=== CONT  TestAccSecretsManagerSecretsDataSource_filter
--- PASS: TestAccSecretsManagerSecret_policy (62.02s)
=== CONT  TestAccSecretsManagerSecretPolicy_disappears
--- PASS: TestAccSecretsManagerSecretVersion_versionStages (53.53s)
=== CONT  TestAccSecretsManagerSecretRotation_Disappears_secret
--- PASS: TestAccSecretsManagerSecretPolicy_disappears (26.35s)
=== CONT  TestAccSecretsManagerSecret_tags
--- PASS: TestAccSecretsManagerSecretsDataSource_filter (59.43s)
=== CONT  TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate
--- PASS: TestAccSecretsManagerSecretRotation_Disappears_secret (45.29s)
=== CONT  TestAccSecretsManagerSecretRotation_disappears
--- PASS: TestAccSecretsManagerSecret_tags (45.65s)
=== CONT  TestAccSecretsManagerSecret_kmsKeyID
--- PASS: TestAccSecretsManagerSecret_RecoveryWindowInDays_recreate (34.53s)
=== CONT  TestAccSecretsManagerSecretRotation_rotateImmediately
--- PASS: TestAccSecretsManagerSecretRotation_disappears (44.67s)
=== CONT  TestAccSecretsManagerSecret_overwriteReplica
--- PASS: TestAccSecretsManagerSecret_kmsKeyID (35.46s)
=== CONT  TestAccSecretsManagerSecretRotation_upgradePreRotateImmediately
--- PASS: TestAccSecretsManagerSecretRotation_rotateImmediately (51.33s)
=== CONT  TestAccSecretsManagerSecret_basicReplica
--- PASS: TestAccSecretsManagerSecret_basicReplica (24.60s)
=== CONT  TestAccSecretsManagerSecretRotation_basic
--- PASS: TestAccSecretsManagerSecret_overwriteReplica (85.70s)
=== CONT  TestAccSecretsManagerSecretRotationDataSource_basic
--- PASS: TestAccSecretsManagerSecretRotation_basic (46.22s)
=== CONT  TestAccSecretsManagerSecretPolicy_Disappears_secret
--- PASS: TestAccSecretsManagerSecretRotation_upgradePreRotateImmediately (105.18s)
=== CONT  TestAccSecretsManagerSecretDataSource_name
--- PASS: TestAccSecretsManagerSecretDataSource_name (16.07s)
=== CONT  TestAccSecretsManagerSecret_description
--- PASS: TestAccSecretsManagerSecretRotationDataSource_basic (45.37s)
=== CONT  TestAccSecretsManagerSecretPolicy_blockPublicPolicy
--- PASS: TestAccSecretsManagerSecretPolicy_Disappears_secret (26.58s)
=== CONT  TestAccSecretsManagerSecret_disappears
--- PASS: TestAccSecretsManagerSecret_disappears (18.04s)
=== CONT  TestAccSecretsManagerSecretPolicy_basic
--- PASS: TestAccSecretsManagerSecret_description (33.40s)
=== CONT  TestAccSecretsManagerSecret_withNamePrefix
--- PASS: TestAccSecretsManagerSecret_withNamePrefix (22.78s)
=== CONT  TestAccSecretsManagerSecretDataSource_policy
--- PASS: TestAccSecretsManagerSecretPolicy_blockPublicPolicy (58.15s)
=== CONT  TestAccSecretsManagerSecret_basic
--- PASS: TestAccSecretsManagerSecretPolicy_basic (45.66s)
=== CONT  TestAccSecretsManagerSecretVersionDataSource_versionStage
--- PASS: TestAccSecretsManagerSecretDataSource_policy (19.21s)
=== CONT  TestAccSecretsManagerSecretVersion_basicString
--- PASS: TestAccSecretsManagerSecret_basic (22.08s)
=== CONT  TestAccSecretsManagerSecretDataSource_basic
--- PASS: TestAccSecretsManagerSecretVersionDataSource_versionStage (19.30s)
=== CONT  TestAccSecretsManagerSecretDataSource_arn
--- PASS: TestAccSecretsManagerSecretDataSource_basic (6.71s)
=== CONT  TestAccSecretsManagerSecretRotation_duration
--- PASS: TestAccSecretsManagerSecretVersion_basicString (22.49s)
=== CONT  TestAccSecretsManagerSecretVersionDataSource_versionID
--- PASS: TestAccSecretsManagerSecretDataSource_arn (17.60s)
=== CONT  TestAccSecretsManagerSecretVersionDataSource_basic
--- PASS: TestAccSecretsManagerSecretVersionDataSource_versionID (17.58s)
=== CONT  TestAccSecretsManagerSecretRotation_scheduleExpressionToDays
--- PASS: TestAccSecretsManagerSecretVersionDataSource_basic (18.86s)
=== CONT  TestAccSecretsManagerSecretRotation_scheduleExpressionHours
--- PASS: TestAccSecretsManagerSecretRotation_duration (46.01s)
=== CONT  TestAccSecretsManagerSecretRotation_scheduleExpression
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpressionToDays (60.70s)
=== CONT  TestAccSecretsManagerRandomPasswordDataSource_exclude
--- PASS: TestAccSecretsManagerRandomPasswordDataSource_exclude (13.77s)
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpressionHours (63.88s)
--- PASS: TestAccSecretsManagerSecretRotation_scheduleExpression (59.48s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager	497.079s

@ewbankkit
Copy link
Contributor

@aristosvo Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 85b0843 into hashicorp:main Jan 12, 2024
50 checks passed
@github-actions github-actions bot added this to the v5.33.0 milestone Jan 12, 2024
@github-actions GitHub Actions
Copy link

This functionality has been released in v5.33.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 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 Feb 18, 2024
@justinretzolk justinretzolk added the aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. label Mar 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. client-connections Pertains to the AWS Client and service connections. documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. generators Relates to code generators. service/directconnect Issues and PRs that pertain to the directconnect service. service/lambda Issues and PRs that pertain to the lambda service. service/secretsmanager Issues and PRs that pertain to the secretsmanager service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. tags Pertains to resource tagging. technical-debt Addresses areas of the codebase that need refactoring or redesign. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. verify Pertains to the verify package (i.e., provider-level validating, diff suppression, etc.)
Projects
None yet
Milestone
v5.33.0
5 participants
@aristosvo @ewbankkit @justinretzolk @Siddarthyuvaraj @obounaim