Skip to content

Commit c04a322

Browse files
committed
creating ssmiface interface , changes on errors , secret_test
1 parent d2a68a1 commit c04a322

File tree

12 files changed

+302
-8726
lines changed

12 files changed

+302
-8726
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: 2 additions & 4 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"
@@ -205,14 +203,14 @@ func NewSTSClient(scopeUser cloud.ScopeUsage, session cloud.Session, logger logg
205203
}
206204

207205
// 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 {
206+
/*func NewSSMClient(scopeUser cloud.ScopeUsage, session cloud.Session, logger logger.Wrapper, target runtime.Object) ssmiface.SSMAPI {
209207
ssmClient := ssm.New(session.Session(), aws.NewConfig().WithLogLevel(awslogs.GetAWSLogLevel(logger.GetLogger())).WithLogger(awslogs.NewWrapLogr(logger.GetLogger())))
210208
ssmClient.Handlers.Build.PushFrontNamed(getUserAgentHandler())
211209
ssmClient.Handlers.CompleteAttempt.PushFront(awsmetrics.CaptureRequestMetrics(scopeUser.ControllerName()))
212210
ssmClient.Handlers.Complete.PushBack(recordAWSPermissionsIssue(target))
213211
214212
return ssmClient
215-
}
213+
}*/
216214

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

pkg/cloud/scope/ssm_client.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package scope
2+
3+
import (
4+
"context"
5+
6+
"github.com/aws/aws-sdk-go-v2/config"
7+
"github.com/aws/aws-sdk-go-v2/service/ssm"
8+
ssmiface "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/ssm/ssmiface"
9+
)
10+
11+
func NewSSMClient() (ssmiface.SSMAPI, error) {
12+
cfg, err := config.LoadDefaultConfig(context.TODO())
13+
if err != nil {
14+
return nil, err
15+
}
16+
17+
client := ssm.NewFromConfig(cfg)
18+
return &ssmiface.SSMClientV2{Client: client}, nil
19+
}

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: 96 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)