Skip to content

CORS-4078: disable rate limiter for AWS SDK v2 #9958

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

Merged
sdodson merged 1 commit into from
Sep 24, 2025
Merged

CORS-4078: disable rate limiter for AWS SDK v2 #9958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/asset/installconfig/aws/sessionv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
survey "github.com/AlecAivazis/survey/v2"
"github.com/aws/aws-sdk-go-v2/aws"
awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
"github.com/aws/aws-sdk-go-v2/aws/ratelimit"
"github.com/aws/aws-sdk-go-v2/aws/retry"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/smithy-go/middleware"
Expand Down Expand Up @@ -41,7 +43,17 @@ type ConfigOptions []func(*config.LoadOptions) error
// getDefaultConfigOptions returns the default settings for config.LoadOptions.
func getDefaultConfigOptions() ConfigOptions {
return ConfigOptions{
config.WithRetryMaxAttempts(RetryMaxAttempts),
config.WithRetryer(func() aws.Retryer {
return retry.NewStandard(func(so *retry.StandardOptions) {
so.MaxAttempts = RetryMaxAttempts

// The SDK v2 introduces a new client-side rate-limiting mechanism in the standard retry.
// The default settings are not a good fit for the installer, especially the destroy code.
// Until we figure out a good settings, we disable it to align with SDK v1 behavior.
// Reference: https://docs.aws.amazon.com/sdk-for-go/v2/developer-guide/configure-retries-timeouts.html
so.RateLimiter = ratelimit.None
})
}),
config.WithAPIOptions([]func(*middleware.Stack) error{
awsmiddleware.AddUserAgentKeyValue(OpenShiftInstallerUserAgent, version.Raw),
}),
Expand Down