make EndpointResolver logs verbose and remove endpoints parameter from sessionForRegionV2

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

Author: punkwalker

pkg/cloud/endpoints/endpoints.go

@@ -124,8 +124,13 @@ func containsString(slice []string, s string) bool {
 // TODO: punkwalker - remove this after Go SDK V2 migration.
 func saveToServiceEndpointV2Map(src []scope.ServiceEndpoint) {
 	for _, svc := range src {
+		// convert service ID to UpperCase as service IDs in AWS SDK GO V2 are UpperCase & Go map is Case Sensitve
+		// This is for backward compabitibility
+		// Ref: SDK V2 https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/ec2#pkg-constants
+		// Ref: SDK V1 https://pkg.go.dev/github.com/aws/aws-sdk-go/aws/endpoints#pkg-constants
+		serviceID := strings.ToUpper(svc.ServiceID)
 		endpoint := endpointsv2.ServiceEndpoint{
-			ServiceID:     svc.ServiceID,
+			ServiceID:     serviceID,
 			URL:           svc.URL,
 			SigningRegion: svc.SigningRegion,
 		}

pkg/cloud/endpointsv2/endpoints.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	smithyendpoints "github.com/aws/smithy-go/endpoints"
+
+	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 )
 
 var (
@@ -104,11 +106,15 @@ type S3EndpointResolver struct {
 // ResolveEndpoint for S3.
 func (s *S3EndpointResolver) ResolveEndpoint(ctx context.Context, params s3.EndpointParameters) (smithyendpoints.Endpoint, error) {
 	// If custom endpoint not found, return default endpoint for the service
-	if _, ok := s.endpoints[s3.ServiceID]; !ok {
+	log := logger.FromContext(ctx)
+	endpoint, ok := s.endpoints[s3.ServiceID]
+
+	if !ok {
+		log.Debug("Custom endpoint not found, using default endpoint")
 		return s3.NewDefaultEndpointResolverV2().ResolveEndpoint(ctx, params)
 	}
 
-	endpoint := ServiceEndpointsMap[s3.ServiceID]
+	log.Debug("Custom endpoint found, using custom endpoint", "endpoint", endpoint.URL)
 	params.Endpoint = &endpoint.URL
 	params.Region = &endpoint.SigningRegion
 	return s3.NewDefaultEndpointResolverV2().ResolveEndpoint(ctx, params)

pkg/cloud/identityv2/identity.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

pkg/cloud/metricsv2/metrics.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -219,7 +219,7 @@ func getContext(ctx context.Context) *RequestData {
 
 // CaptureRequestMetrics will monitor and capture request metrics.
 func (r *RequestData) CaptureRequestMetrics() {
-	if r.Service == "" || r.Region == "" || r.OperationName == "" || r.Controller == "" {
+	if !r.IsIncomplete() {
 		return
 	}
 
@@ -255,3 +255,8 @@ func (r *RequestData) CaptureRequestMetrics() {
 		r.OperationName,
 	).Observe(float64(retryCount))
 }
+
+// IsIncomplete will return true if the RequestData was incomplete.
+func (r *RequestData) IsIncomplete() bool {
+	return r.Service == "" || r.Region == "" || r.OperationName == "" || r.Controller == ""
+}

pkg/cloud/scope/global.go

@@ -38,7 +38,7 @@ func NewGlobalScope(params GlobalScopeParams) (*GlobalScope, error) {
 		return nil, errors.Wrap(err, "failed to create aws session")
 	}
 
-	ns2, _, err := sessionForRegionV2(params.Region, params.Endpoints)
+	ns2, _, err := sessionForRegionV2(params.Region)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create aws V2 session")
 	}

pkg/cloud/scope/session.go

@@ -117,7 +117,7 @@ func sessionForRegion(region string, endpoint []ServiceEndpoint) (*session.Sessi
 	return ns, sl, nil
 }
 
-func sessionForRegionV2(region string, _ []ServiceEndpoint) (*awsv2.Config, throttle.ServiceLimiters, error) {
+func sessionForRegionV2(region string) (*awsv2.Config, throttle.ServiceLimiters, error) {
 	if s, ok := sessionCacheV2.Load(region); ok {
 		entry := s.(*sessionCacheEntry)
 		return entry.sessionV2, entry.serviceLimiters, nil