Migrate node-related code to AWS SDK v2

Author: LiangquanLi930

bootstrap/eks/internal/userdata/node_test.go

@@ -19,7 +19,7 @@ package userdata
 import (
 	"testing"
 
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
 	"k8s.io/utils/ptr"

pkg/cloud/scope/managednodegroup.go

@@ -22,7 +22,6 @@ import (
 	"time"
 
 	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
-	awsclient "github.com/aws/aws-sdk-go/aws/client"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -54,7 +53,7 @@ type ManagedMachinePoolScopeParams struct {
 	MachinePool               *expclusterv1.MachinePool
 	ControllerName            string
 	Endpoints                 []ServiceEndpoint
-	Session                   awsclient.ConfigProvider
+	Session                   awsv2.Config
 	MaxWaitActiveUpdateDelete time.Duration
 
 	EnableIAM            bool
@@ -88,10 +87,6 @@ func NewManagedMachinePoolScope(params ManagedMachinePoolScopeParams) (*ManagedM
 		ControlPlane:              params.ControlPlane,
 		controllerName:            params.ControllerName,
 	}
-	session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
-	if err != nil {
-		return nil, errors.Errorf("failed to create aws session: %v", err)
-	}
 
 	sessionv2, serviceLimitersv2, err := sessionForClusterWithRegionV2(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
 	if err != nil {
@@ -119,10 +114,8 @@ func NewManagedMachinePoolScope(params ManagedMachinePoolScopeParams) (*ManagedM
 		MachinePool:               params.MachinePool,
 		MaxWaitActiveUpdateDelete: params.MaxWaitActiveUpdateDelete,
 		EC2Scope:                  params.InfraCluster,
-		session:                   session,
-		sessionV2:                 *sessionv2,
-		serviceLimiters:           serviceLimiters,
-		serviceLimitersV2:         serviceLimitersv2,
+		session:                   *sessionv2,
+		serviceLimiters:           serviceLimitersv2,
 		controllerName:            params.ControllerName,
 		enableIAM:                 params.EnableIAM,
 		allowAdditionalRoles:      params.AllowAdditionalRoles,
@@ -143,11 +136,9 @@ type ManagedMachinePoolScope struct {
 	EC2Scope                  EC2Scope
 	MaxWaitActiveUpdateDelete time.Duration
 
-	session           awsclient.ConfigProvider
-	sessionV2         awsv2.Config
-	serviceLimiters   throttle.ServiceLimiters
-	serviceLimitersV2 throttle.ServiceLimiters
-	controllerName    string
+	session         awsv2.Config
+	serviceLimiters throttle.ServiceLimiters
+	controllerName  string
 
 	enableIAM            bool
 	allowAdditionalRoles bool
@@ -311,16 +302,11 @@ func (s *ManagedMachinePoolScope) ClusterObj() cloud.ClusterObject {
 	return s.Cluster
 }
 
-// Session returns the AWS SDK session. Used for creating clients.
-func (s *ManagedMachinePoolScope) Session() awsclient.ConfigProvider {
+// Session returns the AWS SDK V2 config. Used for creating clients.
+func (s *ManagedMachinePoolScope) Session() awsv2.Config {
 	return s.session
 }
 
-// SessionV2 returns the AWS SDK V2 config. Used for creating clients.
-func (s *ManagedMachinePoolScope) SessionV2() awsv2.Config {
-	return s.sessionV2
-}
-
 // ControllerName returns the name of the controller that
 // created the ManagedMachinePool.
 func (s *ManagedMachinePoolScope) ControllerName() string {

pkg/cloud/services/awsnode/cni_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/apis/crd/v1alpha1"
-	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/apps/v1"

test/e2e/suites/managed/aws_node_env.go

@@ -24,7 +24,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws/client"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
@@ -39,7 +39,7 @@ import (
 type UpdateAwsNodeVersionSpecInput struct {
 	E2EConfig             *clusterctl.E2EConfig
 	BootstrapClusterProxy framework.ClusterProxy
-	AWSSession            client.ConfigProvider
+	AWSSession            aws.Config
 	Namespace             *corev1.Namespace
 	ClusterName           string
 }

test/e2e/suites/managed/cluster.go

@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -44,7 +43,7 @@ type ManagedClusterSpecInput struct {
 	E2EConfig                *clusterctl.E2EConfig
 	ConfigClusterFn          DefaultConfigClusterFn
 	BootstrapClusterProxy    framework.ClusterProxy
-	AWSSession               client.ConfigProvider
+	AWSSession               aws.Config
 	AWSSessionV2             *aws.Config
 	Namespace                *corev1.Namespace
 	ClusterName              string

test/e2e/suites/managed/machine_deployment.go

@@ -23,7 +23,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws/client"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -40,7 +40,7 @@ type MachineDeploymentSpecInput struct {
 	E2EConfig             *clusterctl.E2EConfig
 	ConfigClusterFn       DefaultConfigClusterFn
 	BootstrapClusterProxy framework.ClusterProxy
-	AWSSession            client.ConfigProvider
+	AWSSession            aws.Config
 	Namespace             *corev1.Namespace
 	Replicas              int64
 	ClusterName           string

test/e2e/suites/managed/machine_pool.go

@@ -26,7 +26,6 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go/aws/client"
 	"github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -42,7 +41,7 @@ type MachinePoolSpecInput struct {
 	E2EConfig             *clusterctl.E2EConfig
 	ConfigClusterFn       DefaultConfigClusterFn
 	BootstrapClusterProxy framework.ClusterProxy
-	AWSSession            client.ConfigProvider
+	AWSSession            aws.Config
 	AWSSessionV2          *aws.Config
 	Namespace             *corev1.Namespace
 	ClusterName           string