Rebase on AWS SDK v2

Signed-off-by: Danil Grigorev <[email protected]>

Author: Danil-Grigorev

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

@@ -3141,6 +3141,7 @@ spec:
                         to "default" namespace.
                       type: string
                   required:
+                  - roleARN
                   - serviceAccountName
                   - serviceAccountNamespace
                   type: object

controlplane/eks/controllers/awsmanagedcontrolplane_controller_test.go

@@ -970,10 +970,10 @@ func mockedEKSCluster(ctx context.Context, g *WithT, eksRec *mock_eksiface.MockE
 	}).Return(&eks.ListAddonsOutput{}, nil)
 
 	eksRec.UpdateClusterConfig(ctx, gomock.AssignableToTypeOf(&eks.UpdateClusterConfigInput{})).After(waitUntilClusterActiveCall).Return(&eks.UpdateClusterConfigOutput{}, nil)
-	eksRec.ListPodIdentityAssociationsWqithContext(context.TODO(), gomock.Eq(&eks.ListPodIdentityAssociationsInput{
+	eksRec.ListPodIdentityAssociations(context.TODO(), gomock.Eq(&eks.ListPodIdentityAssociationsInput{
 		ClusterName: aws.String("test-cluster"),
 	})).Return(&eks.ListPodIdentityAssociationsOutput{
-		Associations: []*eks.PodIdentityAssociationSummary{},
+		Associations: []ekstypes.PodIdentityAssociationSummary{},
 	}, nil)
 
 	awsNodeRec.ReconcileCNI(gomock.Any()).Return(nil)

pkg/cloud/services/eks/mock_eksiface/eksapi_mock.go

@@ -20,7 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/service/eks"
+	"github.com/aws/aws-sdk-go-v2/service/eks"
+	"github.com/aws/aws-sdk-go-v2/service/eks/types"
 
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
 	ekspodidentities "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/eks/podidentities"
@@ -69,14 +70,14 @@ func (s *Service) reconcilePodIdentities(ctx context.Context) error {
 	return nil
 }
 
-func (s *Service) listEksPodIdentities(ctx context.Context, eksClusterName string) ([]*eks.PodIdentityAssociationSummary, error) {
+func (s *Service) listEksPodIdentities(ctx context.Context, eksClusterName string) ([]types.PodIdentityAssociationSummary, error) {
 	s.Debug("getting list of associated eks pod identities")
 
 	input := &eks.ListPodIdentityAssociationsInput{
 		ClusterName: &eksClusterName,
 	}
 
-	output, err := s.EKSClient.ListPodIdentityAssociationsWithContext(ctx, input)
+	output, err := s.EKSClient.ListPodIdentityAssociations(ctx, input)
 	if err != nil {
 		return nil, fmt.Errorf("listing eks pod identity assocations: %w", err)
 	}
@@ -101,7 +102,7 @@ func (s *Service) translateAPIToPodAssociation(assocs []ekscontrolplanev1.PodIde
 	return converted
 }
 
-func (s *Service) translateAWSToPodAssociation(assocs []*eks.PodIdentityAssociationSummary) []ekspodidentities.EKSPodIdentityAssociation {
+func (s *Service) translateAWSToPodAssociation(assocs []types.PodIdentityAssociationSummary) []ekspodidentities.EKSPodIdentityAssociation {
 	converted := []ekspodidentities.EKSPodIdentityAssociation{}
 
 	for _, assoc := range assocs {

pkg/cloud/services/eks/pod_identity.go

@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/common"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/eks/iam"
 	stsservice "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/sts"
+	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/eks/podidentities"
 )
 
 // EKSAPI defines the EKS API interface.
@@ -62,6 +63,8 @@ type EKSAPI interface {
 	TagResource(ctx context.Context, params *eks.TagResourceInput, optFns ...func(*eks.Options)) (*eks.TagResourceOutput, error)
 	UntagResource(ctx context.Context, params *eks.UntagResourceInput, optFns ...func(*eks.Options)) (*eks.UntagResourceOutput, error)
 	DisassociateIdentityProviderConfig(ctx context.Context, params *eks.DisassociateIdentityProviderConfigInput, optFns ...func(*eks.Options)) (*eks.DisassociateIdentityProviderConfigOutput, error)
+	ListPodIdentityAssociations(ctx context.Context, params *eks.ListPodIdentityAssociationsInput, optFns ...func(*eks.Options)) (*eks.ListPodIdentityAssociationsOutput, error)
+	podidentities.EKSAPIPodIdentity
 
 	// Waiters for EKS Cluster
 	WaitUntilClusterActive(ctx context.Context, params *eks.DescribeClusterInput, maxWait time.Duration) error

pkg/cloud/services/eks/service.go

@@ -20,13 +20,19 @@ package podidentities
 import (
 	"context"
 
-	"github.com/aws/aws-sdk-go/service/eks/eksiface"
+	"github.com/aws/aws-sdk-go-v2/service/eks"
 
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/planner"
 )
 
+// EKSAPIPodIdentity defines the EKS API interface.
+type EKSAPIPodIdentity interface {
+	CreatePodIdentityAssociation(ctx context.Context, params *eks.CreatePodIdentityAssociationInput, optFns ...func(*eks.Options)) (*eks.CreatePodIdentityAssociationOutput, error)
+	DeletePodIdentityAssociation(ctx context.Context, params *eks.DeletePodIdentityAssociationInput, optFns ...func(*eks.Options)) (*eks.DeletePodIdentityAssociationOutput, error)
+}
+
 // NewPlan creates a new Plan to manage EKS pod identities.
-func NewPlan(clusterName string, desiredAssociations, currentAssociations []EKSPodIdentityAssociation, client eksiface.EKSAPI) planner.Plan {
+func NewPlan(clusterName string, desiredAssociations, currentAssociations []EKSPodIdentityAssociation, client EKSAPIPodIdentity) planner.Plan {
 	return &plan{
 		currentAssociations: currentAssociations,
 		desiredAssociations: desiredAssociations,
@@ -39,7 +45,7 @@ func NewPlan(clusterName string, desiredAssociations, currentAssociations []EKSP
 type plan struct {
 	currentAssociations []EKSPodIdentityAssociation
 	desiredAssociations []EKSPodIdentityAssociation
-	eksClient           eksiface.EKSAPI
+	eksClient           EKSAPIPodIdentity
 	clusterName         string
 }
 

pkg/eks/podidentities/plan.go

@@ -21,8 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/eks"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/eks"
+	"github.com/aws/aws-sdk-go-v2/service/eks/types"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/gomega"
 
@@ -58,14 +59,14 @@ func TestEKSPodIdentityAssociationsPlan(t *testing.T) {
 			name: "no current and 1 desired",
 			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
 				m.
-					CreatePodIdentityAssociation(gomock.Eq(&eks.CreatePodIdentityAssociationInput{
+					CreatePodIdentityAssociation(gomock.Any(), gomock.Eq(&eks.CreatePodIdentityAssociationInput{
 						Namespace:      aws.String(namespace),
 						RoleArn:        aws.String(roleArn),
 						ServiceAccount: aws.String(serviceAccount),
 						ClusterName:    aws.String(clusterName),
 					})).
 					Return(&eks.CreatePodIdentityAssociationOutput{
-						Association: &eks.PodIdentityAssociation{
+						Association: &types.PodIdentityAssociation{
 							AssociationArn: aws.String(responseAssociationArn),
 							AssociationId:  aws.String(associationID),
 							Namespace:      aws.String(namespace),
@@ -112,12 +113,12 @@ func TestEKSPodIdentityAssociationsPlan(t *testing.T) {
 			name: "1 current and 0 desired",
 			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
 				m.
-					DeletePodIdentityAssociation(gomock.Eq(&eks.DeletePodIdentityAssociationInput{
+					DeletePodIdentityAssociation(gomock.Any(), gomock.Eq(&eks.DeletePodIdentityAssociationInput{
 						AssociationId: aws.String(associationID),
 						ClusterName:   aws.String(clusterName),
 					})).
 					Return(&eks.DeletePodIdentityAssociationOutput{
-						Association: &eks.PodIdentityAssociation{
+						Association: &types.PodIdentityAssociation{
 							AssociationArn: aws.String(responseAssociationArn),
 							AssociationId:  aws.String(associationID),
 							Namespace:      aws.String(namespace),

pkg/eks/podidentities/plan_test.go

@@ -21,29 +21,28 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/eks"
-	"github.com/aws/aws-sdk-go/service/eks/eksiface"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/eks"
 )
 
 // errPodIdentityAssociationNotFound defines an error for when an eks pod identity is not found.
 var errPodIdentityAssociationNotFound = errors.New("eks pod identity association not found")
 
 // DeletePodIdentityAssociationProcedure is a procedure that will delete an EKS eks pod identity.
 type DeletePodIdentityAssociationProcedure struct {
-	eksClient             eksiface.EKSAPI
+	eksClient             EKSAPIPodIdentity
 	clusterName           string
 	existingAssociationID string
 }
 
 // Do implements the logic for the procedure.
-func (p *DeletePodIdentityAssociationProcedure) Do(_ context.Context) error {
+func (p *DeletePodIdentityAssociationProcedure) Do(ctx context.Context) error {
 	input := &eks.DeletePodIdentityAssociationInput{
 		AssociationId: aws.String(p.existingAssociationID),
 		ClusterName:   aws.String(p.clusterName),
 	}
 
-	if _, err := p.eksClient.DeletePodIdentityAssociation(input); err != nil {
+	if _, err := p.eksClient.DeletePodIdentityAssociation(ctx, input); err != nil {
 		return fmt.Errorf("deleting eks pod identity %s: %w", p.existingAssociationID, err)
 	}
 
@@ -57,13 +56,13 @@ func (p *DeletePodIdentityAssociationProcedure) Name() string {
 
 // CreatePodIdentityAssociationProcedure is a procedure that will create an EKS eks pod identity for a cluster.
 type CreatePodIdentityAssociationProcedure struct {
-	eksClient      eksiface.EKSAPI
+	eksClient      EKSAPIPodIdentity
 	clusterName    string
 	newAssociation *EKSPodIdentityAssociation
 }
 
 // Do implements the logic for the procedure.
-func (p *CreatePodIdentityAssociationProcedure) Do(_ context.Context) error {
+func (p *CreatePodIdentityAssociationProcedure) Do(ctx context.Context) error {
 	if p.newAssociation == nil {
 		return fmt.Errorf("getting desired eks pod identity for cluster %s: %w", p.clusterName, errPodIdentityAssociationNotFound)
 	}
@@ -75,7 +74,7 @@ func (p *CreatePodIdentityAssociationProcedure) Do(_ context.Context) error {
 		ServiceAccount: &p.newAssociation.ServiceAccountName,
 	}
 
-	_, err := p.eksClient.CreatePodIdentityAssociation(input)
+	_, err := p.eksClient.CreatePodIdentityAssociation(ctx, input)
 	if err != nil {
 		return fmt.Errorf("creating desired eks pod identity for cluster %s: %w", p.clusterName, err)
 	}