ssm client wrapper removed

Author: miyadav

go.sum

@@ -94,13 +94,10 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 h1:TIOEjw0i2yyhmhRry
 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6/go.mod h1:3Ba++UwWd154xtP4FRX5pUK3Gt4up5sDHCve6kVfE+g=
 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.4 h1:SSDkZRAO8Ok5SoQ4BJ0onDeb0ga8JBOCkUmNEpRChcw=
 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.21.4/go.mod h1:plXue/Zg49kU3uU6WwfCWgRR5SRINNiJf03Y/UhYOhU=
-<<<<<<< HEAD
 github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8 h1:80dpSqWMwx2dAm30Ib7J6ucz1ZHfiv5OCRwN/EnCOXQ=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8/go.mod h1:IzNt/udsXlETCdvBOL0nmyMe2t9cGmXmZgsdoZGYYhI=
-=======
 github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1 h1:Z4cmgV3hKuUIkhJsdn47hf/ABYHUtILfMrV+L8+kRwE=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.59.1/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8=
->>>>>>> bb4fbed33 (Migrate SSM code to AWS SDK V2 -)
 github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w=
 github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE=

pkg/cloud/scope/clients.go

@@ -37,8 +37,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
 	"github.com/aws/aws-sdk-go/service/secretsmanager"
 	"github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface"
-	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/aws/aws-sdk-go/service/ssm"
+
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/cloud/services/ec2/service.go

@@ -40,11 +40,9 @@ type Service struct {
 // NewService returns a new service given the ec2 api client.
 func NewService(clusterScope scope.EC2Scope) *Service {
 	return &Service{
-		scope:     clusterScope,
-		EC2Client: scope.NewEC2Client(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
-		SSMClient: &ssm.SSMClientV2{
-			Client: scope.NewSSMClient(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
-		},
+		scope:      clusterScope,
+		EC2Client:  scope.NewEC2Client(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
+		SSMClient:  scope.NewSSMClient(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
 		netService: network.NewService(clusterScope.(scope.NetworkScope)),
 	}
 }

pkg/cloud/services/ssm/service.go

@@ -18,7 +18,6 @@ package ssm
 
 import (
 	"context"
-	"errors"
 
 	"github.com/aws/aws-sdk-go-v2/service/ssm"
 
@@ -42,40 +41,13 @@ type SSMAPI interface {
 	// Add more methods as needed
 }
 
-// SSMClientV2 is a concrete implementation of the SSMAPI interface using AWS SDK v2.
-// It wraps PutParameter for potential custom logic while using the AWS SDK directly for other methods.
-type SSMClientV2 struct {
-	Client *ssm.Client
-}
-
-// PutParameter adds or overwrites a parameter in AWS SSM Parameter Store.
-// This method is wrapped to allow for custom error handling or retry logic if needed.
-func (c *SSMClientV2) PutParameter(ctx context.Context, input *ssm.PutParameterInput, optFns ...func(*ssm.Options)) (*ssm.PutParameterOutput, error) {
-	if c.Client == nil {
-		return nil, errors.New("SSM client is not initialized")
-	}
-	return c.Client.PutParameter(ctx, input, optFns...)
-}
-
-// DeleteParameter deletes a parameter from AWS SSM Parameter Store.
-func (c *SSMClientV2) DeleteParameter(ctx context.Context, input *ssm.DeleteParameterInput, optFns ...func(*ssm.Options)) (*ssm.DeleteParameterOutput, error) {
-	return c.Client.DeleteParameter(ctx, input, optFns...)
-}
-
-// GetParameter retrieves a parameter from AWS SSM Parameter Store.
-func (c *SSMClientV2) GetParameter(ctx context.Context, input *ssm.GetParameterInput, optFns ...func(*ssm.Options)) (*ssm.GetParameterOutput, error) {
-	return c.Client.GetParameter(ctx, input, optFns...)
-}
-
-// Ensure SSMClientV2 satisfies the SSMAPI interface.
-var _ SSMAPI = &SSMClientV2{}
+// Ensure ssm.Client satisfies the SSMAPI interface.
+var _ SSMAPI = &ssm.Client{}
 
 // NewService creates a new Service for managing secrets in AWS SSM.
 func NewService(secretsScope cloud.ClusterScoper) *Service {
 	return &Service{
-		scope: secretsScope,
-		SSMClient: &SSMClientV2{
-			Client: scope.NewSSMClient(secretsScope, secretsScope, secretsScope, secretsScope.InfraCluster()),
-		},
+		scope:     secretsScope,
+		SSMClient: scope.NewSSMClient(secretsScope, secretsScope, secretsScope, secretsScope.InfraCluster()),
 	}
 }