From d632e108affc95c0b35a412301270ee96fc3655a Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Tue, 8 Apr 2025 21:44:07 +0000
Subject: [PATCH 01/12] Filter by name and namespace in GetIAMServiceAccounts

---
 pkg/actions/irsa/get.go | 31 +------------------------------
 pkg/cfn/manager/iam.go  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/pkg/actions/irsa/get.go b/pkg/actions/irsa/get.go
index 7109e19146..ac217c354a 100644
--- a/pkg/actions/irsa/get.go
+++ b/pkg/actions/irsa/get.go
@@ -14,38 +14,9 @@ type GetOptions struct {
 }
 
 func (m *Manager) Get(ctx context.Context, options GetOptions) ([]*api.ClusterIAMServiceAccount, error) {
-	remoteServiceAccounts, err := m.stackManager.GetIAMServiceAccounts(ctx)
+	remoteServiceAccounts, err := m.stackManager.GetIAMServiceAccounts(ctx, options.Name, options.Namespace)
 	if err != nil {
 		return nil, fmt.Errorf("getting iamserviceaccounts: %w", err)
 	}
-
-	if options.Namespace != "" {
-		remoteServiceAccounts = filterByNamespace(remoteServiceAccounts, options.Namespace)
-	}
-
-	if options.Name != "" {
-		remoteServiceAccounts = filterByName(remoteServiceAccounts, options.Name)
-	}
-
 	return remoteServiceAccounts, nil
 }
-
-func filterByNamespace(serviceAccounts []*api.ClusterIAMServiceAccount, namespace string) []*api.ClusterIAMServiceAccount {
-	var serviceAccountsMatching []*api.ClusterIAMServiceAccount
-	for _, sa := range serviceAccounts {
-		if sa.Namespace == namespace {
-			serviceAccountsMatching = append(serviceAccountsMatching, sa)
-		}
-	}
-	return serviceAccountsMatching
-}
-
-func filterByName(serviceAccounts []*api.ClusterIAMServiceAccount, name string) []*api.ClusterIAMServiceAccount {
-	var serviceAccountsMatching []*api.ClusterIAMServiceAccount
-	for _, sa := range serviceAccounts {
-		if sa.Name == name {
-			serviceAccountsMatching = append(serviceAccountsMatching, sa)
-		}
-	}
-	return serviceAccountsMatching
-}
diff --git a/pkg/cfn/manager/iam.go b/pkg/cfn/manager/iam.go
index b26579430e..0224259b40 100644
--- a/pkg/cfn/manager/iam.go
+++ b/pkg/cfn/manager/iam.go
@@ -73,8 +73,9 @@ func (c *StackCollection) ListIAMServiceAccountStacks(ctx context.Context) ([]st
 	return names, nil
 }
 
