Skip to content

Upgrade library: github.com/cenkalti/backoff/v5 #8260

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
cheeseandcereal merged 1 commit into from
Feb 27, 2025
Merged

Upgrade library: github.com/cenkalti/backoff/v5 #8260

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9
github.com/benjamintf1/unmarshalledmatchers v1.0.0
github.com/blang/semver/v4 v4.0.0
github.com/cenk/backoff v2.2.1+incompatible
github.com/cenkalti/backoff/v5 v5.0.2
github.com/cloudflare/cfssl v1.6.5
github.com/dave/dst v0.27.3
github.com/dave/jennifer v1.7.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ github.com/catenacyber/perfsprint v0.8.1 h1:bGOHuzHe0IkoGeY831RW4aSlt1lPRd3WRASc
github.com/catenacyber/perfsprint v0.8.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50=
github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg=
github.com/ccojocar/zxcvbn-go v1.0.2/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60=
github.com/cenk/backoff v2.2.1+incompatible h1:djdFT7f4gF2ttuzRKPbMOWgZajgesItGLwG5FTQKmmE=
github.com/cenk/backoff v2.2.1+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chai2010/gettext-go v1.0.3 h1:9liNh8t+u26xl5ddmWLmsOsdNLwkdRTg5AG+JnTiM80=
Expand Down
22 changes: 8 additions & 14 deletions pkg/connector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/aws/smithy-go"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff/v5"
"github.com/kris-nova/logger"
"github.com/pkg/errors"

Expand Down Expand Up @@ -144,16 +144,10 @@ func validateProvider(provider string) error {
}

func (c *EKSConnector) registerCluster(ctx context.Context, cluster ExternalCluster, connectorRoleARN string) (*eks.RegisterClusterOutput, error) {
bo := backoff.NewExponentialBackOff()
bo.MaxElapsedTime = 3 * time.Minute

var registerOutput *eks.RegisterClusterOutput
// IAM role takes some time to propagate,
// RegisterCluster returns `InvalidRequestException: Not existing role` for such cases.
err := backoff.RetryNotify(func() error {
var err error

registerOutput, err = c.Provider.EKS().RegisterCluster(ctx, &eks.RegisterClusterInput{
registerOutput, err := backoff.Retry(ctx, func() (*eks.RegisterClusterOutput, error) {
output, err := c.Provider.EKS().RegisterCluster(ctx, &eks.RegisterClusterInput{
Name: aws.String(cluster.Name),
ConnectorConfig: &ekstypes.ConnectorConfigRequest{
Provider: ekstypes.ConnectorConfigProvider(cluster.Provider),
Expand All @@ -166,15 +160,15 @@ func (c *EKSConnector) registerCluster(ctx context.Context, cluster ExternalClus
var oe *smithy.OperationError
if errors.As(err, &oe) && (strings.Contains(oe.Error(), "Nonexistent role") || strings.Contains(oe.Error(), "Not existing role")) {
logger.Debug("IAM role could not be found; retrying RegisterCluster")
return err
return nil, err
}
return backoff.Permanent(err)
return nil, backoff.Permanent(err)
}

return nil
}, bo, func(err error, duration time.Duration) {
return output, nil
}, backoff.WithMaxElapsedTime(3*time.Minute), backoff.WithNotify(func(err error, duration time.Duration) {
logger.Debug("error calling RegisterCluster; retrying in %v: %v", duration, err)
})
}))

if err != nil {
var oe *smithy.OperationError
Expand Down
Loading