Skip to content

✨ Migrate Node packages to AWS SDK v2 #5584

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

LiangquanLi930
Copy link

@LiangquanLi930 LiangquanLi930 commented Jul 4, 2025

What type of PR is this?
Add one of the following kinds:
/kind feature
/kind cleanup

What this PR does / why we need it:

  • Migrates node package to AWS SDK V2.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5402

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Migrate Node packages to AWS SDK v2

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 4, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign nrb for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link
Contributor

Welcome @LiangquanLi930!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 4, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @LiangquanLi930. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@damdo
Copy link
Member

damdo commented Jul 4, 2025

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 4, 2025
@LiangquanLi930
Copy link
Author

@damdo Hi, I have a question I'd like to ask — regarding

// Session represents an AWS session.
type Session interface {
Session() awsclient.ConfigProvider
SessionV2() awsv2.Config
ServiceLimiter(service string) *throttle.ServiceLimiter
}
, should it be updated to

Session() awsv2.Config

as part of this issue we’re trying to address?

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 4, 2025
@damdo
Copy link
Member

damdo commented Jul 4, 2025

Hey @LiangquanLi930 I don't think so, but better to ask @punkwalker

@LiangquanLi930
Copy link
Author

I saw #5521 — maybe we should wait for this PR to merge before proceeding with ours.

@damdo
Copy link
Member

damdo commented Jul 4, 2025

Yeah, that's probably better, let's pause this until we get the other in, thanks @LiangquanLi930

@punkwalker
Copy link
Contributor

@LiangquanLi930 @damdo The session() can only be removed if all the dependent clients are migrated to SDK V2. Let’s wait for #5521 to merge and then cleanup every reference to SDK v1 sessions.

@LiangquanLi930 LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 3 times, most recently from 462b877 to 4c85641 Compare July 29, 2025 08:09
@damdo
Copy link
Member

damdo commented Jul 29, 2025

@LiangquanLi930 looks like there is a compilation error

@damdo
Copy link
Member

damdo commented Jul 29, 2025

Still present it looks like @LiangquanLi930

@LiangquanLi930
Copy link
Author

Still present it looks like @LiangquanLi930

I am taking it now

@damdo
Copy link
Member

damdo commented Aug 11, 2025

@LiangquanLi930 other PRs seems to be now fine with https://prow.k8s.io/job-history/gs/kubernetes-ci-logs/pr-logs/directory/pull-cluster-api-provider-aws-e2e-blocking as you can see. Anything that could be causing that issue in this PR?

@LiangquanLi930 LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 3 times, most recently from 949dffd to 8d888da Compare August 11, 2025 14:15
@LiangquanLi930
Copy link
Author

@LiangquanLi930 LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 8 times, most recently from cd2370f to 191a56f Compare August 11, 2025 19:33
@damdo
Copy link
Member

damdo commented Aug 11, 2025

/test pull-cluster-api-provider-aws-test

1 similar comment
@LiangquanLi930
Copy link
Author

/test pull-cluster-api-provider-aws-test

@LiangquanLi930 LiangquanLi930 force-pushed the aws-sdk-go-v2 branch 3 times, most recently from c89054e to 89043d1 Compare August 12, 2025 06:23
@k8s-ci-robot
Copy link
Contributor

@LiangquanLi930: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-aws-apidiff-main 9c4c8f4 link false /test pull-cluster-api-provider-aws-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Thanks a lot @LiangquanLi930

@punkwalker would you be able to take a look and confirm this looks in line with what you expect to see? Thanks!

@damdo damdo requested a review from nrb August 12, 2025 08:25
@damdo
Copy link
Member

damdo commented Aug 12, 2025

/assign @nrb

for review

@damdo
Copy link
Member

damdo commented Aug 12, 2025

/test pull-cluster-api-provider-aws-e2e-eks pull-cluster-api-provider-aws-e2e

@nrb
Copy link
Contributor

nrb commented Aug 12, 2025

/label tide/merge-method-squash

I'll set this to squash automatically, but in the future, try to squash changes into a single commit, especially when removing debugging commits.

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Aug 12, 2025
@@ -43,9 +44,9 @@ const (

var retryableErrors = []string{
// Returned when the secret is scheduled for deletion
secretsmanager.ErrCodeInvalidRequestException,
"InvalidRequestException",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there really no replacement constant in SDK v2?

@@ -158,6 +158,10 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
e2eCtx.Environment.BootstrapAccessKey = newUserAccessKey(context.TODO(), e2eCtx.AWSSessionV2, bootstrapTemplate.Spec.BootstrapUser.UserName)
e2eCtx.BootstrapUserAWSSession = NewAWSSessionWithKey(e2eCtx.Environment.BootstrapAccessKey)
e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(e2eCtx.Environment.BootstrapAccessKey)

By("Waiting for access key to propagate...")
time.Sleep(10 * time.Second)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a condition that we can use an Eventually on, versus a static 10s wait?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/feature Categorizes issue or PR as related to a new feature. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate Node packages to AWS SDK v2
6 participants