From 9961470fe9bf631c872a8d8d2d527fc96e66e7d3 Mon Sep 17 00:00:00 2001 From: Shraddha Bang Date: Thu, 5 Sep 2024 14:40:46 -0700 Subject: [PATCH] Migrate aws sdk go v1 to v2 --- pkg/deploy/elbv2/listener_utils.go | 2 +- pkg/ingress/group_loader_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/deploy/elbv2/listener_utils.go b/pkg/deploy/elbv2/listener_utils.go index 7191f5f23..8a1d8df1f 100644 --- a/pkg/deploy/elbv2/listener_utils.go +++ b/pkg/deploy/elbv2/listener_utils.go @@ -227,7 +227,7 @@ func isListenerNotFoundError(err error) bool { if errors.As(err, &apiErr) { code := apiErr.ErrorCode() - return code == "ResourceInUse" + return code == "ListenerNotFound" } return false } diff --git a/pkg/ingress/group_loader_test.go b/pkg/ingress/group_loader_test.go index 6bef1b487..224534375 100644 --- a/pkg/ingress/group_loader_test.go +++ b/pkg/ingress/group_loader_test.go @@ -2864,7 +2864,7 @@ func Test_defaultGroupLoader_sortGroupMembers(t *testing.T) { }, }, want: nil, - wantErr: errors.New("failed to load Ingress group order for ingress: namespace/ingress: failed to parse int64 annotation, alb.ingress.kubernetes.io/group.order: x: strconv.ParseInt: parsing \"x\": invalid syntax"), + wantErr: errors.New("failed to load Ingress group order for ingress: namespace/ingress: failed to parse int32 annotation, alb.ingress.kubernetes.io/group.order: x: strconv.ParseInt: parsing \"x\": invalid syntax"), }, { name: "two ingress with the same order should be sorted lexically",