Walk back tcs client

Author: ShelbyZ

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/client/client.go

@@ -28,9 +28,10 @@ import (
 	"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/utils"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/private/protocol/json/jsonutil"
+
 	"github.com/cihub/seelog"
 	"github.com/pborman/uuid"
 )
@@ -71,7 +72,7 @@ func New(url string,
 	doctor *doctor.Doctor,
 	disableResourceMetrics bool,
 	publishMetricsInterval time.Duration,
-	credentialsCache *aws.CredentialsCache,
+	credentialProvider *credentials.Credentials,
 	rwTimeout time.Duration,
 	metricsMessages <-chan ecstcs.TelemetryMessage,
 	healthMessages <-chan ecstcs.HealthMessage,
@@ -85,14 +86,14 @@ func New(url string,
 		health:                   healthMessages,
 		disableResourceMetrics:   disableResourceMetrics,
 		ClientServerImpl: wsclient.ClientServerImpl{
-			URL:              url,
-			Cfg:              cfg,
-			CredentialsCache: credentialsCache,
-			RWTimeout:        rwTimeout,
-			MakeRequestHook:  signRequestFunc(url, cfg.AWSRegion, credentialsCache),
-			TypeDecoder:      NewTCSDecoder(),
-			RequestHandlers:  make(map[string]wsclient.RequestHandler),
-			MetricsFactory:   metricsFactory,
+			URL:                url,
+			Cfg:                cfg,
+			CredentialProvider: credentialProvider,
+			RWTimeout:          rwTimeout,
+			MakeRequestHook:    signRequestFunc(url, cfg.AWSRegion, credentialProvider),
+			TypeDecoder:        NewTCSDecoder(),
+			RequestHandlers:    make(map[string]wsclient.RequestHandler),
+			MetricsFactory:     metricsFactory,
 		},
 	}
 	cs.ServiceError = &tcsError{}
@@ -367,10 +368,10 @@ func copyServiceConnectMetrics(scMetrics []*ecstcs.GeneralMetricsWrapper) []*ecs
 // copyHealthMetadata performs a deep copy of HealthMetadata object
 func copyHealthMetadata(metadata *ecstcs.HealthMetadata, fin bool) *ecstcs.HealthMetadata {
 	return &ecstcs.HealthMetadata{
-		Cluster:           aws.String(aws.ToString(metadata.Cluster)),
-		ContainerInstance: aws.String(aws.ToString(metadata.ContainerInstance)),
+		Cluster:           aws.String(aws.StringValue(metadata.Cluster)),
+		ContainerInstance: aws.String(aws.StringValue(metadata.ContainerInstance)),
 		Fin:               aws.Bool(fin),
-		MessageId:         aws.String(aws.ToString(metadata.MessageId)),
+		MessageId:         aws.String(aws.StringValue(metadata.MessageId)),
 	}
 }
 
@@ -491,7 +492,7 @@ func (cs *tcsClientServer) Close() error {
 }
 
 // signRequestFunc is a MakeRequestHookFunc that signs each generated request
-func signRequestFunc(url, region string, credentialsCache *aws.CredentialsCache) wsclient.MakeRequestHookFunc {
+func signRequestFunc(url, region string, credentialProvider *credentials.Credentials) wsclient.MakeRequestHookFunc {
 	return func(payload []byte) ([]byte, error) {
 		reqBody := bytes.NewReader(payload)
 
@@ -501,7 +502,7 @@ func signRequestFunc(url, region string, credentialsCache *aws.CredentialsCache)
 		}
 
 		// TODO: Modify this to use SignHTTPRequest() once TCS has been migrated to use AWS SDK Go V2
-		err = utils.SignHTTPRequest(request, region, "ecs", credentialsCache, reqBody)
+		err = utils.SignHTTPRequestV1(request, region, "ecs", credentialProvider, reqBody)
 		if err != nil {
 			return nil, err
 		}

ecs-agent/tcs/client/client.go

@@ -35,8 +35,8 @@ import (
 	"github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
 	mock_wsconn "github.com/aws/amazon-ecs-agent/ecs-agent/wsclient/wsconn/mock"
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )
@@ -99,7 +99,7 @@ func (fc *falseHealthcheck) GetLastHealthcheckTime() time.Time {
 	return time.Date(1974, time.May, 19, 1, 2, 3, 4, time.UTC)
 }
 
-var testCreds = credentials.NewStaticCredentialsProvider("test-id", "test-secret", "test-token")
+var testCreds = credentials.NewStaticCredentials("test-id", "test-secret", "test-token")
 
 var emptyDoctor, _ = doctor.NewDoctor([]doctor.Healthcheck{}, "test-cluster", "this:is:an:instance:arn")
 
@@ -647,7 +647,7 @@ func testCS(conn *mock_wsconn.MockWebsocketConn, metricsMessages <-chan ecstcs.T
 		AcceptInsecureCert: true,
 	}
 	cs := New("https://aws.amazon.com/ecs", cfg, emptyDoctor, false, testPublishMetricsInterval,
-		aws.NewCredentialsCache(testCreds), rwTimeout, metricsMessages, healthMessages, metrics.NewNopEntryFactory()).(*tcsClientServer)
+		testCreds, rwTimeout, metricsMessages, healthMessages, metrics.NewNopEntryFactory()).(*tcsClientServer)
 	cs.SetConnection(conn)
 	return cs
 }
@@ -718,7 +718,7 @@ func TestHealthToPublishHealthRequests(t *testing.T) {
 		IsDocker:           true,
 	}
 
-	cs := New("", cfg, emptyDoctor, true, testPublishMetricsInterval, aws.NewCredentialsCache(testCreds), rwTimeout, nil, nil, metrics.NewNopEntryFactory())
+	cs := New("", cfg, emptyDoctor, true, testPublishMetricsInterval, testCreds, rwTimeout, nil, nil, metrics.NewNopEntryFactory())
 	cs.SetConnection(conn)
 
 	testMetadata := &ecstcs.HealthMetadata{