fix lint error

Author: LiangquanLi930

controlplane/eks/controllers/awsmanagedcontrolplane_controller_test.go

@@ -32,7 +32,6 @@ import (
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
-	stsrequest "github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/aws/smithy-go"
 	"github.com/golang/mock/gomock"
@@ -948,12 +947,9 @@ func mockedEKSCluster(ctx context.Context, g *WithT, eksRec *mock_eksiface.MockE
 	})).Return(
 		clusterSgDesc, nil)
 
-	req, err := http.NewRequest(http.MethodGet, "foobar", http.NoBody)
+	_, err := http.NewRequest(http.MethodGet, "foobar", http.NoBody)
 	g.Expect(err).To(BeNil())
-	stsRec.GetCallerIdentityRequest(&sts.GetCallerIdentityInput{}).Return(&stsrequest.Request{
-		HTTPRequest: req,
-		Operation:   &stsrequest.Operation{},
-	}, &sts.GetCallerIdentityOutput{})
+	stsRec.GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Return(&sts.GetCallerIdentityOutput{}, nil)
 
 	eksRec.TagResource(ctx, &eks.TagResourceInput{
 		ResourceArn: clusterARN,

controlplane/rosa/controllers/rosacontrolplane_controller_test.go

@@ -295,7 +295,7 @@ func TestRosaControlPlaneReconcileStatusVersion(t *testing.T) {
 	stsMock := mock_stsiface.NewMockSTSAPI(mockCtrl)
 
 	getCallerIdentityResult := &sts.GetCallerIdentityOutput{Account: aws.String("foo"), Arn: aws.String("arn:aws:iam::123456789012:rosa/foo")}
-	stsMock.EXPECT().GetCallerIdentity(gomock.Any()).Return(getCallerIdentityResult, nil).Times(1)
+	stsMock.EXPECT().GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Return(getCallerIdentityResult, nil).Times(1)
 
 	expect := func(m *mocks.MockOCMClientMockRecorder) {
 		m.ValidateHypershiftVersion(gomock.Any(), gomock.Any()).DoAndReturn(func(clusterId string, nodePoolID string) (bool, error) {

exp/controllers/rosamachinepool_controller_test.go

@@ -547,7 +547,7 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 			test.expect(ocmMock.EXPECT())
 
 			stsMock := mock_stsiface.NewMockSTSAPI(mockCtrl)
-			stsMock.EXPECT().GetCallerIdentity(gomock.Any()).Times(1)
+			stsMock.EXPECT().GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
 
 			r := ROSAMachinePoolReconciler{
 				Recorder:         recorder,
@@ -642,7 +642,7 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 		expect(ocmMock.EXPECT())
 
 		stsMock := mock_stsiface.NewMockSTSAPI(mockCtrl)
-		stsMock.EXPECT().GetCallerIdentity(gomock.Any()).Times(1)
+		stsMock.EXPECT().GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
 
 		r := ROSAMachinePoolReconciler{
 			Recorder:         recorder,

pkg/cloud/services/eks/config.go

@@ -301,14 +301,11 @@ func (s *Service) createBaseKubeConfig(cluster *ekstypes.Cluster, userName strin
 func (s *Service) generateToken() (string, error) {
 	eksClusterName := s.scope.KubernetesClusterName()
 
-	// Create a presign client for STS
-	presignClient := sts.NewPresignClient(s.STSClient)
-
 	// Create the GetCallerIdentity input
 	input := &sts.GetCallerIdentityInput{}
 
 	// Presign the request
-	presignedReq, err := presignClient.PresignGetCallerIdentity(context.TODO(), input)
+	presignedReq, err := s.STSPresignClient.PresignGetCallerIdentity(context.TODO(), input)
 	if err != nil {
 		return "", fmt.Errorf("presigning AWS get caller identity: %w", err)
 	}

pkg/cloud/services/eks/config_test.go

@@ -2,14 +2,11 @@ package eks
 
 import (
 	"context"
-	"net/http"
-	"net/url"
 	"testing"
 
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
+	"github.com/aws/aws-sdk-go-v2/service/sts"
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -21,7 +18,7 @@ import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
-	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/sts/mock_stsiface"
+	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/s3/mock_stsiface"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/secret"
 )
@@ -42,20 +39,7 @@ func Test_createCAPIKubeconfigSecret(t *testing.T) {
 			serviceFunc: func() *Service {
 				mockCtrl := gomock.NewController(t)
 				stsMock := mock_stsiface.NewMockSTSAPI(mockCtrl)
-				op := request.Request{
-					Operation: &request.Operation{Name: "GetCallerIdentity",
-						HTTPMethod: "POST",
-						HTTPPath:   "/",
-					},
-					HTTPRequest: &http.Request{
-						Header: make(http.Header),
-						URL: &url.URL{
-							Scheme: "https",
-							Host:   "F00BA4.gr4.us-east-2.eks.amazonaws.com",
-						},
-					},
-				}
-				stsMock.EXPECT().GetCallerIdentityRequest(gomock.Any()).Return(&op, &sts.GetCallerIdentityOutput{})
+				stsMock.EXPECT().GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Return(&sts.GetCallerIdentityOutput{}, nil)
 
 				scheme := runtime.NewScheme()
 				_ = infrav1.AddToScheme(scheme)
@@ -151,20 +135,7 @@ func Test_updateCAPIKubeconfigSecret(t *testing.T) {
 			serviceFunc: func(tc testCase) *Service {
 				mockCtrl := gomock.NewController(t)
 				stsMock := mock_stsiface.NewMockSTSAPI(mockCtrl)
-				op := request.Request{
-					Operation: &request.Operation{Name: "GetCallerIdentity",
-						HTTPMethod: "POST",
-						HTTPPath:   "/",
-					},
-					HTTPRequest: &http.Request{
-						Header: make(http.Header),
-						URL: &url.URL{
-							Scheme: "https",
-							Host:   "F00BA4.gr4.us-east-2.eks.amazonaws.com",
-						},
-					},
-				}
-				stsMock.EXPECT().GetCallerIdentityRequest(gomock.Any()).Return(&op, &sts.GetCallerIdentityOutput{})
+				stsMock.EXPECT().GetCallerIdentity(gomock.Any(), gomock.Any(), gomock.Any()).Return(&sts.GetCallerIdentityOutput{}, nil)
 
 				scheme := runtime.NewScheme()
 				_ = infrav1.AddToScheme(scheme)

pkg/cloud/services/eks/service.go

@@ -89,9 +89,16 @@ type Service struct {
 	EC2Client common.EC2API
 	EKSClient EKSAPI
 	iam.IAMService
-	STSClient *sts.Client
+	STSClient        STSAPI
+	STSPresignClient *sts.PresignClient
+}
+
+type STSAPI interface {
+	GetCallerIdentity(ctx context.Context, params *sts.GetCallerIdentityInput, optFns ...func(*sts.Options)) (*sts.GetCallerIdentityOutput, error)
 }
 
+var _ STSAPI = &sts.Client{}
+
 // ServiceOpts defines the functional arguments for the service.
 type ServiceOpts func(s *Service)
 
@@ -104,6 +111,9 @@ func WithIAMClient(client *http.Client) ServiceOpts {
 
 // NewService returns a new service given the api clients.
 func NewService(controlPlaneScope *scope.ManagedControlPlaneScope, opts ...ServiceOpts) *Service {
+	stsClient := scope.NewSTSClient(controlPlaneScope, controlPlaneScope, controlPlaneScope, controlPlaneScope.ControlPlane)
+	stsPresignClient := sts.NewPresignClient(stsClient)
+
 	s := &Service{
 		scope:     controlPlaneScope,
 		EC2Client: scope.NewEC2Client(controlPlaneScope, controlPlaneScope, controlPlaneScope, controlPlaneScope.ControlPlane),
@@ -115,7 +125,8 @@ func NewService(controlPlaneScope *scope.ManagedControlPlaneScope, opts ...Servi
 			IAMClient: scope.NewIAMClient(controlPlaneScope, controlPlaneScope, controlPlaneScope, controlPlaneScope.ControlPlane),
 			Client:    http.DefaultClient,
 		},
-		STSClient: scope.NewSTSClient(controlPlaneScope, controlPlaneScope, controlPlaneScope, controlPlaneScope.ControlPlane),
+		STSClient:        stsClient,
+		STSPresignClient: stsPresignClient,
 	}
 
 	for _, opt := range opts {

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

@@ -17,6 +17,6 @@ limitations under the License.
 // Package mock_stsiface provides a mock implementation for the STSAPI interface.
 // Run go generate to regenerate this mock.
 //
-//go:generate ../../../../../hack/tools/bin/mockgen -destination stsapi_mock.go -package mock_stsiface github.com/aws/aws-sdk-go/service/sts/stsiface STSAPI
+//go:generate ../../../../../hack/tools/bin/mockgen -destination stsapi_mock.go -package mock_stsiface sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/s3 STSAPI
 //go:generate /usr/bin/env bash -c "cat ../../../../../hack/boilerplate/boilerplate.generatego.txt stsapi_mock.go > _stsapi_mock.go && mv _stsapi_mock.go stsapi_mock.go"
 package mock_stsiface //nolint:stylecheck