🌱 Migrate ServiceLimiters to AWS SDK V2 (#5574)

* Migrate ServiceLimiters to AWS SDK V2

Signed-off-by: Pankaj Walke <[email protected]>

* fix lint errors

Signed-off-by: Pankaj Walke <[email protected]>

* makefile: bump release-binaries's GOMAXPROCS=2

it was hanging otherwise

---------

Signed-off-by: Pankaj Walke <[email protected]>
Co-authored-by: Damiano Donati <[email protected]>

Author: punkwalker

Makefile

@@ -606,7 +606,7 @@ promote-images: $(KPROMO) $(YQ)
 
 .PHONY: release-binaries
 release-binaries: $(GORELEASER) ## Builds only the binaries, not a release.
-	$(GORELEASER) build --config $(GORELEASER_CONFIG) --snapshot --clean
+	GOMAXPROCS=2 $(GORELEASER) build --config $(GORELEASER_CONFIG) --snapshot --clean
 
 .PHONY: release-staging
 release-staging: ## Builds and push container images and manifests to the staging bucket.

pkg/cloud/throttle/throttle.go

@@ -18,10 +18,13 @@ limitations under the License.
 package throttle
 
 import (
+	"context"
 	"regexp"
 	"strings"
 
+	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/smithy-go/middleware"
 
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/awserrors"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/internal/rate"
@@ -52,6 +55,11 @@ func (o *OperationLimiter) Wait(r *request.Request) error {
 	return o.getLimiter().Wait(r.Context())
 }
 
+// WaitV2 will wait on a request for AWS SDK V2.
+func (o *OperationLimiter) WaitV2(ctx context.Context) error {
+	return o.getLimiter().Wait(ctx)
+}
+
 // Match will match a request.
 func (o *OperationLimiter) Match(r *request.Request) (bool, error) {
 	if o.regexp == nil {
@@ -64,13 +72,33 @@ func (o *OperationLimiter) Match(r *request.Request) (bool, error) {
 	return o.regexp.MatchString(r.Operation.Name), nil
 }
 
+// MatchV2 will match a request for AWS SDK V2.
+func (o *OperationLimiter) MatchV2(ctx context.Context) (bool, error) {
+	if o.regexp == nil {
+		var err error
+		o.regexp, err = regexp.Compile("^" + o.Operation)
+		if err != nil {
+			return false, err
+		}
+	}
+	opName := awsmiddleware.GetOperationName(ctx)
+	return o.regexp.MatchString(opName), nil
+}
+
 // LimitRequest will limit a request.
 func (s ServiceLimiter) LimitRequest(r *request.Request) {
 	if ol, ok := s.matchRequest(r); ok {
 		_ = ol.Wait(r)
 	}
 }
 
+// LimitRequestV2 will limit a request for AWS SDK V2.
+func (s ServiceLimiter) LimitRequestV2(ctx context.Context) {
+	if ol, ok := s.matchRequestV2(ctx); ok {
+		_ = ol.WaitV2(ctx)
+	}
+}
+
 func (o *OperationLimiter) getLimiter() *rate.Limiter {
 	if o.limiter == nil {
 		o.limiter = rate.NewLimiter(o.RefillRate, o.Burst)
@@ -92,6 +120,16 @@ func (s ServiceLimiter) ReviewResponse(r *request.Request) {
 	}
 }
 
+// ReviewResponseV2 will review the limits of a Request's response for AWS SDK V2.
+func (s ServiceLimiter) ReviewResponseV2(ctx context.Context, errorCode string) {
+	switch errorCode {
+	case "Throttling", "RequestLimitExceeded":
+		if ol, ok := s.matchRequestV2(ctx); ok {
+			ol.limiter.ResetTokens()
+		}
+	}
+}
+
 func (s ServiceLimiter) matchRequest(r *request.Request) (*OperationLimiter, bool) {
 	for _, ol := range s {
 		match, err := ol.Match(r)
@@ -104,3 +142,37 @@ func (s ServiceLimiter) matchRequest(r *request.Request) (*OperationLimiter, boo
 	}
 	return nil, false
 }
+
+// matchRequestV2 is used for matching request for AWS SDK V2.
+func (s ServiceLimiter) matchRequestV2(ctx context.Context) (*OperationLimiter, bool) {
+	for _, ol := range s {
+		match, err := ol.MatchV2(ctx)
+		if err != nil {
+			return nil, false
+		}
+		if match {
+			return ol, true
+		}
+	}
+	return nil, false
+}
+
+// WithServiceLimiterMiddleware returns ServiceLimiter middleware stack for specified service name.
+func WithServiceLimiterMiddleware(limiter *ServiceLimiter) func(stack *middleware.Stack) error {
+	return func(stack *middleware.Stack) error {
+		// Inserts service Limiter middleware after RequestContext initialization.
+		return stack.Finalize.Insert(getServiceLimiterMiddleware(limiter), "capa/RequestMetricContextMiddleware", middleware.After)
+	}
+}
+
+// getServiceLimiterMiddleware implements serviceLimiter middleware.
+func getServiceLimiterMiddleware(limiter *ServiceLimiter) middleware.FinalizeMiddleware {
+	return middleware.FinalizeMiddlewareFunc("capa/ServiceLimiterMiddleware", func(ctx context.Context, input middleware.FinalizeInput, handler middleware.FinalizeHandler) (middleware.FinalizeOutput, middleware.Metadata, error) {
+		limiter.LimitRequestV2(ctx)
+
+		out, metadata, err := handler.HandleFinalize(ctx, input)
+		smithyErr := awserrors.ParseSmithyError(err)
+		limiter.ReviewResponseV2(ctx, smithyErr.ErrorCode())
+		return out, metadata, err
+	})
+}