Skip to content

Commit 0188c60

Browse files
LiangquanLi930LiangquanLi930
committed
fix lint error
1 parent 7c0075a commit 0188c60

File tree

15 files changed

+500
-229
lines changed

15 files changed

+500
-229
lines changed

‎pkg/cloud/scope/clients.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ import (
3030
"github.com/aws/aws-sdk-go-v2/service/sqs"
3131
"github.com/aws/aws-sdk-go-v2/service/ssm"
3232
stsv2 "github.com/aws/aws-sdk-go-v2/service/sts"
33-
"github.com/aws/aws-sdk-go/aws/awserr"
34-
"github.com/aws/aws-sdk-go/aws/request"
3533
"k8s.io/apimachinery/pkg/runtime"
3634

3735
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud"
@@ -41,8 +39,6 @@ import (
4139
stsservice "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/sts"
4240
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/throttle"
4341
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
44-
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
45-
"sigs.k8s.io/cluster-api-provider-aws/v2/version"
4642
)
4743

4844
// NewASGClient creates a new ASG API client for a given session.
@@ -336,24 +332,6 @@ func NewS3Client(scopeUser cloud.ScopeUsage, session cloud.Session, logger logge
336332
return s3.NewFromConfig(cfg, s3Opts...)
337333
}
338334

339-
func recordAWSPermissionsIssue(target runtime.Object) func(r *request.Request) {
340-
return func(r *request.Request) {
341-
if awsErr, ok := r.Error.(awserr.Error); ok {
342-
switch awsErr.Code() {
343-
case "AuthFailure", "UnauthorizedOperation", "NoCredentialProviders":
344-
record.Warnf(target, awsErr.Code(), "Operation %s failed with a credentials or permission issue", r.Operation.Name)
345-
}
346-
}
347-
}
348-
}
349-
350-
func getUserAgentHandler() request.NamedHandler {
351-
return request.NamedHandler{
352-
Name: "capa/user-agent",
353-
Fn: request.MakeAddToUserAgentHandler("aws.cluster.x-k8s.io", version.Get().String()),
354-
}
355-
}
356-
357335
// AWSClients contains all the aws clients used by the scopes.
358336
type AWSClients struct {
359337
ELB *elb.Client

‎pkg/cloud/scope/cluster.go

Lines changed: 1 addition & 1 deletion
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-
_, 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
}

‎pkg/cloud/scope/fargate.go

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

73-
_, 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
}

‎pkg/cloud/scope/managedcontrolplane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func NewManagedControlPlaneScope(params ManagedControlPlaneScopeParams) (*Manage
9898
enableIAM: params.EnableIAM,
9999
tagUnmanagedNetworkResources: params.TagUnmanagedNetworkResources,
100100
}
101-
_, 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)
102102
if err != nil {
103103
return nil, errors.Errorf("failed to create aws session: %v", err)
104104
}

‎pkg/cloud/scope/rosacontrolplane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func NewROSAControlPlaneScope(params ROSAControlPlaneScopeParams) (*ROSAControlP
7272
controllerName: params.ControllerName,
7373
}
7474

75-
_, 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)
7676
if err != nil {
7777
return nil, errors.Errorf("failed to create aws session: %v", err)
7878
}

‎pkg/cloud/scope/rosamachinepool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func NewRosaMachinePoolScope(params RosaMachinePoolScopeParams) (*RosaMachinePoo
8888
controllerName: params.ControllerName,
8989
}
9090

91-
_, 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)
9292
if err != nil {
9393
return nil, errors.Errorf("failed to create aws session: %v", err)
9494
}

‎pkg/cloud/scope/session.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func sessionForRegionV2(region string) (*awsv2.Config, throttle.ServiceLimiters,
137137
return &ns, sl, nil
138138
}
139139

