Skip to content

Commit 28d62fb

Browse files
LiangquanLi930LiangquanLi930
committed
remove Session() awsclient.ConfigProvider
1 parent 1b83b14 commit 28d62fb

File tree

11 files changed

+216
-97
lines changed

11 files changed

+216
-97
lines changed

‎pkg/cloud/interfaces.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"time"
2222

2323
awsv2 "github.com/aws/aws-sdk-go-v2/aws"
24-
awsclient "github.com/aws/aws-sdk-go/aws/client"
2524
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2625
"sigs.k8s.io/controller-runtime/pkg/client"
2726

@@ -34,8 +33,7 @@ import (
3433

3534
// Session represents an AWS session.
3635
type Session interface {
37-
Session() awsclient.ConfigProvider
38-
SessionV2() awsv2.Config
36+
Session() awsv2.Config
3937
ServiceLimiter(service string) *throttle.ServiceLimiter
4038
}
4139

‎pkg/cloud/scope/cluster.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
7777
maxWaitActiveUpdateDelete: params.MaxWaitActiveUpdateDelete,
7878
}
7979

80-
session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, clusterScope, params.AWSCluster.Spec.Region, params.Endpoints, params.Logger)
80+
_, serviceLimiters, err := sessionForClusterWithRegion(params.Client, clusterScope, params.AWSCluster.Spec.Region, params.Endpoints, params.Logger)
8181
if err != nil {
8282
return nil, errors.Errorf("failed to create aws session: %v", err)
8383
}
@@ -93,8 +93,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
9393
}
9494

9595
clusterScope.patchHelper = helper
96-
clusterScope.session = session
97-
clusterScope.sessionV2 = *sessionv2
96+
clusterScope.session = *sessionv2
9897
clusterScope.serviceLimiters = serviceLimiters
9998
clusterScope.serviceLimitersV2 = serviceLimitersv2
10099

