Skip to content

Commit 4b07844

Browse files
miyadavmiyadav
committed
creating ssmiface interface , changes on errors , secret_test
Changes made to ec2 package tests as well , that were depending on ssm
1 parent d2a68a1 commit 4b07844

File tree

16 files changed

+350
-8760
lines changed

16 files changed

+350
-8760
lines changed

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
github.com/aws/aws-sdk-go-v2/service/eks v1.64.0
1919
github.com/aws/aws-sdk-go-v2/service/iam v1.32.0
2020
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
21+
github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1
2122
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6
2223
github.com/aws/smithy-go v1.22.2
2324
github.com/awslabs/goformation/v4 v4.19.5

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 h1:TIOEjw0i2yyhmhRry
8888
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g=
8989
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.4 h1:SSDkZRAO8Ok5SoQ4BJ0onDeb0ga8JBOCkUmNEpRChcw=
9090
github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.4/go.mod h1:plXue/Zg49kU3uU6WwfCWgRR5SRINNiJf03Y/UhYOhU=
91+
github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1 h1:Z4cmgV3hKuUIkhJsdn47hf/ABYHUtILfMrV+L8+kRwE=
92+
github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
9193
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w=
9294
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
9395
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE=

‎pkg/cloud/scope/clients.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ import (
3939
"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
4040
"github.com/aws/aws-sdk-go/service/sqs"
4141
"github.com/aws/aws-sdk-go/service/sqs/sqsiface"
42-
"github.com/aws/aws-sdk-go/service/ssm"
43-
"github.com/aws/aws-sdk-go/service/ssm/ssmiface"
4442
"github.com/aws/aws-sdk-go/service/sts"
4543
"github.com/aws/aws-sdk-go/service/sts/stsiface"
4644
"k8s.io/apimachinery/pkg/runtime"
@@ -204,15 +202,7 @@ func NewSTSClient(scopeUser cloud.ScopeUsage, session cloud.Session, logger logg
204202
return stsClient
205203
}
206204

207-
// NewSSMClient creates a new Secrets API client for a given session.
208-
func NewSSMClient(scopeUser cloud.ScopeUsage, session cloud.Session, logger logger.Wrapper, target runtime.Object) ssmiface.SSMAPI {
209-
ssmClient := ssm.New(session.Session(), aws.NewConfig().WithLogLevel(awslogs.GetAWSLogLevel(logger.GetLogger())).WithLogger(awslogs.NewWrapLogr(logger.GetLogger())))
210-
ssmClient.Handlers.Build.PushFrontNamed(getUserAgentHandler())
211-
ssmClient.Handlers.CompleteAttempt.PushFront(awsmetrics.CaptureRequestMetrics(scopeUser.ControllerName()))
212-
ssmClient.Handlers.Complete.PushBack(recordAWSPermissionsIssue(target))
213-
214-
return ssmClient
215-
}
205+
// NewSSMClient creates a new Secrets API client for a given session , the is now at ssm/ssmiface this was done due to sdk change
216206

217207
// NewS3Client creates a new S3 API client for a given session.
218208
func NewS3Client(scopeUser cloud.ScopeUsage, session cloud.Session, logger logger.Wrapper, target runtime.Object) *s3.Client {

‎pkg/cloud/services/ec2/ami.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ import (
2525
"text/template"
2626
"time"
2727

28-
"github.com/aws/aws-sdk-go/aws"
28+
"github.com/aws/aws-sdk-go-v2/aws"
29+
ssmv2 "github.com/aws/aws-sdk-go-v2/service/ssm"
2930
"github.com/aws/aws-sdk-go/service/ec2"
3031
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
31-
"github.com/aws/aws-sdk-go/service/ssm"
32+
3233
"github.com/blang/semver"
3334
"github.com/pkg/errors"
3435

@@ -224,8 +225,8 @@ func (s *Service) defaultAMIIDLookup(amiNameFormat, ownerID, baseOS, architectur
224225
return "", errors.Wrapf(err, "failed to find ami")
225226
}
226227

227-
s.scope.Debug("Found and using an existing AMI", "ami-id", aws.StringValue(latestImage.ImageId))
228-
return aws.StringValue(latestImage.ImageId), nil
228+
s.scope.Debug("Found and using an existing AMI", "ami-id", latestImage.ImageId)
229+
return aws.ToString(latestImage.ImageId), nil
229230
}
230231

231232
type images []*ec2.Image
@@ -239,8 +240,8 @@ func (i images) Len() int {
239240
// index i should sort before the element with index j.
240241
// At this point all CreationDates have been checked for errors so ignoring the error is ok.
241242
func (i images) Less(k, j int) bool {
242-
firstTime, _ := time.Parse(createDateTimestampFormat, aws.StringValue(i[k].CreationDate))
243-
secondTime, _ := time.Parse(createDateTimestampFormat, aws.StringValue(i[j].CreationDate))
243+
firstTime, _ := time.Parse(createDateTimestampFormat, aws.ToString(i[k].CreationDate))
244+
secondTime, _ := time.Parse(createDateTimestampFormat, aws.ToString(i[j].CreationDate))
244245
return firstTime.Before(secondTime)
245246
}
246247

@@ -252,7 +253,7 @@ func (i images) Swap(k, j int) {
252253
// GetLatestImage assumes imgs is not empty. Responsibility of the caller to check.
253254
func GetLatestImage(imgs []*ec2.Image) (*ec2.Image, error) {
254255
for _, img := range imgs {
255-
if _, err := time.Parse(createDateTimestampFormat, aws.StringValue(img.CreationDate)); err != nil {
256+
if _, err := time.Parse(createDateTimestampFormat, aws.ToString(img.CreationDate)); err != nil {
256257
return nil, err
257258
}
258259
}
@@ -336,11 +337,11 @@ func (s *Service) eksAMILookup(kubernetesVersion string, architecture string, am
336337
}
337338
}
338339

339-
input := &ssm.GetParameterInput{
340+
input := &ssmv2.GetParameterInput{
340341
Name: aws.String(paramName),
341342
}
342343

343-
out, err := s.SSMClient.GetParameter(input)
344+
out, err := s.SSMClient.GetParameter(context.TODO(), input)
344345
if err != nil {
345346
record.Eventf(s.scope.InfraCluster(), "FailedGetParameter", "Failed to get ami SSM parameter %q: %v", paramName, err)
346347

@@ -351,7 +352,7 @@ func (s *Service) eksAMILookup(kubernetesVersion string, architecture string, am
351352
return "", errors.Errorf("SSM parameter returned with nil value: %q", paramName)
352353
}
353354

354-
id := aws.StringValue(out.Parameter.Value)
355+
id := aws.ToString(out.Parameter.Value)
355356
s.scope.Info("found AMI", "id", id, "version", formattedVersion)
356357

357358
return id, nil

‎pkg/cloud/services/ec2/ami_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"context"
2121
"testing"
2222

23+
ssmv2 "github.com/aws/aws-sdk-go-v2/service/ssm"
24+
ssmv2type "github.com/aws/aws-sdk-go-v2/service/ssm/types"
2325
"github.com/aws/aws-sdk-go/aws"
2426
"github.com/aws/aws-sdk-go/service/ec2"
25-
"github.com/aws/aws-sdk-go/service/ssm"
2627
"github.com/golang/mock/gomock"
2728
. "github.com/onsi/gomega"
2829
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -495,10 +496,10 @@ func TestEKSAMILookUp(t *testing.T) {
495496
arch: "x86_64",
496497
amiType: &gpuAMI,
497498
expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
498-
m.GetParameter(gomock.Eq(&ssm.GetParameterInput{
499+
m.GetParameter(context.TODO(), gomock.Eq(&ssmv2.GetParameterInput{
499500
Name: aws.String("/aws/service/eks/optimized-ami/1.23/amazon-linux-2-gpu/recommended/image_id"),
500-
})).Return(&ssm.GetParameterOutput{
501-
Parameter: &ssm.Parameter{
501+
})).Return(&ssmv2.GetParameterOutput{
502+
Parameter: &ssmv2type.Parameter{
502503
Value: aws.String("id"),
503504
},
504505
}, nil)
@@ -511,10 +512,10 @@ func TestEKSAMILookUp(t *testing.T) {
511512
k8sVersion: "v1.23.3",
512513
arch: "x86_64",
513514
expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
514-
m.GetParameter(gomock.Eq(&ssm.GetParameterInput{
515+
m.GetParameter(context.TODO(), gomock.Eq(&ssmv2.GetParameterInput{
515516
Name: aws.String("/aws/service/eks/optimized-ami/1.23/amazon-linux-2/recommended/image_id"),
516-
})).Return(&ssm.GetParameterOutput{
517-
Parameter: &ssm.Parameter{
517+
})).Return(&ssmv2.GetParameterOutput{
518+
Parameter: &ssmv2type.Parameter{
518519
Value: aws.String("id"),
519520
},
520521
}, nil)
@@ -527,7 +528,7 @@ func TestEKSAMILookUp(t *testing.T) {
527528
k8sVersion: "v1.23.3",
528529
arch: "x86_64",
529530
expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
530-
m.GetParameter(gomock.Eq(&ssm.GetParameterInput{
531+
m.GetParameter(context.TODO(), gomock.Eq(&ssmv2.GetParameterInput{
531532
Name: aws.String("/aws/service/eks/optimized-ami/1.23/amazon-linux-2/recommended/image_id"),
532533
})).Return(nil, awserrors.NewFailedDependency("dependency failure"))
533534
},
@@ -544,9 +545,9 @@ func TestEKSAMILookUp(t *testing.T) {
544545
k8sVersion: "v1.23.3",
545546
arch: "x86_64",
546547
expect: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
547-
m.GetParameter(gomock.Eq(&ssm.GetParameterInput{
548+
m.GetParameter(context.TODO(), gomock.Eq(&ssmv2.GetParameterInput{
548549
Name: aws.String("/aws/service/eks/optimized-ami/1.23/amazon-linux-2/recommended/image_id"),
549-
})).Return(&ssm.GetParameterOutput{}, nil)
550+
})).Return(&ssmv2.GetParameterOutput{}, nil)
550551
},
551552
wantErr: true,
552553
},

‎pkg/cloud/services/ec2/launchtemplate_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ import (
2121
"encoding/base64"
2222
"testing"
2323

24+
ssmv2 "github.com/aws/aws-sdk-go-v2/service/ssm"
25+
ssmv2type "github.com/aws/aws-sdk-go-v2/service/ssm/types"
2426
"github.com/aws/aws-sdk-go/aws"
2527
"github.com/aws/aws-sdk-go/aws/awserr"
2628
"github.com/aws/aws-sdk-go/aws/request"
2729
"github.com/aws/aws-sdk-go/service/ec2"
28-
"github.com/aws/aws-sdk-go/service/ssm"
2930
"github.com/golang/mock/gomock"
3031
"github.com/google/go-cmp/cmp"
3132
. "github.com/onsi/gomega"
3233
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3334
"k8s.io/apimachinery/pkg/types"
35+
3436
"k8s.io/utils/ptr"
3537
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3638

@@ -1937,9 +1939,9 @@ func TestDiscoverLaunchTemplateAMIForEKS(t *testing.T) {
19371939
}, nil)
19381940
},
19391941
expectSSM: func(m *mock_ssmiface.MockSSMAPIMockRecorder) {
1940-
m.GetParameter(gomock.AssignableToTypeOf(&ssm.GetParameterInput{})).
1941-
Return(&ssm.GetParameterOutput{
1942-
Parameter: &ssm.Parameter{
1942+
m.GetParameter(context.TODO(), gomock.AssignableToTypeOf(&ssmv2.GetParameterInput{})).
1943+
Return(&ssmv2.GetParameterOutput{
1944+
Parameter: &ssmv2type.Parameter{
19431945
Value: aws.String("latest"),
19441946
},
19451947
}, nil)

‎pkg/cloud/services/ec2/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package ec2
1919

2020
import (
2121
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
22-
"github.com/aws/aws-sdk-go/service/ssm/ssmiface"
22+
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/ssm/ssmiface"
2323

2424
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
2525
"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/network"
@@ -42,7 +42,7 @@ func NewService(clusterScope scope.EC2Scope) *Service {
4242
return &Service{
4343
scope: clusterScope,
4444
EC2Client: scope.NewEC2Client(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
45-
SSMClient: scope.NewSSMClient(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
45+
SSMClient: &ssmiface.SSMClientV2{},
4646
netService: network.NewService(clusterScope.(scope.NetworkScope)),
4747
}
4848
}

‎pkg/cloud/services/ssm/mock_ssmiface/doc.go‎

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

‎pkg/cloud/services/ssm/mock_ssmiface/mock_ssmiface.go‎

Lines changed: 111 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)