140-
func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.SessionMetadata, region string, endpoint []ServiceEndpoint, log logger.Wrapper) (*session.Session, throttle.ServiceLimiters, error) {
140+
func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.SessionMetadata, region string, endpoint []ServiceEndpoint, log logger.Wrapper) (throttle.ServiceLimiters, error) {
141141
log = log.WithName("identity")
142142
log.Trace("Creating an AWS Session")
143143

@@ -157,7 +157,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
157157
if err != nil {
158158
// could not get providers and retrieve the credentials
159159
conditions.MarkFalse(clusterScoper.InfraCluster(), infrav1.PrincipalCredentialRetrievedCondition, infrav1.PrincipalCredentialRetrievalFailedReason, clusterv1.ConditionSeverityError, "%s", err.Error())
160-
return nil, nil, errors.Wrap(err, "Failed to get providers for cluster")
160+
return nil, errors.Wrap(err, "Failed to get providers for cluster")
161161
}
162162

163163
isChanged := false
@@ -166,7 +166,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
166166
// load an existing matching providers from the cache if such a providers exists
167167
providerHash, err := provider.Hash()
168168
if err != nil {
169-
return nil, nil, errors.Wrap(err, "Failed to calculate provider hash")
169+
return nil, errors.Wrap(err, "Failed to calculate provider hash")
170170
}
171171
cachedProvider, ok := providerCache.Load(providerHash)
172172
if ok {
@@ -182,7 +182,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
182182
if !isChanged {
183183
if s, ok := sessionCache.Load(getSessionName(region, clusterScoper)); ok {
184184
entry := s.(*sessionCacheEntry)
185-
return entry.session, entry.serviceLimiters, nil
185+
return entry.serviceLimiters, nil
186186
}
187187
}
188188
awsConfig := &aws.Config{
@@ -199,7 +199,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
199199
// delete the existing session from cache. Otherwise, we give back a defective session on next method invocation with same cluster scope
200200
sessionCache.Delete(getSessionName(region, clusterScoper))
201201

202-
return nil, nil, errors.Wrap(err, "Failed to retrieve identity credentials")
202+
return nil, errors.Wrap(err, "Failed to retrieve identity credentials")
203203
}
204204
awsConfig = awsConfig.WithCredentials(credentials.NewChainCredentials(awsProviders))
205205
}
@@ -208,7 +208,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
208208

209209
ns, err := session.NewSession(awsConfig)
210210
if err != nil {
211-
return nil, nil, errors.Wrap(err, "Failed to create a new AWS session")
211+
return nil, errors.Wrap(err, "Failed to create a new AWS session")
212212
}
213213
sl := newServiceLimiters()
214214
sessionCache.Store(getSessionName(region, clusterScoper), &sessionCacheEntry{
@@ -217,7 +217,7 @@ func sessionForClusterWithRegion(k8sClient client.Client, clusterScoper cloud.Se
217217
sessionV2: nil,
218218
})
219219

220-
return ns, sl, nil
220+
return sl, nil
221221
}
222222

223223
func sessionForClusterWithRegionV2(k8sClient client.Client, clusterScoper cloud.SessionMetadata, region string, _ []ServiceEndpoint, log logger.Wrapper) (*awsv2.Config, throttle.ServiceLimiters, error) {

‎pkg/cloud/services/mock_services/gomock_reflect_2588283099/prog.go

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎pkg/cloud/services/s3/mock_stsiface/doc.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎pkg/cloud/services/secretsmanager/secret_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424

2525
"github.com/aws/aws-sdk-go-v2/aws"
2626
"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
27+
"github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
2728
"github.com/golang/mock/gomock"
2829
. "github.com/onsi/gomega"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3031
"k8s.io/apimachinery/pkg/runtime"
3132
"sigs.k8s.io/controller-runtime/pkg/client"
3233
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3334

34-
"github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
3535
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
3636
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
3737
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/secretsmanager/mock_secretsmanageriface"

0 commit comments

Comments
 (0)