@@ -110,8 +109,7 @@ type ClusterScope struct {
110109
Cluster *clusterv1.Cluster
111110
AWSCluster *infrav1.AWSCluster
112111

113-
session awsclient.ConfigProvider
114-
sessionV2 awsv2.Config
112+
session awsv2.Config
115113
serviceLimiters throttle.ServiceLimiters
116114
serviceLimitersV2 throttle.ServiceLimiters
117115
controllerName string
@@ -361,16 +359,11 @@ func (s *ClusterScope) ClusterObj() cloud.ClusterObject {
361359
return s.Cluster
362360
}
363361

364-
// Session returns the AWS SDK session. Used for creating clients.
365-
func (s *ClusterScope) Session() awsclient.ConfigProvider {
362+
// Session returns the AWS SDK V2 session. Used for creating clients.
363+
func (s *ClusterScope) Session() awsv2.Config {
366364
return s.session
367365
}
368366

369-
// SessionV2 returns the AWS SDK V2 session. Used for creating clients.
370-
func (s *ClusterScope) SessionV2() awsv2.Config {
371-
return s.sessionV2
372-
}
373-
374367
// ServiceLimiter returns the AWS SDK session. Used for creating clients.
375368
func (s *ClusterScope) ServiceLimiter(service string) *throttle.ServiceLimiter {
376369
if sl, ok := s.serviceLimiters[service]; ok {

‎pkg/cloud/scope/fargate.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewFargateProfileScope(params FargateProfileScopeParams) (*FargateProfileSc
7070
controllerName: params.ControllerName,
7171
}
7272

73-
session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
73+
_, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
7474
if err != nil {
7575
return nil, errors.Errorf("failed to create aws session: %v", err)
7676
}
@@ -92,8 +92,7 @@ func NewFargateProfileScope(params FargateProfileScopeParams) (*FargateProfileSc
9292
ControlPlane: params.ControlPlane,
9393
FargateProfile: params.FargateProfile,
9494
patchHelper: helper,
95-
session: session,
96-
sessionV2: *sessionv2,
95+
session: *sessionv2,
9796
serviceLimiters: serviceLimiters,
9897
serviceLimitersV2: serviceLimitersv2,
9998
controllerName: params.ControllerName,
@@ -111,8 +110,7 @@ type FargateProfileScope struct {
111110
ControlPlane *ekscontrolplanev1.AWSManagedControlPlane
112111
FargateProfile *expinfrav1.AWSFargateProfile
113112

114-
session awsclient.ConfigProvider
115-
sessionV2 awsv2.Config
113+
session awsv2.Config
116114
serviceLimiters throttle.ServiceLimiters
117115
serviceLimitersV2 throttle.ServiceLimiters
118116
controllerName string
@@ -225,16 +223,11 @@ func (s *FargateProfileScope) ClusterObj() cloud.ClusterObject {
225223
return s.Cluster
226224
}
227225

228-
// Session returns the AWS SDK session. Used for creating clients.
229-
func (s *FargateProfileScope) Session() awsclient.ConfigProvider {
226+
// Session returns the AWS SDK V2 session. Used for creating clients.
227+
func (s *FargateProfileScope) Session() awsv2.Config {
230228
return s.session
231229
}
232230

233-
// SessionV2 returns the AWS SDK session. Used for creating clients.
234-
func (s *FargateProfileScope) SessionV2() awsv2.Config {
235-
return s.sessionV2
236-
}
237-
238231
// ControllerName returns the name of the controller that
239232
// created the FargateProfile.
240233
func (s *FargateProfileScope) ControllerName() string {

‎pkg/cloud/scope/global.go‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package scope
1919

2020
import (
2121
awsv2 "github.com/aws/aws-sdk-go-v2/aws"
22-
awsclient "github.com/aws/aws-sdk-go/aws/client"
2322
"github.com/pkg/errors"
2423

2524
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/throttle"
@@ -33,7 +32,7 @@ func NewGlobalScope(params GlobalScopeParams) (*GlobalScope, error) {
3332
if params.ControllerName == "" {
3433
return nil, errors.New("controller name required to generate global scope")
3534
}
36-
ns, limiters, err := sessionForRegion(params.Region, params.Endpoints)
35+
_, limiters, err := sessionForRegion(params.Region, params.Endpoints)
3736
if err != nil {
3837
return nil, errors.Wrap(err, "failed to create aws session")
3938
}
@@ -43,8 +42,7 @@ func NewGlobalScope(params GlobalScopeParams) (*GlobalScope, error) {
4342
return nil, errors.Wrap(err, "failed to create aws V2 session")
4443
}
4544
return &GlobalScope{
46-
session: ns,
47-
sessionV2: *ns2,
45+
session: *ns2,
4846
serviceLimiters: limiters,
4947
controllerName: params.ControllerName,
5048
}, nil
@@ -59,22 +57,16 @@ type GlobalScopeParams struct {
5957

6058
// GlobalScope defines the specs for the GlobalScope.
6159
type GlobalScope struct {
62-
session awsclient.ConfigProvider
63-
sessionV2 awsv2.Config
60+
session awsv2.Config
6461
serviceLimiters throttle.ServiceLimiters
6562
controllerName string
6663
}
6764

68-
// Session returns the AWS SDK session. Used for creating clients.
69-
func (s *GlobalScope) Session() awsclient.ConfigProvider {
65+
// Session returns the AWS SDK V2 config. Used for creating clients.
66+
func (s *GlobalScope) Session() awsv2.Config {
7067
return s.session
7168
}
7269

73-
// SessionV2 returns the AWS SDK V2 config. Used for creating clients.
74-
func (s *GlobalScope) SessionV2() awsv2.Config {
75-
return s.sessionV2
76-
}
77-
7870
// ServiceLimiter returns the AWS SDK session. Used for creating clients.
7971
func (s *GlobalScope) ServiceLimiter(service string) *throttle.ServiceLimiter {
8072
if sl, ok := s.serviceLimiters[service]; ok {

‎pkg/cloud/scope/managedcontrolplane.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,13 @@ func NewManagedControlPlaneScope(params ManagedControlPlaneScopeParams) (*Manage
9292
ControlPlane: params.ControlPlane,
9393
MaxWaitActiveUpdateDelete: params.MaxWaitActiveUpdateDelete,
9494
patchHelper: nil,
95-
session: nil,
9695
serviceLimiters: nil,
9796
controllerName: params.ControllerName,
9897
allowAdditionalRoles: params.AllowAdditionalRoles,
9998
enableIAM: params.EnableIAM,
10099
tagUnmanagedNetworkResources: params.TagUnmanagedNetworkResources,
101100
}
102-
session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
101+
_, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
103102
if err != nil {
104103
return nil, errors.Errorf("failed to create aws session: %v", err)
105104
}
@@ -109,8 +108,7 @@ func NewManagedControlPlaneScope(params ManagedControlPlaneScopeParams) (*Manage
109108
return nil, errors.Errorf("failed to create aws V2 session: %v", err)
110109
}
111110

112-
managedScope.session = session
113-
managedScope.sessionV2 = *sessionv2
111+
managedScope.session = *sessionv2
114112
managedScope.serviceLimiters = serviceLimiters
115113
managedScope.serviceLimitersV2 = serviceLimitersv2
116114

@@ -133,8 +131,7 @@ type ManagedControlPlaneScope struct {
133131
ControlPlane *ekscontrolplanev1.AWSManagedControlPlane
134132
MaxWaitActiveUpdateDelete time.Duration
135133

136-
session awsclient.ConfigProvider
137-
sessionV2 awsv2.Config
134+
session awsv2.Config
138135
serviceLimiters throttle.ServiceLimiters
139136
serviceLimitersV2 throttle.ServiceLimiters
140137
controllerName string
@@ -334,14 +331,14 @@ func (s *ManagedControlPlaneScope) ClusterObj() cloud.ClusterObject {
334331
return s.Cluster
335332
}
336333

337-
// Session returns the AWS SDK session. Used for creating clients.
338-
func (s *ManagedControlPlaneScope) Session() awsclient.ConfigProvider {
334+
// Session returns the AWS SDK V2 config. Used for creating clients.
335+
func (s *ManagedControlPlaneScope) Session() awsv2.Config {
339336
return s.session
340337
}
341338

342-
// SessionV2 returns the AWS SDK config. Used for creating clients.
339+
// SessionV2 returns the AWS SDK V2 config. Used for creating clients.
343340
func (s *ManagedControlPlaneScope) SessionV2() awsv2.Config {
344-
return s.sessionV2
341+
return s.session
345342
}
346343

347344
// Bastion returns the bastion details.

‎pkg/cloud/scope/managednodegroup.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ func (s *ManagedMachinePoolScope) ClusterObj() cloud.ClusterObject {
302302
return s.Cluster
303303
}
304304

305-
// Session returns the AWS SDK V2 config. Used for creating clients.
306-
func (s *ManagedMachinePoolScope) Session() awsv2.Config {
305+
// SessionV2 returns the AWS SDK V2 config. Used for creating clients.
306+
func (s *ManagedMachinePoolScope) SessionV2() awsv2.Config {
307307
return s.session
308308
}
309309

‎pkg/cloud/scope/rosacontrolplane.go‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"fmt"
2222

2323
awsv2 "github.com/aws/aws-sdk-go-v2/aws"
24-
awsclient "github.com/aws/aws-sdk-go/aws/client"
2524
"github.com/aws/aws-sdk-go/service/sts"
2625
"github.com/aws/aws-sdk-go/service/sts/stsiface"
2726
"github.com/pkg/errors"
@@ -73,7 +72,7 @@ func NewROSAControlPlaneScope(params ROSAControlPlaneScopeParams) (*ROSAControlP
7372
controllerName: params.ControllerName,
7473
}
7574

76-
session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
75+
_, serviceLimiters, err := sessionForClusterWithRegion(params.Client, managedScope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
7776
if err != nil {
7877
return nil, errors.Errorf("failed to create aws session: %v", err)
7978
}
@@ -89,8 +88,7 @@ func NewROSAControlPlaneScope(params ROSAControlPlaneScopeParams) (*ROSAControlP
8988
}
9089

9190
managedScope.patchHelper = helper
92-
managedScope.session = session
93-
managedScope.sessionV2 = *sessionv2
91+
managedScope.session = *sessionv2
9492
managedScope.serviceLimiters = serviceLimiters
9593
managedScope.serviceLimitersV2 = serviceLimitersv2
9694

@@ -113,8 +111,7 @@ type ROSAControlPlaneScope struct {
113111
Cluster *clusterv1.Cluster
114112
ControlPlane *rosacontrolplanev1.ROSAControlPlane
115113

116-
session awsclient.ConfigProvider
117-
sessionV2 awsv2.Config
114+
session awsv2.Config
118115
serviceLimiters throttle.ServiceLimiters
119116
serviceLimitersV2 throttle.ServiceLimiters
120117
controllerName string
@@ -131,16 +128,11 @@ func (s *ROSAControlPlaneScope) IdentityRef() *infrav1.AWSIdentityReference {
131128
return s.ControlPlane.Spec.IdentityRef
132129
}
133130

134-
// Session returns the AWS SDK session. Used for creating clients.
135-
func (s *ROSAControlPlaneScope) Session() awsclient.ConfigProvider {
131+
// Session returns the AWS SDK V2 session. Used for creating clients.
132+
func (s *ROSAControlPlaneScope) Session() awsv2.Config {
136133
return s.session
137134
}
138135

139-
// SessionV2 returns the AWS SDK V2 Config. Used for creating clients.
140-
func (s *ROSAControlPlaneScope) SessionV2() awsv2.Config {
141-
return s.sessionV2
142-
}
143-
144136
// ServiceLimiter returns the AWS SDK session. Used for creating clients.
145137
func (s *ROSAControlPlaneScope) ServiceLimiter(service string) *throttle.ServiceLimiter {
146138
if sl, ok := s.serviceLimiters[service]; ok {

‎pkg/cloud/scope/rosamachinepool.go‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121

2222
awsv2 "github.com/aws/aws-sdk-go-v2/aws"
23-
awsclient "github.com/aws/aws-sdk-go/aws/client"
2423
"github.com/pkg/errors"
2524
"k8s.io/klog/v2"
2625
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -89,7 +88,7 @@ func NewRosaMachinePoolScope(params RosaMachinePoolScopeParams) (*RosaMachinePoo
8988
controllerName: params.ControllerName,
9089
}
9190

92-
session, serviceLimiters, err := sessionForClusterWithRegion(params.Client, scope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
91+
_, serviceLimiters, err := sessionForClusterWithRegion(params.Client, scope, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
9392
if err != nil {
9493
return nil, errors.Errorf("failed to create aws session: %v", err)
9594
}
@@ -99,15 +98,13 @@ func NewRosaMachinePoolScope(params RosaMachinePoolScopeParams) (*RosaMachinePoo
9998
return nil, errors.Errorf("failed to create aws V2 session: %v", err)
10099
}
101100

102-
scope.session = session
103-
scope.sessionV2 = *sessionv2
101+
scope.session = *sessionv2
104102
scope.serviceLimiters = serviceLimiters
105103
scope.serviceLimitersV2 = serviceLimitersv2
106104

107105
return scope, nil
108106
}
109107

110-
var _ cloud.Session = &RosaMachinePoolScope{}
111108
var _ cloud.SessionMetadata = &RosaMachinePoolScope{}
112109

113110
// RosaMachinePoolScope defines the basic context for an actuator to operate upon.
@@ -122,8 +119,7 @@ type RosaMachinePoolScope struct {
122119
RosaMachinePool *expinfrav1.ROSAMachinePool
123120
MachinePool *expclusterv1.MachinePool
124121

125-
session awsclient.ConfigProvider
126-
sessionV2 awsv2.Config
122+
session awsv2.Config
127123
serviceLimiters throttle.ServiceLimiters
128124
serviceLimitersV2 throttle.ServiceLimiters
129125

@@ -179,16 +175,11 @@ func (s *RosaMachinePoolScope) ServiceLimiter(service string) *throttle.ServiceL
179175
return nil
180176
}
181177

182-
// Session implements cloud.Session.
183-
func (s *RosaMachinePoolScope) Session() awsclient.ConfigProvider {
178+
// Session implements cloud.Session for AWS SDK V2.
179+
func (s *RosaMachinePoolScope) Session() awsv2.Config {
184180
return s.session
185181
}
186182

187-
// SessionV2 implements cloud.Session for AWS SDK V2.
188-
func (s *RosaMachinePoolScope) SessionV2() awsv2.Config {
189-
return s.sessionV2
190-
}
191-
192183
// IdentityRef implements cloud.SessionMetadata.
193184
func (s *RosaMachinePoolScope) IdentityRef() *v1beta2.AWSIdentityReference {
194185
return s.ControlPlane.Spec.IdentityRef

0 commit comments

Comments
 (0)