Skip to content

Commit c72dcd0

Browse files
LiangquanLi930LiangquanLi930
committed
rebase
1 parent 7f6f80a commit c72dcd0

File tree

12 files changed

+58
-53
lines changed

12 files changed

+58
-53
lines changed

‎test/e2e/shared/aws_helpers.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
)
3838

3939
type WaitForLoadBalancerToExistForServiceInput struct {
40-
AWSSessionV2 *aws.Config
40+
AWSSession *aws.Config
4141
ServiceName string
4242
ServiceNamespace string
4343
ClusterName string
@@ -65,7 +65,7 @@ func WaitForLoadBalancerToExistForService(ctx context.Context, input WaitForLoad
6565
}
6666

6767
type GetLoadBalancerARNsInput struct {
68-
AWSSessionV2 *aws.Config
68+
AWSSession *aws.Config
6969
ServiceName string
7070
ServiceNamespace string
7171
ClusterName string
@@ -81,8 +81,8 @@ func GetLoadBalancerARNs(ctx context.Context, input GetLoadBalancerARNsInput) ([
8181
serviceTag: {string(infrav1.ResourceLifecycleOwned)},
8282
}
8383
descInput := &DescribeResourcesByTagsInput{
84-
AWSSessionV2: input.AWSSessionV2,
85-
Tags: tags,
84+
AWSSession: input.AWSSession,
85+
Tags: tags,
8686
}
8787

8888
descOutput, err := DescribeResourcesByTags(ctx, *descInput)
@@ -123,8 +123,8 @@ func GetLoadBalancerARNs(ctx context.Context, input GetLoadBalancerARNsInput) ([
123123
}
124124

125125
type DescribeResourcesByTagsInput struct {
126-
AWSSessionV2 *aws.Config
127-
Tags map[string][]string
126+
AWSSession *aws.Config
127+
Tags map[string][]string
128128
}
129129

130130
type DescribeResourcesByTagsOutput struct {
@@ -147,7 +147,7 @@ func DescribeResourcesByTags(ctx context.Context, input DescribeResourcesByTagsI
147147
})
148148
}
149149

150-
rgSvc := rgapi.NewFromConfig(*input.AWSSessionV2)
150+
rgSvc := rgapi.NewFromConfig(*input.AWSSession)
151151
awsOutput, err := rgSvc.GetResources(ctx, &awsInput)
152152
if err != nil {
153153
return nil, fmt.Errorf("getting resources by tags: %w", err)
@@ -164,15 +164,15 @@ func DescribeResourcesByTags(ctx context.Context, input DescribeResourcesByTagsI
164164
}
165165

166166
type CheckClassicElbHealthCheckInput struct {
167-
AWSSessionV2 *aws.Config
167+
AWSSession *aws.Config
168168
LoadBalancerName string
169169
ExpectedTarget string
170170
}
171171

172172
func CheckClassicElbHealthCheck(ctx context.Context, input CheckClassicElbHealthCheckInput, intervals ...interface{}) {
173173
Byf("Checking the health check for the classic load balancer %s", input.LoadBalancerName)
174174

175-
elbSvc := elb.NewFromConfig(*input.AWSSessionV2)
175+
elbSvc := elb.NewFromConfig(*input.AWSSession)
176176

177177
Eventually(func() error {
178178
out, err := elbSvc.DescribeLoadBalancers(ctx, &elb.DescribeLoadBalancersInput{

‎test/e2e/suites/managed/addon.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
type CheckAddonExistsSpecInput struct {
3939
E2EConfig *clusterctl.E2EConfig
4040
BootstrapClusterProxy framework.ClusterProxy
41-
AWSSessionV2 *awsv2.Config
41+
AWSSession *awsv2.Config
4242
Namespace *corev1.Namespace
4343
ClusterName string
4444
AddonName string
@@ -51,7 +51,7 @@ func CheckAddonExistsSpec(ctx context.Context, inputGetter func() CheckAddonExis
5151
input := inputGetter()
5252
Expect(input.E2EConfig).ToNot(BeNil(), "Invalid argument. input.E2EConfig can't be nil")
5353
Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil")
54-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
54+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
5555
Expect(input.Namespace).NotTo(BeNil(), "Invalid argument. input.Namespace can't be nil")
5656
Expect(input.ClusterName).ShouldNot(BeEmpty(), "Invalid argument. input.ClusterName can't be empty")
5757
Expect(input.AddonName).ShouldNot(BeEmpty(), "Invalid argument. input.AddonName can't be empty")
@@ -69,7 +69,7 @@ func CheckAddonExistsSpec(ctx context.Context, inputGetter func() CheckAddonExis
6969
By(fmt.Sprintf("Checking EKS addon %s is installed on cluster %s and is active", input.AddonName, input.ClusterName))
7070
waitForEKSAddonToHaveStatus(ctx, waitForEKSAddonToHaveStatusInput{
7171
ControlPlane: controlPlane,
72-
AWSSessionV2: input.AWSSessionV2,
72+
AWSSession: input.AWSSession,
7373
AddonName: input.AddonName,
7474
AddonVersion: input.AddonVersion,
7575
AddonStatus: []string{string(ekstypes.AddonStatusActive), string(ekstypes.AddonStatusDegraded)},
@@ -79,7 +79,7 @@ func CheckAddonExistsSpec(ctx context.Context, inputGetter func() CheckAddonExis
7979
By(fmt.Sprintf("Checking EKS addon %s has the correct configuration", input.AddonName))
8080
checkEKSAddonConfiguration(ctx, checkEKSAddonConfigurationInput{
8181
ControlPlane: controlPlane,
82-
AWSSessionV2: input.AWSSessionV2,
82+
AWSSession: input.AWSSession,
8383
AddonName: input.AddonName,
8484
AddonVersion: input.AddonVersion,
8585
AddonConfiguration: input.AddonConfiguration,

‎test/e2e/suites/managed/addon_helpers.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,23 @@ import (
3232

3333
type waitForEKSAddonToHaveStatusInput struct {
3434
ControlPlane *ekscontrolplanev1.AWSManagedControlPlane
35-
AWSSessionV2 *aws.Config
35+
AWSSession *aws.Config
3636
AddonName string
3737
AddonVersion string
3838
AddonStatus []string
3939
}
4040

4141
func waitForEKSAddonToHaveStatus(ctx context.Context, input waitForEKSAddonToHaveStatusInput, intervals ...interface{}) {
4242
Expect(input.ControlPlane).ToNot(BeNil(), "Invalid argument. input.ControlPlane can't be nil")
43-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
43+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
4444
Expect(input.AddonName).ShouldNot(BeEmpty(), "Invalid argument. input.AddonName can't be empty")
4545
Expect(input.AddonVersion).ShouldNot(BeEmpty(), "Invalid argument. input.AddonVersion can't be empty")
4646
Expect(input.AddonStatus).ShouldNot(BeEmpty(), "Invalid argument. input.AddonStatus can't be empty")
4747

4848
ginkgo.By(fmt.Sprintf("Ensuring EKS addon %s has status in %q for EKS cluster %s", input.AddonName, input.AddonStatus, input.ControlPlane.Spec.EKSClusterName))
4949

5050
Eventually(func() (bool, error) {
51-
installedAddon, err := getEKSClusterAddon(ctx, input.ControlPlane.Spec.EKSClusterName, input.AddonName, input.AWSSessionV2)
51+
installedAddon, err := getEKSClusterAddon(ctx, input.ControlPlane.Spec.EKSClusterName, input.AddonName, input.AWSSession)
5252
if err != nil {
5353
return false, err
5454
}
@@ -71,23 +71,23 @@ func waitForEKSAddonToHaveStatus(ctx context.Context, input waitForEKSAddonToHav
7171

7272
type checkEKSAddonConfigurationInput struct {
7373
ControlPlane *ekscontrolplanev1.AWSManagedControlPlane
74-
AWSSessionV2 *aws.Config
74+
AWSSession *aws.Config
7575
AddonName string
7676
AddonVersion string
7777
AddonConfiguration string
7878
}
7979

8080
func checkEKSAddonConfiguration(ctx context.Context, input checkEKSAddonConfigurationInput, intervals ...interface{}) {
8181
Expect(input.ControlPlane).ToNot(BeNil(), "Invalid argument. input.ControlPlane can't be nil")
82-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
82+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
8383
Expect(input.AddonName).ShouldNot(BeEmpty(), "Invalid argument. input.AddonName can't be empty")
8484
Expect(input.AddonVersion).ShouldNot(BeEmpty(), "Invalid argument. input.AddonVersion can't be empty")
8585
Expect(input.AddonConfiguration).ShouldNot(BeEmpty(), "Invalid argument. input.AddonConfiguration can't be empty")
8686

8787
ginkgo.By(fmt.Sprintf("Ensuring EKS addon %s has config in %q for EKS cluster %s", input.AddonName, input.AddonConfiguration, input.ControlPlane.Spec.EKSClusterName))
8888

8989
Eventually(func() (bool, error) {
90-
installedAddon, err := getEKSClusterAddon(ctx, input.ControlPlane.Spec.EKSClusterName, input.AddonName, input.AWSSessionV2)
90+
installedAddon, err := getEKSClusterAddon(ctx, input.ControlPlane.Spec.EKSClusterName, input.AddonName, input.AWSSession)
9191
if err != nil {
9292
return false, err
9393
}

‎test/e2e/suites/managed/aws_node_env.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
type UpdateAwsNodeVersionSpecInput struct {
4040
E2EConfig *clusterctl.E2EConfig
4141
BootstrapClusterProxy framework.ClusterProxy
42-
AWSSessionV2 *aws.Config
42+
AWSSession *aws.Config
4343
Namespace *corev1.Namespace
4444
ClusterName string
4545
}
@@ -49,7 +49,7 @@ func CheckAwsNodeEnvVarsSet(ctx context.Context, inputGetter func() UpdateAwsNod
4949
input := inputGetter()
5050
Expect(input.E2EConfig).ToNot(BeNil(), "Invalid argument. input.E2EConfig can't be nil")
5151
Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil")
52-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
52+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
5353
Expect(input.Namespace).NotTo(BeNil(), "Invalid argument. input.Namespace can't be nil")
5454
Expect(input.ClusterName).ShouldNot(BeEmpty(), "Invalid argument. input.ClusterName can't be empty")
5555

‎test/e2e/suites/managed/control_plane.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
// UpgradeControlPlaneVersionSpecInput is the input type for UpgradeControlPlaneVersionSpec.
3939
type UpgradeControlPlaneVersionSpecInput struct {
4040
E2EConfig *clusterctl.E2EConfig
41-
AWSSessionV2 *aws.Config
41+
AWSSession *aws.Config
4242
BootstrapClusterProxy framework.ClusterProxy
4343
ClusterName string
4444
Namespace *corev1.Namespace
@@ -49,7 +49,7 @@ type UpgradeControlPlaneVersionSpecInput struct {
4949
func UpgradeControlPlaneVersionSpec(ctx context.Context, inputGetter func() UpgradeControlPlaneVersionSpecInput) {
5050
input := inputGetter()
5151
Expect(input.E2EConfig).ToNot(BeNil(), "Invalid argument. input.E2EConfig can't be nil")
52-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
52+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
5353
Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil")
5454
Expect(input.ClusterName).ToNot(BeNil(), "Invalid argument. input.ClusterName can't be nil")
5555
Expect(input.Namespace).ToNot(BeNil(), "Invalid argument. input.Namespace can't be nil")
@@ -72,7 +72,7 @@ func UpgradeControlPlaneVersionSpec(ctx context.Context, inputGetter func() Upgr
7272
ginkgo.By("Waiting for EKS control-plane to be upgraded to new version")
7373
waitForControlPlaneToBeUpgraded(ctx, waitForControlPlaneToBeUpgradedInput{
7474
ControlPlane: controlPlane,
75-
AWSSessionV2: input.AWSSessionV2,
75+
AWSSession: input.AWSSession,
7676
UpgradeVersion: input.UpgradeVersion,
7777
}, input.E2EConfig.GetIntervals("", "wait-control-plane-upgrade")...)
7878
}

‎test/e2e/suites/managed/control_plane_helpers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ import (
4040

4141
type waitForControlPlaneToBeUpgradedInput struct {
4242
ControlPlane *ekscontrolplanev1.AWSManagedControlPlane
43-
AWSSessionV2 *aws.Config
43+
AWSSession *aws.Config
4444
UpgradeVersion string
4545
}
4646

4747
func waitForControlPlaneToBeUpgraded(ctx context.Context, input waitForControlPlaneToBeUpgradedInput, intervals ...interface{}) {
4848
Expect(input.ControlPlane).ToNot(BeNil(), "Invalid argument. input.ControlPlane can't be nil")
49-
Expect(input.AWSSessionV2).ToNot(BeNil(), "Invalid argument. input.AWSSessionV2 can't be nil")
49+
Expect(input.AWSSession).ToNot(BeNil(), "Invalid argument. input.AWSSession can't be nil")
5050
Expect(input.UpgradeVersion).ToNot(BeNil(), "Invalid argument. input.UpgradeVersion can't be nil")
5151

5252
By(fmt.Sprintf("Ensuring EKS control-plane has been upgraded to kubernetes version %s", input.UpgradeVersion))
@@ -55,7 +55,7 @@ func waitForControlPlaneToBeUpgraded(ctx context.Context, input waitForControlPl
5555
expectedVersion := fmt.Sprintf("%d.%d", v.Major(), v.Minor())
5656

5757
Eventually(func() (bool, error) {
58-
cluster, err := getEKSCluster(ctx, input.ControlPlane.Spec.EKSClusterName, input.AWSSessionV2)
58+
cluster, err := getEKSCluster(ctx, input.ControlPlane.Spec.EKSClusterName, input.AWSSession)
5959
if err != nil {
6060
return false, err
6161
}

‎test/e2e/suites/managed/eks_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
7878
return UpdateAwsNodeVersionSpecInput{
7979
E2EConfig: e2eCtx.E2EConfig,
8080
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
81-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
81+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
8282
Namespace: namespace,
8383
ClusterName: clusterName,
8484
}
@@ -89,7 +89,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
8989
return CheckAddonExistsSpecInput{
9090
E2EConfig: e2eCtx.E2EConfig,
9191
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
92-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
92+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
9393
Namespace: namespace,
9494
ClusterName: clusterName,
9595
AddonName: cniAddonName,
@@ -103,7 +103,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
103103
E2EConfig: e2eCtx.E2EConfig,
104104
ConfigClusterFn: defaultConfigCluster,
105105
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
106-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
106+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
107107
Namespace: namespace,
108108
ClusterName: clusterName,
109109
Replicas: 1,
@@ -117,6 +117,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
117117
E2EConfig: e2eCtx.E2EConfig,
118118
ConfigClusterFn: defaultConfigCluster,
119119
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
120+
AWSSession: *e2eCtx.BootstrapUserAWSSessionV2,
120121
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
121122
Namespace: namespace,
122123
ClusterName: clusterName,
@@ -133,6 +134,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
133134
E2EConfig: e2eCtx.E2EConfig,
134135
ConfigClusterFn: defaultConfigCluster,
135136
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
137+
AWSSession: *e2eCtx.BootstrapUserAWSSessionV2,
136138
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
137139
Namespace: namespace,
138140
ClusterName: clusterName,
@@ -150,6 +152,7 @@ var _ = ginkgo.Describe("[managed] [general] EKS cluster tests", func() {
150152
E2EConfig: e2eCtx.E2EConfig,
151153
ConfigClusterFn: defaultConfigCluster,
152154
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
155+
AWSSession: *e2eCtx.BootstrapUserAWSSessionV2,
153156
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
154157
Namespace: namespace,
155158
ClusterName: clusterName,

‎test/e2e/suites/managed/gc_test.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
5555
clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
5656

5757
ginkgo.By("default iam role should exist")
58-
VerifyRoleExistsAndOwned(ctx, ekscontrolplanev1.DefaultEKSControlPlaneRole, clusterName, false, e2eCtx.AWSSessionV2)
58+
VerifyRoleExistsAndOwned(ctx, ekscontrolplanev1.DefaultEKSControlPlaneRole, clusterName, false, e2eCtx.BootstrapUserAWSSessionV2)
5959

6060
ginkgo.By("should create an EKS control plane")
6161
ManagedClusterSpec(ctx, func() ManagedClusterSpecInput {
6262
return ManagedClusterSpecInput{
6363
E2EConfig: e2eCtx.E2EConfig,
6464
ConfigClusterFn: defaultConfigCluster,
6565
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
66+
AWSSession: *e2eCtx.BootstrapUserAWSSessionV2,
6667
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
6768
Namespace: namespace,
6869
ClusterName: clusterName,
@@ -111,14 +112,14 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
111112

112113
ginkgo.By("Checking we have the load balancers in AWS")
113114
shared.WaitForLoadBalancerToExistForService(ctx, shared.WaitForLoadBalancerToExistForServiceInput{
114-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
115+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
115116
ServiceName: "podinfo-nlb",
116117
ServiceNamespace: "default",
117118
ClusterName: cp.Spec.EKSClusterName,
118119
Type: infrav1.LoadBalancerTypeNLB,
119120
}, e2eCtx.E2EConfig.GetIntervals("", "wait-loadbalancer-ready")...)
120121
shared.WaitForLoadBalancerToExistForService(ctx, shared.WaitForLoadBalancerToExistForServiceInput{
121-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
122+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
122123
ServiceName: "podinfo-elb",
123124
ServiceNamespace: "default",
124125
ClusterName: cp.Spec.EKSClusterName,
@@ -139,7 +140,7 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
139140

140141
ginkgo.By("Getting counts of service load balancers")
141142
arns, err := shared.GetLoadBalancerARNs(ctx, shared.GetLoadBalancerARNsInput{
142-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
143+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
143144
ServiceName: "podinfo-nlb",
144145
ServiceNamespace: "default",
145146
ClusterName: cp.Spec.EKSClusterName,
@@ -148,7 +149,7 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
148149
Expect(err).NotTo(HaveOccurred())
149150
Expect(arns).To(BeEmpty(), "there are %d service load balancers (nlb) still", len(arns))
150151
arns, err = shared.GetLoadBalancerARNs(ctx, shared.GetLoadBalancerARNsInput{
151-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
152+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
152153
ServiceName: "podinfo-elb",
153154
ServiceNamespace: "default",
154155
ClusterName: cp.Spec.EKSClusterName,
@@ -178,14 +179,15 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
178179
clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
179180

180181
ginkgo.By("default iam role should exist")
181-
VerifyRoleExistsAndOwned(ctx, ekscontrolplanev1.DefaultEKSControlPlaneRole, clusterName, false, e2eCtx.AWSSessionV2)
182+
VerifyRoleExistsAndOwned(ctx, ekscontrolplanev1.DefaultEKSControlPlaneRole, clusterName, false, e2eCtx.BootstrapUserAWSSessionV2)
182183

183184
ginkgo.By("should create an EKS control plane")
184185
ManagedClusterSpec(ctx, func() ManagedClusterSpecInput {
185186
return ManagedClusterSpecInput{
186187
E2EConfig: e2eCtx.E2EConfig,
187188
ConfigClusterFn: defaultConfigCluster,
188189
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
190+
AWSSession: *e2eCtx.BootstrapUserAWSSessionV2,
189191
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
190192
Namespace: namespace,
191193
ClusterName: clusterName,
@@ -234,14 +236,14 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
234236

235237
ginkgo.By("Checking we have the load balancers in AWS")
236238
shared.WaitForLoadBalancerToExistForService(ctx, shared.WaitForLoadBalancerToExistForServiceInput{
237-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
239+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
238240
ServiceName: "podinfo-nlb",
239241
ServiceNamespace: "default",
240242
ClusterName: cp.Spec.EKSClusterName,
241243
Type: infrav1.LoadBalancerTypeNLB,
242244
}, e2eCtx.E2EConfig.GetIntervals("", "wait-loadbalancer-ready")...)
243245
shared.WaitForLoadBalancerToExistForService(ctx, shared.WaitForLoadBalancerToExistForServiceInput{
244-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
246+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
245247
ServiceName: "podinfo-elb",
246248
ServiceNamespace: "default",
247249
ClusterName: cp.Spec.EKSClusterName,
@@ -262,7 +264,7 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
262264

263265
ginkgo.By("Getting counts of service load balancers")
264266
arns, err := shared.GetLoadBalancerARNs(ctx, shared.GetLoadBalancerARNsInput{
265-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
267+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
266268
ServiceName: "podinfo-nlb",
267269
ServiceNamespace: "default",
268270
ClusterName: cp.Spec.EKSClusterName,
@@ -271,7 +273,7 @@ var _ = ginkgo.Describe("[managed] [gc] EKS Cluster external resource GC tests",
271273
Expect(err).NotTo(HaveOccurred())
272274
Expect(arns).To(BeEmpty(), "there are %d service load balancers (nlb) still", len(arns))
273275
arns, err = shared.GetLoadBalancerARNs(ctx, shared.GetLoadBalancerARNsInput{
274-
AWSSessionV2: e2eCtx.BootstrapUserAWSSessionV2,
276+
AWSSession: e2eCtx.BootstrapUserAWSSessionV2,
275277
ServiceName: "podinfo-elb",
276278
ServiceNamespace: "default",
277279
ClusterName: cp.Spec.EKSClusterName,

0 commit comments

Comments
 (0)