-// GetIAMServiceAccounts calls DescribeIAMServiceAccountStacks and return native iamserviceaccounts
-func (c *StackCollection) GetIAMServiceAccounts(ctx context.Context) ([]*api.ClusterIAMServiceAccount, error) {
+// GetIAMServiceAccounts calls DescribeIAMServiceAccountStacks and return native iamserviceaccounts.
+// If name or namespace are provided, only service accounts matching those fields will be returned.
+func (c *StackCollection) GetIAMServiceAccounts(ctx context.Context, name string, namespace string) ([]*api.ClusterIAMServiceAccount, error) {
 	stacks, err := c.DescribeIAMServiceAccountStacks(ctx)
 	if err != nil {
 		return nil, err
@@ -86,6 +87,14 @@ func (c *StackCollection) GetIAMServiceAccounts(ctx context.Context) ([]*api.Clu
 		if err != nil {
 			return nil, err
 		}
+
+		if name != "" && name != meta.Name {
+			continue
+		}
+		if namespace != "" && namespace != meta.Namespace {
+			continue
+		}
+
 		serviceAccount := &api.ClusterIAMServiceAccount{
 			ClusterIAMMeta: *meta,
 			Status: &api.ClusterIAMServiceAccountStatus{

From 965364e1c3eb3346f3f3195f00b1f4114ddd9d01 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Tue, 8 Apr 2025 21:46:42 +0000
Subject: [PATCH 02/12] update other calls to GetIAMServiceAccounts

---
 pkg/actions/podidentityassociation/deleter.go  | 2 +-
 pkg/actions/podidentityassociation/migrator.go | 2 +-
 pkg/cfn/manager/interface.go                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/actions/podidentityassociation/deleter.go b/pkg/actions/podidentityassociation/deleter.go
index 6573b2efba..782b2dedf2 100644
--- a/pkg/actions/podidentityassociation/deleter.go
+++ b/pkg/actions/podidentityassociation/deleter.go
@@ -25,7 +25,7 @@ type StackLister interface {
 	ListPodIdentityStackNames(ctx context.Context) ([]string, error)
 	DescribeStack(ctx context.Context, stack *manager.Stack) (*manager.Stack, error)
 	GetStackTemplate(ctx context.Context, stackName string) (string, error)
-	GetIAMServiceAccounts(ctx context.Context) ([]*api.ClusterIAMServiceAccount, error)
+	GetIAMServiceAccounts(ctx context.Context, name string, namespace string) ([]*api.ClusterIAMServiceAccount, error)
 }
 
 // A StackDeleter lists and deletes CloudFormation stacks.
diff --git a/pkg/actions/podidentityassociation/migrator.go b/pkg/actions/podidentityassociation/migrator.go
index b5608afe6d..02148d2fc8 100644
--- a/pkg/actions/podidentityassociation/migrator.go
+++ b/pkg/actions/podidentityassociation/migrator.go
@@ -86,7 +86,7 @@ func (m *Migrator) MigrateToPodIdentity(ctx context.Context, options PodIdentity
 	*/
 	resolver := IRSAv1StackNameResolver{}
 	if err := resolver.Populate(func() ([]*api.ClusterIAMServiceAccount, error) {
-		return m.stackUpdater.GetIAMServiceAccounts(ctx)
+		return m.stackUpdater.GetIAMServiceAccounts(ctx, "", "")
 	}); err != nil {
 		return err
 	}
diff --git a/pkg/cfn/manager/interface.go b/pkg/cfn/manager/interface.go
index ef887db7bc..ef166a345a 100644
--- a/pkg/cfn/manager/interface.go
+++ b/pkg/cfn/manager/interface.go
@@ -63,7 +63,7 @@ type StackManager interface {
 	GetClusterStackIfExists(ctx context.Context) (*Stack, error)
 	GetFargateStack(ctx context.Context) (*Stack, error)
 	GetIAMAddonsStacks(ctx context.Context) ([]*Stack, error)
-	GetIAMServiceAccounts(ctx context.Context) ([]*api.ClusterIAMServiceAccount, error)
+	GetIAMServiceAccounts(ctx context.Context, name string, namespace string) ([]*api.ClusterIAMServiceAccount, error)
 	GetKarpenterStack(ctx context.Context) (*Stack, error)
 	GetManagedNodeGroupTemplate(ctx context.Context, options GetNodegroupOption) (string, error)
 	GetNodeGroupName(s *Stack) string

From c8d17ea39fd5de0f97114af1860353a2cf5c8428 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 9 Apr 2025 18:01:21 +0000
Subject: [PATCH 03/12] wip tests

---
 pkg/cfn/manager/fakes/fake_stack_manager.go |  20 ++-
 pkg/cfn/manager/iam_test.go                 | 181 ++++++++++++++++++++
 2 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 pkg/cfn/manager/iam_test.go

diff --git a/pkg/cfn/manager/fakes/fake_stack_manager.go b/pkg/cfn/manager/fakes/fake_stack_manager.go
index b4047b44bb..8c5dc7b43a 100644
--- a/pkg/cfn/manager/fakes/fake_stack_manager.go
+++ b/pkg/cfn/manager/fakes/fake_stack_manager.go
@@ -343,10 +343,12 @@ type FakeStackManager struct {
 		result1 []*manager.Stack
 		result2 error
 	}
-	GetIAMServiceAccountsStub        func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)
+	GetIAMServiceAccountsStub        func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)
 	getIAMServiceAccountsMutex       sync.RWMutex
 	getIAMServiceAccountsArgsForCall []struct {
 		arg1 context.Context
+		arg2 string
+		arg3 string
 	}
 	getIAMServiceAccountsReturns struct {
 		result1 []*v1alpha5.ClusterIAMServiceAccount
@@ -2396,18 +2398,20 @@ func (fake *FakeStackManager) GetIAMAddonsStacksReturnsOnCall(i int, result1 []*
 	}{result1, result2}
 }
 
-func (fake *FakeStackManager) GetIAMServiceAccounts(arg1 context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
+func (fake *FakeStackManager) GetIAMServiceAccounts(arg1 context.Context, arg2 string, arg3 string) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
 	fake.getIAMServiceAccountsMutex.Lock()
 	ret, specificReturn := fake.getIAMServiceAccountsReturnsOnCall[len(fake.getIAMServiceAccountsArgsForCall)]
 	fake.getIAMServiceAccountsArgsForCall = append(fake.getIAMServiceAccountsArgsForCall, struct {
 		arg1 context.Context
-	}{arg1})
+		arg2 string
+		arg3 string
+	}{arg1, arg2, arg3})
 	stub := fake.GetIAMServiceAccountsStub
 	fakeReturns := fake.getIAMServiceAccountsReturns
-	fake.recordInvocation("GetIAMServiceAccounts", []interface{}{arg1})
+	fake.recordInvocation("GetIAMServiceAccounts", []interface{}{arg1, arg2, arg3})
 	fake.getIAMServiceAccountsMutex.Unlock()
 	if stub != nil {
-		return stub(arg1)
+		return stub(arg1, arg2, arg3)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
@@ -2421,17 +2425,17 @@ func (fake *FakeStackManager) GetIAMServiceAccountsCallCount() int {
 	return len(fake.getIAMServiceAccountsArgsForCall)
 }
 
-func (fake *FakeStackManager) GetIAMServiceAccountsCalls(stub func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)) {
+func (fake *FakeStackManager) GetIAMServiceAccountsCalls(stub func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)) {
 	fake.getIAMServiceAccountsMutex.Lock()
 	defer fake.getIAMServiceAccountsMutex.Unlock()
 	fake.GetIAMServiceAccountsStub = stub
 }
 
-func (fake *FakeStackManager) GetIAMServiceAccountsArgsForCall(i int) context.Context {
+func (fake *FakeStackManager) GetIAMServiceAccountsArgsForCall(i int) (context.Context, string, string) {
 	fake.getIAMServiceAccountsMutex.RLock()
 	defer fake.getIAMServiceAccountsMutex.RUnlock()
 	argsForCall := fake.getIAMServiceAccountsArgsForCall[i]
-	return argsForCall.arg1
+	return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3
 }
 
 func (fake *FakeStackManager) GetIAMServiceAccountsReturns(result1 []*v1alpha5.ClusterIAMServiceAccount, result2 error) {
diff --git a/pkg/cfn/manager/iam_test.go b/pkg/cfn/manager/iam_test.go
new file mode 100644
index 0000000000..0448fd88a6
--- /dev/null
+++ b/pkg/cfn/manager/iam_test.go
@@ -0,0 +1,181 @@
+package manager_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
+	"github.com/stretchr/testify/assert"
+
+	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
+	"github.com/weaveworks/eksctl/pkg/cfn/manager"
+	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
+	"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
+)
+
+// mockStackCollection is a wrapper around StackCollection that allows us to override methods for testing
+type mockStackCollection struct {
+	*manager.StackCollection
+	stacks []*manager.Stack
+}
+
+// ListStacks overrides the ListStacks method to return our predefined stacks
+func (m *mockStackCollection) ListStacks(ctx context.Context) ([]*manager.Stack, error) {
+	return m.stacks, nil
+}
+
+func TestGetIAMServiceAccounts(t *testing.T) {
+	testCases := []struct {
+		name            string
+		nameFilter      string
+		namespaceFilter string
+		expectedCount   int
+		expectedNames   []string
+	}{
+		{
+			name:            "No filters - should return all service accounts",
+			nameFilter:      "",
+			namespaceFilter: "",
+			expectedCount:   3,
+			expectedNames:   []string{"test-sa1", "test-sa2", "test-sa3"},
+		},
+		{
+			name:            "Filter by name only",
+			nameFilter:      "test-sa1",
+			namespaceFilter: "",
+			expectedCount:   1,
+			expectedNames:   []string{"test-sa1"},
+		},
+		{
+			name:            "Filter by namespace only",
+			nameFilter:      "",
+			namespaceFilter: "kube-system",
+			expectedCount:   1,
+			expectedNames:   []string{"test-sa2"},
+		},
+		{
+			name:            "Filter by both name and namespace",
+			nameFilter:      "test-sa3",
+			namespaceFilter: "default",
+			expectedCount:   1,
+			expectedNames:   []string{"test-sa3"},
+		},
+		{
+			name:            "Filter by name that doesn't exist",
+			nameFilter:      "non-existent",
+			namespaceFilter: "",
+			expectedCount:   0,
+			expectedNames:   []string{},
+		},
+		{
+			name:            "Filter by namespace that doesn't exist",
+			nameFilter:      "",
+			namespaceFilter: "non-existent",
+			expectedCount:   0,
+			expectedNames:   []string{},
+		},
+		{
+			name:            "Filter by name and namespace that don't match",
+			nameFilter:      "test-sa1",
+			namespaceFilter: "kube-system",
+			expectedCount:   0,
+			expectedNames:   []string{},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Create a new mock provider
+			p := mockprovider.NewMockProvider()
+
+			// Create a test cluster config
+			cfg := api.NewClusterConfig()
+			cfg.Metadata.Name = "test-cluster"
+			cfg.Metadata.Region = "us-west-2"
+
+			// Create a stack collection with the mock provider
+			realStackCollection := manager.NewStackCollection(p, cfg)
+
+			// Create our mock stacks
+			stacks := []*manager.Stack{
+				{
+					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-default-test-sa1",
+					StackStatus: types.StackStatusCreateComplete,
+					Tags: []types.Tag{
+						{
+							Key:   aws.String(api.IAMServiceAccountNameTag),
+							Value: aws.String("default/test-sa1"),
+						},
+					},
+					Outputs: []types.Output{
+						{
+							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
+							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa1-role"),
+						},
+					},
+				},
+				{
+					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-kube-system-test-sa2",
+					StackStatus: types.StackStatusCreateComplete,
+					Tags: []types.Tag{
+						{
+							Key:   aws.String(api.IAMServiceAccountNameTag),
+							Value: aws.String("kube-system/test-sa2"),
+						},
+					},
+					Outputs: []types.Output{
+						{
+							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
+							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa2-role"),
+						},
+					},
+				},
+				{
+					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-default-test-sa3",
+					StackStatus: types.StackStatusCreateComplete,
+					Tags: []types.Tag{
+						{
+							Key:   aws.String(api.IAMServiceAccountNameTag),
+							Value: aws.String("default/test-sa3"),
+						},
+					},
+					Outputs: []types.Output{
+						{
+							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
+							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa3-role"),
+						},
+					},
+				},
+				{
+					StackName:   "eksctl-test-cluster-nodegroup-ng-1",
+					StackStatus: types.StackStatusCreateComplete,
+				},
+			}
+
+			// Create our mock stack collection
+			mockSC := &mockStackCollection{
+				StackCollection: realStackCollection,
+				stacks:          stacks,
+			}
+
+			// Call the function being tested
+			serviceAccounts, err := mockSC.GetIAMServiceAccounts(context.Background(), tc.nameFilter, tc.namespaceFilter)
+
+			// Verify results
+			assert.NoError(t, err)
+			assert.Equal(t, tc.expectedCount, len(serviceAccounts))
+
+			// Verify the names of the returned service accounts
+			actualNames := make([]string, 0, len(serviceAccounts))
+			for _, sa := range serviceAccounts {
+				actualNames = append(actualNames, sa.Name)
+			}
+
+			// Check that all expected names are in the actual names
+			for _, expectedName := range tc.expectedNames {
+				assert.Contains(t, actualNames, expectedName)
+			}
+		})
+	}
+}

From 2fc298965c87eb87a3d322efa335cf905e870bd1 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 9 Apr 2025 20:53:52 +0000
Subject: [PATCH 04/12] wip tests

---
 pkg/cfn/manager/iam_test.go | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkg/cfn/manager/iam_test.go b/pkg/cfn/manager/iam_test.go
index 0448fd88a6..008e5d9357 100644
--- a/pkg/cfn/manager/iam_test.go
+++ b/pkg/cfn/manager/iam_test.go
@@ -16,7 +16,7 @@ import (
 
 // mockStackCollection is a wrapper around StackCollection that allows us to override methods for testing
 type mockStackCollection struct {
-	*manager.StackCollection
+	manager.StackManager
 	stacks []*manager.Stack
 }
 
@@ -25,6 +25,25 @@ func (m *mockStackCollection) ListStacks(ctx context.Context) ([]*manager.Stack,
 	return m.stacks, nil
 }
 
+// DescribeIAMServiceAccountStacks overrides the method to use our ListStacks implementation
+func (m *mockStackCollection) DescribeIAMServiceAccountStacks(ctx context.Context) ([]*manager.Stack, error) {
+	stacks, err := m.ListStacks(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	iamServiceAccountStacks := []*manager.Stack{}
+	for _, s := range stacks {
+		if s.StackStatus == types.StackStatusDeleteComplete {
+			continue
+		}
+		if manager.GetIAMServiceAccountName(s) != "" {
+			iamServiceAccountStacks = append(iamServiceAccountStacks, s)
+		}
+	}
+	return iamServiceAccountStacks, nil
+}
+
 func TestGetIAMServiceAccounts(t *testing.T) {
 	testCases := []struct {
 		name            string
@@ -94,13 +113,10 @@ func TestGetIAMServiceAccounts(t *testing.T) {
 			cfg.Metadata.Name = "test-cluster"
 			cfg.Metadata.Region = "us-west-2"
 
-			// Create a stack collection with the mock provider
-			realStackCollection := manager.NewStackCollection(p, cfg)
-
 			// Create our mock stacks
 			stacks := []*manager.Stack{
 				{
-					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-default-test-sa1",
+					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-default-test-sa1"),
 					StackStatus: types.StackStatusCreateComplete,
 					Tags: []types.Tag{
 						{
@@ -116,7 +132,7 @@ func TestGetIAMServiceAccounts(t *testing.T) {
 					},
 				},
 				{
-					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-kube-system-test-sa2",
+					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-kube-system-test-sa2"),
 					StackStatus: types.StackStatusCreateComplete,
 					Tags: []types.Tag{
 						{
@@ -132,7 +148,7 @@ func TestGetIAMServiceAccounts(t *testing.T) {
 					},
 				},
 				{
-					StackName:   "eksctl-test-cluster-addon-iamserviceaccount-default-test-sa3",
+					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-default-test-sa3"),
 					StackStatus: types.StackStatusCreateComplete,
 					Tags: []types.Tag{
 						{
@@ -148,15 +164,15 @@ func TestGetIAMServiceAccounts(t *testing.T) {
 					},
 				},
 				{
-					StackName:   "eksctl-test-cluster-nodegroup-ng-1",
+					StackName:   aws.String("eksctl-test-cluster-nodegroup-ng-1"),
 					StackStatus: types.StackStatusCreateComplete,
 				},
 			}
 
 			// Create our mock stack collection
 			mockSC := &mockStackCollection{
-				StackCollection: realStackCollection,
-				stacks:          stacks,
+				StackManager: manager.NewStackCollection(p, cfg),
+				stacks:       stacks,
 			}
 
 			// Call the function being tested

From 1fccf5b865994c7a07823dd5762102d34c8a8d9e Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 9 Apr 2025 21:21:49 +0000
Subject: [PATCH 05/12] Update aws-sdk-go-v2 dependencies

---
 go.mod | 20 ++++++++++----------
 go.sum | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index f0a54ff8a1..40a0f09bd6 100644
--- a/go.mod
+++ b/go.mod
@@ -11,19 +11,19 @@ require (
 	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/config v1.29.12
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.65
-	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.0
-	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1
+	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1
+	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3
+	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2
 	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1
-	github.com/aws/aws-sdk-go-v2/service/eks v1.63.0
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0
-	github.com/aws/aws-sdk-go-v2/service/iam v1.41.0
+	github.com/aws/aws-sdk-go-v2/service/eks v1.63.1
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1
+	github.com/aws/aws-sdk-go-v2/service/iam v1.41.1
 	github.com/aws/aws-sdk-go-v2/service/kms v1.38.1
-	github.com/aws/aws-sdk-go-v2/service/outposts v1.50.0
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.58.0
+	github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17
 	github.com/aws/smithy-go v1.22.3
 	github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9
diff --git a/go.sum b/go.sum
index db5be4e11b..ef0124c25f 100644
--- a/go.sum
+++ b/go.sum
@@ -126,26 +126,42 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 h1:/frG8aV09yhCVSOEC2pzktflJJO
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33/go.mod h1:8vwASlAcV366M+qxZnjNzCjeastk1Rt1bpSRaGZanGU=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1 h1:wj4AION3NjQvjOiI8wm+TVU8y+8EsTl7fSgJAzk9cgc=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
+github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2 h1:OA5uEC/SrjRLhNGHgF/iS6YQz1bjlrCje9sERyLlGro=
+github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.0 h1:5ToD3Yv6arXLYk3GZZHVjGX4rqWdfWldh3/CkPX6JPA=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.0/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1 h1:VaXjN6szl50hbLMfSOKBKl3bEOb805aHe8j1yv0fKhU=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2 h1:kkug2EBxwHbzlH9HeaAD2UsvZiOcelcJk4QNObUgsKg=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1 h1:IKznEkCo7L8VHkQ3tC1e50F1eudenoQ7BTHJhMOswtE=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2 h1:caIDFGKezQQA/kali05x3NF2DVwzjtOFjvNvFnEeCm4=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3/go.mod h1:ygltZT++6Wn2uG4+tqE0NW1MkdEtb5W2O/CFc0xJX/g=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJZQfK6lcg+KwdvWrI=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.0 h1:LZ6pECjK8oNZbgtc5Gtmt7VzVjXyUgqPsatXcEZQyqM=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.0/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
+github.com/aws/aws-sdk-go-v2/service/eks v1.63.1 h1:oI4AHf3K7cA+ukczcNwYsE8A7trMQiTRZTsgfkSS9BE=
+github.com/aws/aws-sdk-go-v2/service/eks v1.63.1/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1 h1:HR2oZpKU1TDGGfLA0XgM3TGnapcjPKc5PEqAdMIinzU=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0 h1:RB7V8wT9ypjE/YJVBgKjoydTOh4IFoqceGiKxFH70mY=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12/go.mod h1:6qtp53AQg7KEeYrsp430PNlmVVO9qK0Xw8nddE1y+ow=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.0 h1:YvQjxKmA7fNnmphNBQ05PGGsYGYWBi9yWfuXBTKVdPs=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.0/go.mod h1:mPJkGQzeCoPs82ElNILor2JzZgYENr4UaSKUT8K27+c=
+github.com/aws/aws-sdk-go-v2/service/iam v1.41.1 h1:Kq3R+K49y23CGC5UQF3Vpw5oZEQk5gF/nn+MekPD0ZY=
+github.com/aws/aws-sdk-go-v2/service/iam v1.41.1/go.mod h1:mPJkGQzeCoPs82ElNILor2JzZgYENr4UaSKUT8K27+c=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.1 h1:7SuukGpyIgF5EiAbf1dZRxP+xSnY1WjiHBjL08fjJeE=
@@ -158,6 +174,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 h1:tecq7+mAav5byF+Mr+iONJnCBf4B
 github.com/aws/aws-sdk-go-v2/service/kms v1.38.1/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.50.0 h1:z/CFeNzowoqAqjAPedQdSAsGmQ6rhxkMg64ijF0rSr4=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.50.0/go.mod h1:2V3R0VgqiX+jSmn3dNq0yglSf1YuwxCJjsO6ME3XYxs=
+github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1 h1:G86crad1x3w4G/6fQUrYODmeGB0ptErRTLCxB1EMnlE=
+github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1/go.mod h1:2V3R0VgqiX+jSmn3dNq0yglSf1YuwxCJjsO6ME3XYxs=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17 h1:EtZFyL/uhaXlHjIwHW0KSJvppg+Ie1fzQ3wEXLEUj0I=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17/go.mod h1:l7bufyRvU+8mY0Z1BNWbWvjr59dlj9YrLKmeiz5CJ30=
 github.com/aws/aws-sdk-go-v2/service/route53 v1.48.8 h1:abeu0IVRqYXSts7Tl1Yoi/BxC59xdXYX0uVSN0fbPOk=
@@ -168,6 +186,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 h1:KRXf9/NWjoRgj2WJbX13GNjBPQ1
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15/go.mod h1:1CY54O4jz8BzgH2d6KyrzKWr2bAoqKsqUv2YZUGwMLE=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.0 h1:zQz6Q5uaC8s9734DV9UDAm2q1TEEfOvEejDBSulOapI=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.0/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1 h1:GLyAQEth2SljkC2DP5iK2GMkzgrGvURD+NEBVgQer3I=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 h1:pdgODsAhGo4dvzC3JAG5Ce0PX8kWXrTZGx+jxADD+5E=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0 h1:90uX0veLKcdHVfvxhkWUQSCi5VabtwMLFutYiRke4oo=

From 53748dd46520e01cf54e40df5a6dcfafc70c4228 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 9 Apr 2025 21:22:35 +0000
Subject: [PATCH 06/12] Update mock files comments with new mockery version
 number

---
 pkg/actions/addon/mocks/IAMRoleCreator.go                | 2 +-
 pkg/actions/addon/mocks/IAMRoleUpdater.go                | 2 +-
 pkg/actions/addon/mocks/PodIdentityIAMUpdater.go         | 2 +-
 pkg/actions/automode/mocks/cluster_role_manager.go       | 2 +-
 pkg/actions/automode/mocks/node_group_drainer.go         | 2 +-
 pkg/actions/automode/mocks/role_manager.go               | 2 +-
 pkg/actions/cluster/mocks/auto_mode_deleter.go           | 2 +-
 pkg/actions/podidentityassociation/mocks/RoleMigrator.go | 2 +-
 pkg/actions/podidentityassociation/mocks/StackDeleter.go | 2 +-
 pkg/automode/mocks/stack_creator.go                      | 2 +-
 pkg/automode/mocks/stack_deleter.go                      | 2 +-
 pkg/cfn/manager/mocks/NodeGroupResourceSet.go            | 2 +-
 pkg/cfn/manager/mocks/NodeGroupStackManager.go           | 2 +-
 pkg/ctl/utils/mocks/VPCConfigUpdater.go                  | 2 +-
 pkg/eks/mocks/ConfigProvider.go                          | 2 +-
 pkg/eks/mocks/KubeNodeGroup.go                           | 2 +-
 pkg/eks/mocksv2/ASG.go                                   | 2 +-
 pkg/eks/mocksv2/CloudFormation.go                        | 2 +-
 pkg/eks/mocksv2/CloudTrail.go                            | 2 +-
 pkg/eks/mocksv2/CloudWatchLogs.go                        | 2 +-
 pkg/eks/mocksv2/CredentialsProvider.go                   | 2 +-
 pkg/eks/mocksv2/EC2.go                                   | 2 +-
 pkg/eks/mocksv2/EKS.go                                   | 2 +-
 pkg/eks/mocksv2/ELB.go                                   | 2 +-
 pkg/eks/mocksv2/ELBV2.go                                 | 2 +-
 pkg/eks/mocksv2/IAM.go                                   | 2 +-
 pkg/eks/mocksv2/Outposts.go                              | 2 +-
 pkg/eks/mocksv2/SSM.go                                   | 2 +-
 pkg/eks/mocksv2/STS.go                                   | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkg/actions/addon/mocks/IAMRoleCreator.go b/pkg/actions/addon/mocks/IAMRoleCreator.go
index 77ff608dc2..dba9484d73 100644
--- a/pkg/actions/addon/mocks/IAMRoleCreator.go
+++ b/pkg/actions/addon/mocks/IAMRoleCreator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/addon/mocks/IAMRoleUpdater.go b/pkg/actions/addon/mocks/IAMRoleUpdater.go
index 7797aa6594..47f8003a96 100644
--- a/pkg/actions/addon/mocks/IAMRoleUpdater.go
+++ b/pkg/actions/addon/mocks/IAMRoleUpdater.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/addon/mocks/PodIdentityIAMUpdater.go b/pkg/actions/addon/mocks/PodIdentityIAMUpdater.go
index 2425a2dc6b..d27a115845 100644
--- a/pkg/actions/addon/mocks/PodIdentityIAMUpdater.go
+++ b/pkg/actions/addon/mocks/PodIdentityIAMUpdater.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/automode/mocks/cluster_role_manager.go b/pkg/actions/automode/mocks/cluster_role_manager.go
index d2e9bc2bb0..3fc3419fd6 100644
--- a/pkg/actions/automode/mocks/cluster_role_manager.go
+++ b/pkg/actions/automode/mocks/cluster_role_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/automode/mocks/node_group_drainer.go b/pkg/actions/automode/mocks/node_group_drainer.go
index 4fef5cf9f9..5e81788eeb 100644
--- a/pkg/actions/automode/mocks/node_group_drainer.go
+++ b/pkg/actions/automode/mocks/node_group_drainer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/automode/mocks/role_manager.go b/pkg/actions/automode/mocks/role_manager.go
index 6c0895ea8e..0bc8791ff9 100644
--- a/pkg/actions/automode/mocks/role_manager.go
+++ b/pkg/actions/automode/mocks/role_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/cluster/mocks/auto_mode_deleter.go b/pkg/actions/cluster/mocks/auto_mode_deleter.go
index 62c9979afc..cf1e6aad1d 100644
--- a/pkg/actions/cluster/mocks/auto_mode_deleter.go
+++ b/pkg/actions/cluster/mocks/auto_mode_deleter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/podidentityassociation/mocks/RoleMigrator.go b/pkg/actions/podidentityassociation/mocks/RoleMigrator.go
index 3581b82ab8..37072d6deb 100644
--- a/pkg/actions/podidentityassociation/mocks/RoleMigrator.go
+++ b/pkg/actions/podidentityassociation/mocks/RoleMigrator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/actions/podidentityassociation/mocks/StackDeleter.go b/pkg/actions/podidentityassociation/mocks/StackDeleter.go
index 920447e1ca..e1db024da3 100644
--- a/pkg/actions/podidentityassociation/mocks/StackDeleter.go
+++ b/pkg/actions/podidentityassociation/mocks/StackDeleter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/automode/mocks/stack_creator.go b/pkg/automode/mocks/stack_creator.go
index 94374f0f66..4a9d912604 100644
--- a/pkg/automode/mocks/stack_creator.go
+++ b/pkg/automode/mocks/stack_creator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/automode/mocks/stack_deleter.go b/pkg/automode/mocks/stack_deleter.go
index 50dcf7627c..8bdf5c9ddd 100644
--- a/pkg/automode/mocks/stack_deleter.go
+++ b/pkg/automode/mocks/stack_deleter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/cfn/manager/mocks/NodeGroupResourceSet.go b/pkg/cfn/manager/mocks/NodeGroupResourceSet.go
index 4f5bc4f57a..f62a8c011d 100644
--- a/pkg/cfn/manager/mocks/NodeGroupResourceSet.go
+++ b/pkg/cfn/manager/mocks/NodeGroupResourceSet.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/cfn/manager/mocks/NodeGroupStackManager.go b/pkg/cfn/manager/mocks/NodeGroupStackManager.go
index fb5bc5c985..e35f765633 100644
--- a/pkg/cfn/manager/mocks/NodeGroupStackManager.go
+++ b/pkg/cfn/manager/mocks/NodeGroupStackManager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/ctl/utils/mocks/VPCConfigUpdater.go b/pkg/ctl/utils/mocks/VPCConfigUpdater.go
index 5f42a25e84..1c37f53f12 100644
--- a/pkg/ctl/utils/mocks/VPCConfigUpdater.go
+++ b/pkg/ctl/utils/mocks/VPCConfigUpdater.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/eks/mocks/ConfigProvider.go b/pkg/eks/mocks/ConfigProvider.go
index da9cccd781..e7cd62e79a 100644
--- a/pkg/eks/mocks/ConfigProvider.go
+++ b/pkg/eks/mocks/ConfigProvider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/eks/mocks/KubeNodeGroup.go b/pkg/eks/mocks/KubeNodeGroup.go
index 0536209436..b33faaf9c5 100644
--- a/pkg/eks/mocks/KubeNodeGroup.go
+++ b/pkg/eks/mocks/KubeNodeGroup.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocks
 
diff --git a/pkg/eks/mocksv2/ASG.go b/pkg/eks/mocksv2/ASG.go
index 58a30866c1..7927912ebd 100644
--- a/pkg/eks/mocksv2/ASG.go
+++ b/pkg/eks/mocksv2/ASG.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/CloudFormation.go b/pkg/eks/mocksv2/CloudFormation.go
index caf32e3575..c09bbdadd7 100644
--- a/pkg/eks/mocksv2/CloudFormation.go
+++ b/pkg/eks/mocksv2/CloudFormation.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/CloudTrail.go b/pkg/eks/mocksv2/CloudTrail.go
index c1ece630c6..45106f0f37 100644
--- a/pkg/eks/mocksv2/CloudTrail.go
+++ b/pkg/eks/mocksv2/CloudTrail.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/CloudWatchLogs.go b/pkg/eks/mocksv2/CloudWatchLogs.go
index 6056813cd2..e823189075 100644
--- a/pkg/eks/mocksv2/CloudWatchLogs.go
+++ b/pkg/eks/mocksv2/CloudWatchLogs.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/CredentialsProvider.go b/pkg/eks/mocksv2/CredentialsProvider.go
index 4da1aa3fc6..abf7af735b 100644
--- a/pkg/eks/mocksv2/CredentialsProvider.go
+++ b/pkg/eks/mocksv2/CredentialsProvider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/EC2.go b/pkg/eks/mocksv2/EC2.go
index cff47d9893..d3d4968dc6 100644
--- a/pkg/eks/mocksv2/EC2.go
+++ b/pkg/eks/mocksv2/EC2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/EKS.go b/pkg/eks/mocksv2/EKS.go
index e445cf8f73..d6d178b41c 100644
--- a/pkg/eks/mocksv2/EKS.go
+++ b/pkg/eks/mocksv2/EKS.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/ELB.go b/pkg/eks/mocksv2/ELB.go
index be54c09a21..75983c5efa 100644
--- a/pkg/eks/mocksv2/ELB.go
+++ b/pkg/eks/mocksv2/ELB.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/ELBV2.go b/pkg/eks/mocksv2/ELBV2.go
index c89248f467..d151f03ea8 100644
--- a/pkg/eks/mocksv2/ELBV2.go
+++ b/pkg/eks/mocksv2/ELBV2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/IAM.go b/pkg/eks/mocksv2/IAM.go
index 1cd2cd81eb..580b4a7252 100644
--- a/pkg/eks/mocksv2/IAM.go
+++ b/pkg/eks/mocksv2/IAM.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/Outposts.go b/pkg/eks/mocksv2/Outposts.go
index e6edd0d218..06bca944c5 100644
--- a/pkg/eks/mocksv2/Outposts.go
+++ b/pkg/eks/mocksv2/Outposts.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/SSM.go b/pkg/eks/mocksv2/SSM.go
index ffae36a293..6ffc11fe95 100644
--- a/pkg/eks/mocksv2/SSM.go
+++ b/pkg/eks/mocksv2/SSM.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 
diff --git a/pkg/eks/mocksv2/STS.go b/pkg/eks/mocksv2/STS.go
index d654cbe99a..714c662e63 100644
--- a/pkg/eks/mocksv2/STS.go
+++ b/pkg/eks/mocksv2/STS.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.52.2. DO NOT EDIT.
+// Code generated by mockery v2.53.3. DO NOT EDIT.
 
 package mocksv2
 

From 50bfc58d1dbae535166f5a013ed89fc7dc8d5c97 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 9 Apr 2025 21:33:26 +0000
Subject: [PATCH 07/12] run go mod tidy

---
 go.sum | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/go.sum b/go.sum
index ef0124c25f..f98287d624 100644
--- a/go.sum
+++ b/go.sum
@@ -124,42 +124,26 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 h1:/frG8aV09yhCVSOEC2pzktflJJO48NwY3xntHBwxHiA=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33/go.mod h1:8vwASlAcV366M+qxZnjNzCjeastk1Rt1bpSRaGZanGU=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1 h1:wj4AION3NjQvjOiI8wm+TVU8y+8EsTl7fSgJAzk9cgc=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2 h1:OA5uEC/SrjRLhNGHgF/iS6YQz1bjlrCje9sERyLlGro=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.0 h1:5ToD3Yv6arXLYk3GZZHVjGX4rqWdfWldh3/CkPX6JPA=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.0/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1 h1:VaXjN6szl50hbLMfSOKBKl3bEOb805aHe8j1yv0fKhU=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2 h1:kkug2EBxwHbzlH9HeaAD2UsvZiOcelcJk4QNObUgsKg=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1 h1:IKznEkCo7L8VHkQ3tC1e50F1eudenoQ7BTHJhMOswtE=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2 h1:caIDFGKezQQA/kali05x3NF2DVwzjtOFjvNvFnEeCm4=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3/go.mod h1:ygltZT++6Wn2uG4+tqE0NW1MkdEtb5W2O/CFc0xJX/g=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJZQfK6lcg+KwdvWrI=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
-github.com/aws/aws-sdk-go-v2/service/eks v1.63.0 h1:LZ6pECjK8oNZbgtc5Gtmt7VzVjXyUgqPsatXcEZQyqM=
-github.com/aws/aws-sdk-go-v2/service/eks v1.63.0/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.1 h1:oI4AHf3K7cA+ukczcNwYsE8A7trMQiTRZTsgfkSS9BE=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.1/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1 h1:HR2oZpKU1TDGGfLA0XgM3TGnapcjPKc5PEqAdMIinzU=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0 h1:RB7V8wT9ypjE/YJVBgKjoydTOh4IFoqceGiKxFH70mY=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12/go.mod h1:6qtp53AQg7KEeYrsp430PNlmVVO9qK0Xw8nddE1y+ow=
-github.com/aws/aws-sdk-go-v2/service/iam v1.41.0 h1:YvQjxKmA7fNnmphNBQ05PGGsYGYWBi9yWfuXBTKVdPs=
-github.com/aws/aws-sdk-go-v2/service/iam v1.41.0/go.mod h1:mPJkGQzeCoPs82ElNILor2JzZgYENr4UaSKUT8K27+c=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.1 h1:Kq3R+K49y23CGC5UQF3Vpw5oZEQk5gF/nn+MekPD0ZY=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.1/go.mod h1:mPJkGQzeCoPs82ElNILor2JzZgYENr4UaSKUT8K27+c=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
@@ -172,8 +156,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14 h1:fgdkfsxTehqPc
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14/go.mod h1:wMxQ3OE8fiM8z2YRAeb2J8DLTTWMvRyYYuQOs26AbTQ=
 github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 h1:tecq7+mAav5byF+Mr+iONJnCBf4B4gon8RSp4BrweSc=
 github.com/aws/aws-sdk-go-v2/service/kms v1.38.1/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk=
-github.com/aws/aws-sdk-go-v2/service/outposts v1.50.0 h1:z/CFeNzowoqAqjAPedQdSAsGmQ6rhxkMg64ijF0rSr4=
-github.com/aws/aws-sdk-go-v2/service/outposts v1.50.0/go.mod h1:2V3R0VgqiX+jSmn3dNq0yglSf1YuwxCJjsO6ME3XYxs=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1 h1:G86crad1x3w4G/6fQUrYODmeGB0ptErRTLCxB1EMnlE=
 github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1/go.mod h1:2V3R0VgqiX+jSmn3dNq0yglSf1YuwxCJjsO6ME3XYxs=
 github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17 h1:EtZFyL/uhaXlHjIwHW0KSJvppg+Ie1fzQ3wEXLEUj0I=
@@ -184,8 +166,6 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1 h1:5bI9tJL2Z0FGFtp/LPDv0eyliFBHC
 github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1/go.mod h1:njj3tSJONkfdLt4y6X8pyqeM6sJLNZxmzctKKV+n1GM=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 h1:KRXf9/NWjoRgj2WJbX13GNjBPQ1SxUYLnIfXTz08mWs=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15/go.mod h1:1CY54O4jz8BzgH2d6KyrzKWr2bAoqKsqUv2YZUGwMLE=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.58.0 h1:zQz6Q5uaC8s9734DV9UDAm2q1TEEfOvEejDBSulOapI=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.58.0/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1 h1:GLyAQEth2SljkC2DP5iK2GMkzgrGvURD+NEBVgQer3I=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 h1:pdgODsAhGo4dvzC3JAG5Ce0PX8kWXrTZGx+jxADD+5E=

From 68cae208f17c40ee6597111eb2f2ce3df922e39e Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Mon, 14 Apr 2025 19:22:38 +0000
Subject: [PATCH 08/12] WIP add test cases for GetIAMServiceAccounts

---
 .../fakes/fake_stack_updater.go               |  20 +-
 .../mocks/StackDeleter.go                     |  30 +-
 pkg/cfn/manager/iam_test.go                   | 514 +++++++++++++-----
 3 files changed, 391 insertions(+), 173 deletions(-)

diff --git a/pkg/actions/podidentityassociation/fakes/fake_stack_updater.go b/pkg/actions/podidentityassociation/fakes/fake_stack_updater.go
index b0c9e38f75..02c9b1cdc3 100644
--- a/pkg/actions/podidentityassociation/fakes/fake_stack_updater.go
+++ b/pkg/actions/podidentityassociation/fakes/fake_stack_updater.go
@@ -25,10 +25,12 @@ type FakeStackUpdater struct {
 		result1 *manager.Stack
 		result2 error
 	}
-	GetIAMServiceAccountsStub        func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)
+	GetIAMServiceAccountsStub        func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)
 	getIAMServiceAccountsMutex       sync.RWMutex
 	getIAMServiceAccountsArgsForCall []struct {
 		arg1 context.Context
+		arg2 string
+		arg3 string
 	}
 	getIAMServiceAccountsReturns struct {
 		result1 []*v1alpha5.ClusterIAMServiceAccount
@@ -146,18 +148,20 @@ func (fake *FakeStackUpdater) DescribeStackReturnsOnCall(i int, result1 *manager
 	}{result1, result2}
 }
 
-func (fake *FakeStackUpdater) GetIAMServiceAccounts(arg1 context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
+func (fake *FakeStackUpdater) GetIAMServiceAccounts(arg1 context.Context, arg2 string, arg3 string) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
 	fake.getIAMServiceAccountsMutex.Lock()
 	ret, specificReturn := fake.getIAMServiceAccountsReturnsOnCall[len(fake.getIAMServiceAccountsArgsForCall)]
 	fake.getIAMServiceAccountsArgsForCall = append(fake.getIAMServiceAccountsArgsForCall, struct {
 		arg1 context.Context
-	}{arg1})
+		arg2 string
+		arg3 string
+	}{arg1, arg2, arg3})
 	stub := fake.GetIAMServiceAccountsStub
 	fakeReturns := fake.getIAMServiceAccountsReturns
-	fake.recordInvocation("GetIAMServiceAccounts", []interface{}{arg1})
+	fake.recordInvocation("GetIAMServiceAccounts", []interface{}{arg1, arg2, arg3})
 	fake.getIAMServiceAccountsMutex.Unlock()
 	if stub != nil {
-		return stub(arg1)
+		return stub(arg1, arg2, arg3)
 	}
 	if specificReturn {
 		return ret.result1, ret.result2
@@ -171,17 +175,17 @@ func (fake *FakeStackUpdater) GetIAMServiceAccountsCallCount() int {
 	return len(fake.getIAMServiceAccountsArgsForCall)
 }
 
-func (fake *FakeStackUpdater) GetIAMServiceAccountsCalls(stub func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)) {
+func (fake *FakeStackUpdater) GetIAMServiceAccountsCalls(stub func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)) {
 	fake.getIAMServiceAccountsMutex.Lock()
 	defer fake.getIAMServiceAccountsMutex.Unlock()
 	fake.GetIAMServiceAccountsStub = stub
 }
 
-func (fake *FakeStackUpdater) GetIAMServiceAccountsArgsForCall(i int) context.Context {
+func (fake *FakeStackUpdater) GetIAMServiceAccountsArgsForCall(i int) (context.Context, string, string) {
 	fake.getIAMServiceAccountsMutex.RLock()
 	defer fake.getIAMServiceAccountsMutex.RUnlock()
 	argsForCall := fake.getIAMServiceAccountsArgsForCall[i]
-	return argsForCall.arg1
+	return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3
 }
 
 func (fake *FakeStackUpdater) GetIAMServiceAccountsReturns(result1 []*v1alpha5.ClusterIAMServiceAccount, result2 error) {
diff --git a/pkg/actions/podidentityassociation/mocks/StackDeleter.go b/pkg/actions/podidentityassociation/mocks/StackDeleter.go
index e1db024da3..ad94a864f8 100644
--- a/pkg/actions/podidentityassociation/mocks/StackDeleter.go
+++ b/pkg/actions/podidentityassociation/mocks/StackDeleter.go
@@ -132,9 +132,9 @@ func (_c *StackDeleter_DescribeStack_Call) RunAndReturn(run func(context.Context
 	return _c
 }
 
-// GetIAMServiceAccounts provides a mock function with given fields: ctx
-func (_m *StackDeleter) GetIAMServiceAccounts(ctx context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
-	ret := _m.Called(ctx)
+// GetIAMServiceAccounts provides a mock function with given fields: ctx, name, namespace
+func (_m *StackDeleter) GetIAMServiceAccounts(ctx context.Context, name string, namespace string) ([]*v1alpha5.ClusterIAMServiceAccount, error) {
+	ret := _m.Called(ctx, name, namespace)
 
 	if len(ret) == 0 {
 		panic("no return value specified for GetIAMServiceAccounts")
@@ -142,19 +142,19 @@ func (_m *StackDeleter) GetIAMServiceAccounts(ctx context.Context) ([]*v1alpha5.
 
 	var r0 []*v1alpha5.ClusterIAMServiceAccount
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)); ok {
-		return rf(ctx)
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)); ok {
+		return rf(ctx, name, namespace)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context) []*v1alpha5.ClusterIAMServiceAccount); ok {
-		r0 = rf(ctx)
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) []*v1alpha5.ClusterIAMServiceAccount); ok {
+		r0 = rf(ctx, name, namespace)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*v1alpha5.ClusterIAMServiceAccount)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
-		r1 = rf(ctx)
+	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
+		r1 = rf(ctx, name, namespace)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -169,13 +169,15 @@ type StackDeleter_GetIAMServiceAccounts_Call struct {
 
 // GetIAMServiceAccounts is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *StackDeleter_Expecter) GetIAMServiceAccounts(ctx interface{}) *StackDeleter_GetIAMServiceAccounts_Call {
-	return &StackDeleter_GetIAMServiceAccounts_Call{Call: _e.mock.On("GetIAMServiceAccounts", ctx)}
+//   - name string
+//   - namespace string
+func (_e *StackDeleter_Expecter) GetIAMServiceAccounts(ctx interface{}, name interface{}, namespace interface{}) *StackDeleter_GetIAMServiceAccounts_Call {
+	return &StackDeleter_GetIAMServiceAccounts_Call{Call: _e.mock.On("GetIAMServiceAccounts", ctx, name, namespace)}
 }
 
-func (_c *StackDeleter_GetIAMServiceAccounts_Call) Run(run func(ctx context.Context)) *StackDeleter_GetIAMServiceAccounts_Call {
+func (_c *StackDeleter_GetIAMServiceAccounts_Call) Run(run func(ctx context.Context, name string, namespace string)) *StackDeleter_GetIAMServiceAccounts_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context))
+		run(args[0].(context.Context), args[1].(string), args[2].(string))
 	})
 	return _c
 }
@@ -185,7 +187,7 @@ func (_c *StackDeleter_GetIAMServiceAccounts_Call) Return(_a0 []*v1alpha5.Cluste
 	return _c
 }
 
-func (_c *StackDeleter_GetIAMServiceAccounts_Call) RunAndReturn(run func(context.Context) ([]*v1alpha5.ClusterIAMServiceAccount, error)) *StackDeleter_GetIAMServiceAccounts_Call {
+func (_c *StackDeleter_GetIAMServiceAccounts_Call) RunAndReturn(run func(context.Context, string, string) ([]*v1alpha5.ClusterIAMServiceAccount, error)) *StackDeleter_GetIAMServiceAccounts_Call {
 	_c.Call.Return(run)
 	return _c
 }
diff --git a/pkg/cfn/manager/iam_test.go b/pkg/cfn/manager/iam_test.go
index 008e5d9357..2ddce6afe7 100644
--- a/pkg/cfn/manager/iam_test.go
+++ b/pkg/cfn/manager/iam_test.go
@@ -1,197 +1,409 @@
-package manager_test
+package manager
 
 import (
 	"context"
-	"testing"
+	"errors"
+	"fmt"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	cfn "github.com/aws/aws-sdk-go-v2/service/cloudformation"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	"github.com/stretchr/testify/assert"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/mock"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	"github.com/weaveworks/eksctl/pkg/cfn/manager"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
 	"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
 )
 
-// mockStackCollection is a wrapper around StackCollection that allows us to override methods for testing
-type mockStackCollection struct {
-	manager.StackManager
-	stacks []*manager.Stack
-}
-
-// ListStacks overrides the ListStacks method to return our predefined stacks
-func (m *mockStackCollection) ListStacks(ctx context.Context) ([]*manager.Stack, error) {
-	return m.stacks, nil
-}
+var _ = Describe("IAM Service Accounts", func() {
+	var (
+		p            *mockprovider.MockProvider
+		cfg          *api.ClusterConfig
+		stackManager *StackCollection
+		ctx          context.Context
+	)
 
-// DescribeIAMServiceAccountStacks overrides the method to use our ListStacks implementation
-func (m *mockStackCollection) DescribeIAMServiceAccountStacks(ctx context.Context) ([]*manager.Stack, error) {
-	stacks, err := m.ListStacks(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	iamServiceAccountStacks := []*manager.Stack{}
-	for _, s := range stacks {
-		if s.StackStatus == types.StackStatusDeleteComplete {
-			continue
-		}
-		if manager.GetIAMServiceAccountName(s) != "" {
-			iamServiceAccountStacks = append(iamServiceAccountStacks, s)
+	BeforeEach(func() {
+		ctx = context.Background()
+		p = mockprovider.NewMockProvider()
+		cfg = &api.ClusterConfig{
+			Metadata: &api.ClusterMeta{
+				Name: "test-cluster",
+			},
 		}
-	}
-	return iamServiceAccountStacks, nil
-}
-
-func TestGetIAMServiceAccounts(t *testing.T) {
-	testCases := []struct {
-		name            string
-		nameFilter      string
-		namespaceFilter string
-		expectedCount   int
-		expectedNames   []string
-	}{
-		{
-			name:            "No filters - should return all service accounts",
-			nameFilter:      "",
-			namespaceFilter: "",
-			expectedCount:   3,
-			expectedNames:   []string{"test-sa1", "test-sa2", "test-sa3"},
-		},
-		{
-			name:            "Filter by name only",
-			nameFilter:      "test-sa1",
-			namespaceFilter: "",
-			expectedCount:   1,
-			expectedNames:   []string{"test-sa1"},
-		},
-		{
-			name:            "Filter by namespace only",
-			nameFilter:      "",
-			namespaceFilter: "kube-system",
-			expectedCount:   1,
-			expectedNames:   []string{"test-sa2"},
-		},
-		{
-			name:            "Filter by both name and namespace",
-			nameFilter:      "test-sa3",
-			namespaceFilter: "default",
-			expectedCount:   1,
-			expectedNames:   []string{"test-sa3"},
-		},
-		{
-			name:            "Filter by name that doesn't exist",
-			nameFilter:      "non-existent",
-			namespaceFilter: "",
-			expectedCount:   0,
-			expectedNames:   []string{},
-		},
-		{
-			name:            "Filter by namespace that doesn't exist",
-			nameFilter:      "",
-			namespaceFilter: "non-existent",
-			expectedCount:   0,
-			expectedNames:   []string{},
-		},
-		{
-			name:            "Filter by name and namespace that don't match",
-			nameFilter:      "test-sa1",
-			namespaceFilter: "kube-system",
-			expectedCount:   0,
-			expectedNames:   []string{},
-		},
-	}
+		stackManager = NewStackCollection(p, cfg).(*StackCollection)
+	})
 
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Create a new mock provider
-			p := mockprovider.NewMockProvider()
+	Describe("GetIAMServiceAccounts", func() {
+		It("returns service accounts when found", func() {
+			// Setup mock response for DescribeIAMServiceAccountStacks
+			testCases := []iamServiceAccountTestCase{
+				{
+					Name:      "app-service-account",
+					Namespace: "default",
+				},
+				{
+					Name:      "monitoring-service-account",
+					Namespace: "monitoring",
+				},
+			}
 
-			// Create a test cluster config
-			cfg := api.NewClusterConfig()
-			cfg.Metadata.Name = "test-cluster"
-			cfg.Metadata.Region = "us-west-2"
+			// Mock the ListStacks call that DescribeIAMServiceAccountStacks uses
+			stacks := getStacks(testCases)
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(
+				&cfn.ListStacksOutput{
+					StackSummaries: getStackSummaries(stacks),
+				}, nil)
 
-			// Create our mock stacks
-			stacks := []*manager.Stack{
-				{
-					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-default-test-sa1"),
-					StackStatus: types.StackStatusCreateComplete,
-					Tags: []types.Tag{
+			// Mock the DescribeStacks call that outputs.Collect uses
+			for _, stack := range stacks {
+				p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.MatchedBy(func(input interface{}) bool {
+					if describeInput, ok := input.(*cfn.DescribeStacksInput); ok {
+						return describeInput.StackName != nil && *describeInput.StackName == *stack.StackName
+					}
+					return false
+				})).Return(&cfn.DescribeStacksOutput{
+					Stacks: []types.Stack{
 						{
-							Key:   aws.String(api.IAMServiceAccountNameTag),
-							Value: aws.String("default/test-sa1"),
-						},
-					},
-					Outputs: []types.Output{
-						{
-							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
-							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa1-role"),
+							StackName:    stack.StackName,
+							CreationTime: stack.CreationTime,
+							StackStatus:  stack.StackStatus,
+							Tags:         stack.Tags,
+							Outputs: []types.Output{
+								{
+									OutputKey: aws.String(outputs.IAMServiceAccountRoleName),
+									OutputValue: aws.String(fmt.Sprintf("arn:aws:iam::123456789012:role/eksctl-%s-%s-%s",
+										cfg.Metadata.Name, *stack.Tags[0].Value, *stack.Tags[1].Value)),
+								},
+							},
 						},
 					},
+				}, nil)
+			}
+
+			// Call the function with no filters - this should use the real implementation
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "", "")
+
+			// Verify results
+			Expect(err).NotTo(HaveOccurred())
+			Expect(serviceAccounts).To(HaveLen(2))
+
+			// Verify the service accounts have the expected values
+			for _, sa := range serviceAccounts {
+				Expect(sa.Status.RoleARN).NotTo(BeNil())
+				if sa.Name == "app-service-account" {
+					Expect(sa.Namespace).To(Equal("default"))
+				} else if sa.Name == "monitoring-service-account" {
+					Expect(sa.Namespace).To(Equal("monitoring"))
+				} else {
+					Fail(fmt.Sprintf("Unexpected service account name: %s", sa.Name))
+				}
+			}
+		})
+
+		It("filters service accounts by name", func() {
+			// Setup mock response
+			testCases := []iamServiceAccountTestCase{
+				{
+					Name:      "monitoring-service-account",
+					Namespace: "monitoring",
 				},
 				{
-					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-kube-system-test-sa2"),
-					StackStatus: types.StackStatusCreateComplete,
-					Tags: []types.Tag{
-						{
-							Key:   aws.String(api.IAMServiceAccountNameTag),
-							Value: aws.String("kube-system/test-sa2"),
-						},
-					},
-					Outputs: []types.Output{
-						{
-							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
-							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa2-role"),
-						},
-					},
+					Name:      "app-service-account",
+					Namespace: "default",
 				},
 				{
-					StackName:   aws.String("eksctl-test-cluster-addon-iamserviceaccount-default-test-sa3"),
-					StackStatus: types.StackStatusCreateComplete,
-					Tags: []types.Tag{
+					Name:      "another-app-service-account",
+					Namespace: "default",
+				},
+			}
+
+			// Mock the ListStacks call
+			stacks := getStacks(testCases)
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(
+				&cfn.ListStacksOutput{
+					StackSummaries: getStackSummaries(stacks),
+				}, nil)
+
+			// Mock the DescribeStacks call for each stack
+			for _, stack := range stacks {
+				p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.MatchedBy(func(input interface{}) bool {
+					if describeInput, ok := input.(*cfn.DescribeStacksInput); ok {
+						return describeInput.StackName != nil && *describeInput.StackName == *stack.StackName
+					}
+					return false
+				})).Return(&cfn.DescribeStacksOutput{
+					Stacks: []types.Stack{
 						{
-							Key:   aws.String(api.IAMServiceAccountNameTag),
-							Value: aws.String("default/test-sa3"),
+							StackName:    stack.StackName,
+							CreationTime: stack.CreationTime,
+							StackStatus:  stack.StackStatus,
+							Tags:         stack.Tags,
+							Outputs: []types.Output{
+								{
+									OutputKey: aws.String(outputs.IAMServiceAccountRoleName),
+									OutputValue: aws.String(fmt.Sprintf("arn:aws:iam::123456789012:role/eksctl-%s-%s-%s",
+										cfg.Metadata.Name, *stack.Tags[0].Value, *stack.Tags[1].Value)),
+								},
+							},
 						},
 					},
-					Outputs: []types.Output{
+				}, nil)
+			}
+
+			// Call the function with name filter
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "app-service-account", "")
+
+			// Verify results
+			Expect(err).NotTo(HaveOccurred())
+			Expect(serviceAccounts).To(HaveLen(1))
+			Expect(serviceAccounts[0].Name).To(Equal("app-service-account"))
+			Expect(serviceAccounts[0].Namespace).To(Equal("default"))
+		})
+
+		It("filters service accounts by namespace", func() {
+			// Setup mock response
+			testCases := []iamServiceAccountTestCase{
+				{
+					Name:      "app-service-account",
+					Namespace: "default",
+				},
+				{
+					Name:      "monitoring-service-account",
+					Namespace: "monitoring",
+				},
+				{
+					Name:      "observability-account",
+					Namespace: "monitoring",
+				},
+				{
+					Name:      "another-app-service-account",
+					Namespace: "default",
+				},
+			}
+
+			// Mock the ListStacks call
+			stacks := getStacks(testCases)
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(
+				&cfn.ListStacksOutput{
+					StackSummaries: getStackSummaries(stacks),
+				}, nil)
+
+			// Mock the DescribeStacks call for each stack
+			for _, stack := range stacks {
+				p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.MatchedBy(func(input interface{}) bool {
+					if describeInput, ok := input.(*cfn.DescribeStacksInput); ok {
+						return describeInput.StackName != nil && *describeInput.StackName == *stack.StackName
+					}
+					return false
+				})).Return(&cfn.DescribeStacksOutput{
+					Stacks: []types.Stack{
 						{
-							OutputKey:   aws.String(outputs.IAMServiceAccountRoleName),
-							OutputValue: aws.String("arn:aws:iam::123456789012:role/test-sa3-role"),
+							StackName:    stack.StackName,
+							CreationTime: stack.CreationTime,
+							StackStatus:  stack.StackStatus,
+							Tags:         stack.Tags,
+							Outputs: []types.Output{
+								{
+									OutputKey: aws.String(outputs.IAMServiceAccountRoleName),
+									OutputValue: aws.String(fmt.Sprintf("arn:aws:iam::123456789012:role/eksctl-%s-%s-%s",
+										cfg.Metadata.Name, *stack.Tags[0].Value, *stack.Tags[1].Value)),
+								},
+							},
 						},
 					},
+				}, nil)
+			}
+
+			// Call the function with namespace filter
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "", "monitoring")
+
+			// Verify results
+			Expect(err).NotTo(HaveOccurred())
+			Expect(serviceAccounts).To(HaveLen(2))
+			for _, sa := range serviceAccounts {
+				Expect(sa.Namespace).To(Equal("monitoring"))
+			}
+		})
+
+		It("filters service accounts by both name and namespace", func() {
+			// Setup mock response
+			testCases := []iamServiceAccountTestCase{
+				{
+					Name:      "app-service-account",
+					Namespace: "default",
 				},
 				{
-					StackName:   aws.String("eksctl-test-cluster-nodegroup-ng-1"),
-					StackStatus: types.StackStatusCreateComplete,
+					Name:      "app-service-account",
+					Namespace: "monitoring",
+				},
+				{
+					Name:      "another-app-service-account",
+					Namespace: "monitoring",
+				},
+				{
+					Name:      "another-app-service-account",
+					Namespace: "default",
 				},
 			}
 
-			// Create our mock stack collection
-			mockSC := &mockStackCollection{
-				StackManager: manager.NewStackCollection(p, cfg),
-				stacks:       stacks,
+			// Mock the ListStacks call
+			stacks := getStacks(testCases)
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(
+				&cfn.ListStacksOutput{
+					StackSummaries: getStackSummaries(stacks),
+				}, nil)
+
+			// Mock the DescribeStacks call for each stack
+			for _, stack := range stacks {
+				p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.MatchedBy(func(input interface{}) bool {
+					if describeInput, ok := input.(*cfn.DescribeStacksInput); ok {
+						return describeInput.StackName != nil && *describeInput.StackName == *stack.StackName
+					}
+					return false
+				})).Return(&cfn.DescribeStacksOutput{
+					Stacks: []types.Stack{
+						{
+							StackName:    stack.StackName,
+							CreationTime: stack.CreationTime,
+							StackStatus:  stack.StackStatus,
+							Tags:         stack.Tags,
+							Outputs: []types.Output{
+								{
+									OutputKey: aws.String(outputs.IAMServiceAccountRoleName),
+									OutputValue: aws.String(fmt.Sprintf("arn:aws:iam::123456789012:role/eksctl-%s-%s-%s",
+										cfg.Metadata.Name, *stack.Tags[0].Value, *stack.Tags[1].Value)),
+								},
+							},
+						},
+					},
+				}, nil)
 			}
 
-			// Call the function being tested
-			serviceAccounts, err := mockSC.GetIAMServiceAccounts(context.Background(), tc.nameFilter, tc.namespaceFilter)
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "app-service-account", "default")
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(serviceAccounts).To(HaveLen(1))
+			Expect(serviceAccounts[0].Name).To(Equal("app-service-account"))
+			Expect(serviceAccounts[0].Namespace).To(Equal("default"))
+		})
+
+		It("handles errors from the CloudFormation API", func() {
+			// Setup mock error response
+			expectedError := errors.New("failed to describe IAM service account stacks")
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(nil, expectedError)
+
+			// Call the function
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "", "")
 
 			// Verify results
-			assert.NoError(t, err)
-			assert.Equal(t, tc.expectedCount, len(serviceAccounts))
+			Expect(err).To(MatchError(expectedError))
+			Expect(serviceAccounts).To(BeNil())
+		})
 
-			// Verify the names of the returned service accounts
-			actualNames := make([]string, 0, len(serviceAccounts))
-			for _, sa := range serviceAccounts {
-				actualNames = append(actualNames, sa.Name)
+		It("returns empty slice when no service accounts match filters", func() {
+			// Setup mock response with stacks that won't match our filter
+			testCases := []iamServiceAccountTestCase{
+				{
+					Name:      "app-service-account",
+					Namespace: "default",
+				},
+				{
+					Name:      "monitoring-service-account",
+					Namespace: "monitoring",
+				},
 			}
 
-			// Check that all expected names are in the actual names
-			for _, expectedName := range tc.expectedNames {
-				assert.Contains(t, actualNames, expectedName)
+			// Mock the ListStacks call
+			stacks := getStacks(testCases)
+			p.MockCloudFormation().On("ListStacks", mock.Anything, mock.Anything, mock.Anything).Return(
+				&cfn.ListStacksOutput{
+					StackSummaries: getStackSummaries(stacks),
+				}, nil)
+
+			// Mock the DescribeStacks call for each stack
+			for _, stack := range stacks {
+				p.MockCloudFormation().On("DescribeStacks", mock.Anything, mock.MatchedBy(func(input interface{}) bool {
+					if describeInput, ok := input.(*cfn.DescribeStacksInput); ok {
+						return describeInput.StackName != nil && *describeInput.StackName == *stack.StackName
+					}
+					return false
+				})).Return(&cfn.DescribeStacksOutput{
+					Stacks: []types.Stack{
+						{
+							StackName:    stack.StackName,
+							CreationTime: stack.CreationTime,
+							StackStatus:  stack.StackStatus,
+							Tags:         stack.Tags,
+							Outputs: []types.Output{
+								{
+									OutputKey: aws.String(outputs.IAMServiceAccountRoleName),
+									OutputValue: aws.String(fmt.Sprintf("arn:aws:iam::123456789012:role/eksctl-%s-%s-%s",
+										cfg.Metadata.Name, *stack.Tags[0].Value, *stack.Tags[1].Value)),
+								},
+							},
+						},
+					},
+				}, nil)
 			}
+
+			serviceAccounts, err := stackManager.GetIAMServiceAccounts(ctx, "non-existent", "non-existent")
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(serviceAccounts).To(BeEmpty())
 		})
+	})
+})
+
+type iamServiceAccountTestCase struct {
+	Name      string
+	Namespace string
+}
+
+func getStacks(testCases []iamServiceAccountTestCase) []types.Stack {
+	stacks := make([]types.Stack, 0)
+
+	for _, testCase := range testCases {
+		stackName := fmt.Sprintf("eksctl-test-cluster-addon-iamserviceaccount-%s-%s", testCase.Namespace, testCase.Name)
+		stack := types.Stack{
+			StackName:    aws.String(stackName),
+			CreationTime: aws.Time(time.Now()),
+			StackStatus:  types.StackStatusCreateComplete,
+			Tags: []types.Tag{
+				{
+					Key:   aws.String(api.IAMServiceAccountNameTag),
+					Value: aws.String(fmt.Sprintf("%s/%s", testCase.Namespace, testCase.Name)),
+				},
+				{
+					Key:   aws.String("Namespace"),
+					Value: aws.String(testCase.Namespace),
+				},
+				{
+					Key:   aws.String("ServiceAccount"),
+					Value: aws.String(testCase.Name),
+				},
+			},
+		}
+		stacks = append(stacks, stack)
 	}
+
+	return stacks
+}
+
+func getStackSummaries(stacks []types.Stack) []types.StackSummary {
+	summaries := make([]types.StackSummary, 0, len(stacks))
+
+	for _, stack := range stacks {
+		summary := types.StackSummary{
+			StackName:    stack.StackName,
+			CreationTime: stack.CreationTime,
+			StackStatus:  stack.StackStatus,
+		}
+		summaries = append(summaries, summary)
+	}
+
+	return summaries
 }

From b4a7cb955f52b79d8bd16a4b7ff1e399c0731e54 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 16 Apr 2025 00:35:33 +0000
Subject: [PATCH 09/12] rm Get actions tests that covered logic which is now in
 iam.go

---
 go.mod                       |  16 ++---
 go.sum                       |  16 +++++
 pkg/actions/irsa/get_test.go | 109 +----------------------------------
 3 files changed, 26 insertions(+), 115 deletions(-)

diff --git a/go.mod b/go.mod
index 40a0f09bd6..add40fb4cf 100644
--- a/go.mod
+++ b/go.mod
@@ -11,19 +11,19 @@ require (
 	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/config v1.29.12
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.65
-	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1
-	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2
+	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2
+	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4
+	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3
 	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1
-	github.com/aws/aws-sdk-go-v2/service/eks v1.63.1
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1
+	github.com/aws/aws-sdk-go-v2/service/eks v1.63.2
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
 	github.com/aws/aws-sdk-go-v2/service/iam v1.41.1
 	github.com/aws/aws-sdk-go-v2/service/kms v1.38.1
 	github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.58.2
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17
 	github.com/aws/smithy-go v1.22.3
 	github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9
diff --git a/go.sum b/go.sum
index f98287d624..e8f1c379c6 100644
--- a/go.sum
+++ b/go.sum
@@ -126,22 +126,36 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 h1:/frG8aV09yhCVSOEC2pzktflJJO
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33/go.mod h1:8vwASlAcV366M+qxZnjNzCjeastk1Rt1bpSRaGZanGU=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2 h1:OA5uEC/SrjRLhNGHgF/iS6YQz1bjlrCje9sERyLlGro=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
+github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3 h1:QsKdBxtC8csnKt5BbV7D1op4Nf13p2YkTJIkppaCakw=
+github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1 h1:VaXjN6szl50hbLMfSOKBKl3bEOb805aHe8j1yv0fKhU=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2 h1:o9cuZdZlI9VWMqsNa2mnf2IRsFAROHnaYA1BW3lHGuY=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4 h1:pQpinmWv9jEisDR6/DccOf2cXdAf/CAwQ39nfJfJDlE=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2 h1:caIDFGKezQQA/kali05x3NF2DVwzjtOFjvNvFnEeCm4=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3 h1:3y0jkGtsaZLCg+n73BoSXOAkLFtgmD/+4prXW1pzovc=
+github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3/go.mod h1:ygltZT++6Wn2uG4+tqE0NW1MkdEtb5W2O/CFc0xJX/g=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJZQfK6lcg+KwdvWrI=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.1 h1:oI4AHf3K7cA+ukczcNwYsE8A7trMQiTRZTsgfkSS9BE=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.1/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
+github.com/aws/aws-sdk-go-v2/service/eks v1.63.2 h1:ymoK/RrNf6SAzWCPUk9EdyUAshlmBeF6ZWe6GcS8XBg=
+github.com/aws/aws-sdk-go-v2/service/eks v1.63.2/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3 h1:DpyV8LeDf0y7iDaGZ3h1Y+Nh5IaBOR+xj44vVgEEegY=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 h1:vX70Z4lNSr7XsioU0uJq5yvxgI50sB66MvD+V/3buS4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12/go.mod h1:6qtp53AQg7KEeYrsp430PNlmVVO9qK0Xw8nddE1y+ow=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.1 h1:Kq3R+K49y23CGC5UQF3Vpw5oZEQk5gF/nn+MekPD0ZY=
@@ -168,6 +182,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 h1:KRXf9/NWjoRgj2WJbX13GNjBPQ1
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15/go.mod h1:1CY54O4jz8BzgH2d6KyrzKWr2bAoqKsqUv2YZUGwMLE=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1 h1:GLyAQEth2SljkC2DP5iK2GMkzgrGvURD+NEBVgQer3I=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.58.2 h1:uXy3QGAw3xv0RS+OlbeMEAnOA3vFFsf7yvjUswV6N/k=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.58.2/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 h1:pdgODsAhGo4dvzC3JAG5Ce0PX8kWXrTZGx+jxADD+5E=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0 h1:90uX0veLKcdHVfvxhkWUQSCi5VabtwMLFutYiRke4oo=
diff --git a/pkg/actions/irsa/get_test.go b/pkg/actions/irsa/get_test.go
index 816bf8549b..1108041963 100644
--- a/pkg/actions/irsa/get_test.go
+++ b/pkg/actions/irsa/get_test.go
@@ -24,8 +24,8 @@ var _ = Describe("Get", func() {
 		irsaManager = irsa.New("my-cluster", fakeStackManager, nil, nil)
 	})
 
-	When("no options are specified", func() {
-		It("returns all service accounts", func() {
+	When("no error occurs", func() {
+		It("returns service accounts from GetIAMServiceAccounts", func() {
 			fakeStackManager.GetIAMServiceAccountsReturns([]*api.ClusterIAMServiceAccount{
 				{
 					ClusterIAMMeta: api.ClusterIAMMeta{
@@ -65,109 +65,4 @@ var _ = Describe("Get", func() {
 			}))
 		})
 	})
-
-	When("name option is specified", func() {
-		It("returns only the service account matching the name", func() {
-			fakeStackManager.GetIAMServiceAccountsReturns([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa-2",
-						Namespace: "not-default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}, nil)
-
-			serviceAccounts, err := irsaManager.Get(context.Background(), irsa.GetOptions{Name: "test-sa"})
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1))
-			Expect(serviceAccounts).To(Equal([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}))
-		})
-	})
-
-	When("namespace option is specified", func() {
-		It("returns only the service account matching the name", func() {
-			fakeStackManager.GetIAMServiceAccountsReturns([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa-2",
-						Namespace: "not-default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}, nil)
-
-			serviceAccounts, err := irsaManager.Get(context.Background(), irsa.GetOptions{Namespace: "not-default"})
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1))
-			Expect(serviceAccounts).To(Equal([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa-2",
-						Namespace: "not-default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}))
-		})
-	})
-
-	When("name and namespace option is specified", func() {
-		It("returns only the service account matching the name", func() {
-			fakeStackManager.GetIAMServiceAccountsReturns([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "some-other-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}, nil)
-
-			serviceAccounts, err := irsaManager.Get(context.Background(), irsa.GetOptions{Namespace: "default", Name: "test-sa"})
-			Expect(err).NotTo(HaveOccurred())
-
-			Expect(fakeStackManager.GetIAMServiceAccountsCallCount()).To(Equal(1))
-			Expect(serviceAccounts).To(Equal([]*api.ClusterIAMServiceAccount{
-				{
-					ClusterIAMMeta: api.ClusterIAMMeta{
-						Name:      "test-sa",
-						Namespace: "default",
-					},
-					AttachPolicyARNs: []string{"arn-123"},
-				},
-			}))
-		})
-	})
 })

From f6f5694a7c3423008d1135b33601461e25611fa6 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Wed, 16 Apr 2025 00:37:33 +0000
Subject: [PATCH 10/12] go mod tidy

---
 go.sum | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/go.sum b/go.sum
index e8f1c379c6..3cde81d7d5 100644
--- a/go.sum
+++ b/go.sum
@@ -124,36 +124,22 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 h1:/frG8aV09yhCVSOEC2pzktflJJO48NwY3xntHBwxHiA=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33/go.mod h1:8vwASlAcV366M+qxZnjNzCjeastk1Rt1bpSRaGZanGU=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2 h1:OA5uEC/SrjRLhNGHgF/iS6YQz1bjlrCje9sERyLlGro=
-github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.2/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3 h1:QsKdBxtC8csnKt5BbV7D1op4Nf13p2YkTJIkppaCakw=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1 h1:VaXjN6szl50hbLMfSOKBKl3bEOb805aHe8j1yv0fKhU=
-github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.1/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2 h1:o9cuZdZlI9VWMqsNa2mnf2IRsFAROHnaYA1BW3lHGuY=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4 h1:pQpinmWv9jEisDR6/DccOf2cXdAf/CAwQ39nfJfJDlE=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2 h1:caIDFGKezQQA/kali05x3NF2DVwzjtOFjvNvFnEeCm4=
-github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.2/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3 h1:3y0jkGtsaZLCg+n73BoSXOAkLFtgmD/+4prXW1pzovc=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3/go.mod h1:ygltZT++6Wn2uG4+tqE0NW1MkdEtb5W2O/CFc0xJX/g=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJZQfK6lcg+KwdvWrI=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
-github.com/aws/aws-sdk-go-v2/service/eks v1.63.1 h1:oI4AHf3K7cA+ukczcNwYsE8A7trMQiTRZTsgfkSS9BE=
-github.com/aws/aws-sdk-go-v2/service/eks v1.63.1/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.2 h1:ymoK/RrNf6SAzWCPUk9EdyUAshlmBeF6ZWe6GcS8XBg=
 github.com/aws/aws-sdk-go-v2/service/eks v1.63.2/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3 h1:DpyV8LeDf0y7iDaGZ3h1Y+Nh5IaBOR+xj44vVgEEegY=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 h1:vX70Z4lNSr7XsioU0uJq5yvxgI50sB66MvD+V/3buS4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=
@@ -180,8 +166,6 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1 h1:5bI9tJL2Z0FGFtp/LPDv0eyliFBHC
 github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1/go.mod h1:njj3tSJONkfdLt4y6X8pyqeM6sJLNZxmzctKKV+n1GM=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 h1:KRXf9/NWjoRgj2WJbX13GNjBPQ1SxUYLnIfXTz08mWs=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15/go.mod h1:1CY54O4jz8BzgH2d6KyrzKWr2bAoqKsqUv2YZUGwMLE=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1 h1:GLyAQEth2SljkC2DP5iK2GMkzgrGvURD+NEBVgQer3I=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.58.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.2 h1:uXy3QGAw3xv0RS+OlbeMEAnOA3vFFsf7yvjUswV6N/k=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.58.2/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
 github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 h1:pdgODsAhGo4dvzC3JAG5Ce0PX8kWXrTZGx+jxADD+5E=

From eea39156bff57c3cae341a202fb64b38481e41f3 Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Thu, 17 Apr 2025 17:11:49 +0000
Subject: [PATCH 11/12] rerun go  install mod tidy

---
 go.mod | 6 +++---
 go.sum | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 65212fac26..3064e9a5f4 100644
--- a/go.mod
+++ b/go.mod
@@ -13,13 +13,13 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.65
 	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3
 	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2
-	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3
+	github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3
 	github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1
 	github.com/aws/aws-sdk-go-v2/service/eks v1.64.0
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
 	github.com/aws/aws-sdk-go-v2/service/iam v1.41.1
 	github.com/aws/aws-sdk-go-v2/service/kms v1.38.1
 	github.com/aws/aws-sdk-go-v2/service/outposts v1.50.1
diff --git a/go.sum b/go.sum
index ce629b49c9..732352e58f 100644
--- a/go.sum
+++ b/go.sum
@@ -130,6 +130,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2 h1:o9cuZdZlI9VWMqsNa
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4 h1:pQpinmWv9jEisDR6/DccOf2cXdAf/CAwQ39nfJfJDlE=
+github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3 h1:3y0jkGtsaZLCg+n73BoSXOAkLFtgmD/+4prXW1pzovc=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck=
 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE=
@@ -140,8 +142,12 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.64.0 h1:EYeOThTRysemFtC6J6h6b7dNg3jN
 github.com/aws/aws-sdk-go-v2/service/eks v1.64.0/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3 h1:DpyV8LeDf0y7iDaGZ3h1Y+Nh5IaBOR+xj44vVgEEegY=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 h1:vX70Z4lNSr7XsioU0uJq5yvxgI50sB66MvD+V/3buS4=
+github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12/go.mod h1:6qtp53AQg7KEeYrsp430PNlmVVO9qK0Xw8nddE1y+ow=
 github.com/aws/aws-sdk-go-v2/service/iam v1.41.1 h1:Kq3R+K49y23CGC5UQF3Vpw5oZEQk5gF/nn+MekPD0ZY=

From 6a1bb35aca6ebaa9cdeafba7e674781d2496af7b Mon Sep 17 00:00:00 2001
From: Nathan Clonts <nclonts@amazon.com>
Date: Thu, 17 Apr 2025 17:13:46 +0000
Subject: [PATCH 12/12] go mod tidy

---
 go.sum | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/go.sum b/go.sum
index 732352e58f..7a889d5343 100644
--- a/go.sum
+++ b/go.sum
@@ -128,8 +128,6 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3 h1:QsKdBxtC8csnKt5BbV7D
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.3/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2 h1:o9cuZdZlI9VWMqsNa2mnf2IRsFAROHnaYA1BW3lHGuY=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.59.2/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3 h1:nTKHvvDTsS6SqAqu/fDhpmbNmDz+0ONh8niPoCkhPtM=
-github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.3/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4 h1:pQpinmWv9jEisDR6/DccOf2cXdAf/CAwQ39nfJfJDlE=
 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.4/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.3 h1:3y0jkGtsaZLCg+n73BoSXOAkLFtgmD/+4prXW1pzovc=
@@ -140,12 +138,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJ
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY=
 github.com/aws/aws-sdk-go-v2/service/eks v1.64.0 h1:EYeOThTRysemFtC6J6h6b7dNg3jN03QuO5cg92ojIQE=
 github.com/aws/aws-sdk-go-v2/service/eks v1.64.0/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2 h1:Zlfmpg4QsduBeiK0vTc8WjnHZoYVGe64FcwuCsipjWE=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.2/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3 h1:DpyV8LeDf0y7iDaGZ3h1Y+Nh5IaBOR+xj44vVgEEegY=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1 h1:USXR7nfl+bu7HnR/M3KtnPD3wjlCXM72kYX+2PaIgEI=
-github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.1/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2 h1:vX70Z4lNSr7XsioU0uJq5yvxgI50sB66MvD+V/3buS4=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4=
 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s=