Move httpclient to ecs-agent/ and minor refactor

aws · Oct 16, 2023 · 041ca3f · 041ca3f
1 parent 768ccc1
commit 041ca3f
Show file tree

Hide file tree

Showing 17 changed files with 328 additions and 42 deletions.
diff --git a/agent/acs/updater/updater.go b/agent/acs/updater/updater.go
@@ -29,11 +29,12 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/data"
 	"github.com/aws/amazon-ecs-agent/agent/engine"
 	"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
 	"github.com/aws/amazon-ecs-agent/agent/sighandlers"
 	"github.com/aws/amazon-ecs-agent/agent/sighandlers/exitcodes"
 	"github.com/aws/amazon-ecs-agent/agent/utils"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/utils/ttime"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
 
@@ -79,7 +80,7 @@ func NewUpdater(cfg *config.Config, state dockerstate.TaskEngineState, dataClien
 	taskEngine engine.TaskEngine) *updater {
 	return &updater{
 		config:     cfg,
-		httpclient: httpclient.New(updateDownloadTimeout, false),
+		httpclient: httpclient.New(updateDownloadTimeout, false, agentversion.String(), config.OSType),
 		state:      state,
 		dataClient: dataClient,
 		taskEngine: taskEngine,

diff --git a/agent/acs/updater/updater_test.go b/agent/acs/updater/updater_test.go
@@ -31,9 +31,10 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/data"
 	"github.com/aws/amazon-ecs-agent/agent/engine"
 	"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
-	mock_http "github.com/aws/amazon-ecs-agent/agent/httpclient/mock"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
+	mock_http "github.com/aws/amazon-ecs-agent/ecs-agent/httpclient/mock"
 	mock_client "github.com/aws/amazon-ecs-agent/ecs-agent/wsclient/mock"
 
 	"github.com/golang/mock/gomock"
@@ -58,7 +59,7 @@ func mocks(t *testing.T, cfg *config.Config) (*updater, *gomock.Controller, *moc
 
 	mockacs := mock_client.NewMockClientServer(ctrl)
 	mockhttp := mock_http.NewMockRoundTripper(ctrl)
-	httpClient := httpclient.New(updateDownloadTimeout, false)
+	httpClient := httpclient.New(updateDownloadTimeout, false, agentversion.String(), config.OSType)
 	httpClient.Transport.(httpclient.OverridableTransport).SetTransport(mockhttp)
 
 	u := NewUpdater(cfg, dockerstate.NewTaskEngineState(), data.NewNoopClient(),

diff --git a/agent/api/ecsclient/client.go b/agent/api/ecsclient/client.go
@@ -25,12 +25,13 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/credentials/instancecreds"
 	"github.com/aws/amazon-ecs-agent/agent/ec2"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
 	"github.com/aws/amazon-ecs-agent/agent/utils"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
 	apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/async"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry"
 
@@ -77,21 +78,21 @@ type APIECSClient struct {
 // NewECSClient creates a new ECSClient interface object
 func NewECSClient(
 	credentialProvider *credentials.Credentials,
-	config *config.Config,
+	cfg *config.Config,
 	ec2MetadataClient ec2.EC2MetadataClient) api.ECSClient {
 
 	var ecsConfig aws.Config
 	ecsConfig.Credentials = credentialProvider
-	ecsConfig.Region = &config.AWSRegion
-	ecsConfig.HTTPClient = httpclient.New(RoundtripTimeout, config.AcceptInsecureCert)
-	if config.APIEndpoint != "" {
-		ecsConfig.Endpoint = &config.APIEndpoint
+	ecsConfig.Region = &cfg.AWSRegion
+	ecsConfig.HTTPClient = httpclient.New(RoundtripTimeout, cfg.AcceptInsecureCert, agentversion.String(), config.OSType)
+	if cfg.APIEndpoint != "" {
+		ecsConfig.Endpoint = &cfg.APIEndpoint
 	}
 	standardClient := ecs.New(session.New(&ecsConfig))
 	submitStateChangeClient := newSubmitStateChangeClient(&ecsConfig)
 	return &APIECSClient{
 		credentialProvider:      credentialProvider,
-		config:                  config,
+		config:                  cfg,
 		standardClient:          standardClient,
 		submitStateChangeClient: submitStateChangeClient,
 		ec2metadata:             ec2MetadataClient,

diff --git a/agent/asm/factory/factory.go b/agent/asm/factory/factory.go
@@ -16,8 +16,10 @@ package factory
 import (
 	"time"
 
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	"github.com/aws/amazon-ecs-agent/agent/config"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -42,7 +44,7 @@ type asmClientCreator struct{}
 func (*asmClientCreator) NewASMClient(region string,
 	creds credentials.IAMRoleCredentials) secretsmanageriface.SecretsManagerAPI {
 	cfg := aws.NewConfig().
-		WithHTTPClient(httpclient.New(roundtripTimeout, false)).
+		WithHTTPClient(httpclient.New(roundtripTimeout, false, agentversion.String(), config.OSType)).
 		WithRegion(region).
 		WithCredentials(
 			awscreds.NewStaticCredentials(creds.AccessKeyID, creds.SecretAccessKey,

diff --git a/agent/ecr/factory.go b/agent/ecr/factory.go
@@ -20,10 +20,12 @@ import (
 	"time"
 
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/credentials/instancecreds"
 	ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -45,7 +47,7 @@ const (
 // NewECRFactory returns an ECRFactory capable of producing ECRSDK clients
 func NewECRFactory(acceptInsecureCert bool) ECRFactory {
 	return &ecrFactory{
-		httpClient: httpclient.New(roundtripTimeout, acceptInsecureCert),
+		httpClient: httpclient.New(roundtripTimeout, acceptInsecureCert, agentversion.String(), config.OSType),
 	}
 }
 

diff --git a/agent/fsx/factory/factory.go b/agent/fsx/factory/factory.go
@@ -16,9 +16,11 @@ package factory
 import (
 	"time"
 
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	fsxclient "github.com/aws/amazon-ecs-agent/agent/fsx"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -42,7 +44,7 @@ type fsxClientCreator struct{}
 func (*fsxClientCreator) NewFSxClient(region string,
 	creds credentials.IAMRoleCredentials) fsxclient.FSxClient {
 	cfg := aws.NewConfig().
-		WithHTTPClient(httpclient.New(roundtripTimeout, false)).
+		WithHTTPClient(httpclient.New(roundtripTimeout, false, agentversion.String(), config.OSType)).
 		WithRegion(region).
 		WithCredentials(
 			awscreds.NewStaticCredentials(creds.AccessKeyID, creds.SecretAccessKey,

diff --git a/agent/handlers/agentapi/taskprotection/factory.go b/agent/handlers/agentapi/taskprotection/factory.go
@@ -14,7 +14,9 @@ package taskprotection
 
 import (
 	"github.com/aws/amazon-ecs-agent/agent/api/ecsclient"
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	"github.com/aws/amazon-ecs-agent/agent/config"
+	"github.com/aws/amazon-ecs-agent/agent/version"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 
 	"github.com/aws/amazon-ecs-agent/ecs-agent/api"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
@@ -42,7 +44,8 @@ func (factory TaskProtectionClientFactory) NewTaskProtectionClient(
 			taskCredential.SecretAccessKey,
 			taskCredential.SessionToken)).
 		WithRegion(factory.Region).
-		WithHTTPClient(httpclient.New(ecsclient.RoundtripTimeout, factory.AcceptInsecureCert)).
+		WithHTTPClient(httpclient.New(ecsclient.RoundtripTimeout, factory.AcceptInsecureCert, version.String(),
+			config.OSType)).
 		WithEndpoint(factory.Endpoint)
 
 	ecsClient := ecs.New(session.Must(session.NewSession()), cfg)

diff --git a/agent/s3/factory/factory.go b/agent/s3/factory/factory.go
@@ -16,9 +16,11 @@ package factory
 import (
 	"time"
 
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	s3client "github.com/aws/amazon-ecs-agent/agent/s3"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
@@ -50,7 +52,7 @@ type s3ClientCreator struct{}
 func (*s3ClientCreator) NewS3ManagerClient(bucket, region string,
 	creds credentials.IAMRoleCredentials) (s3client.S3ManagerClient, error) {
 	cfg := aws.NewConfig().
-		WithHTTPClient(httpclient.New(roundtripTimeout, false)).
+		WithHTTPClient(httpclient.New(roundtripTimeout, false, agentversion.String(), config.OSType)).
 		WithCredentials(
 			awscreds.NewStaticCredentials(creds.AccessKeyID, creds.SecretAccessKey,
 				creds.SessionToken)).WithRegion(region)
@@ -68,7 +70,7 @@ func (*s3ClientCreator) NewS3ManagerClient(bucket, region string,
 func (*s3ClientCreator) NewS3Client(bucket, region string,
 	creds credentials.IAMRoleCredentials) (s3client.S3Client, error) {
 	cfg := aws.NewConfig().
-		WithHTTPClient(httpclient.New(roundtripTimeout, false)).
+		WithHTTPClient(httpclient.New(roundtripTimeout, false, agentversion.String(), config.OSType)).
 		WithCredentials(
 			awscreds.NewStaticCredentials(creds.AccessKeyID, creds.SecretAccessKey,
 				creds.SessionToken)).WithRegion(region)

diff --git a/agent/ssm/factory/factory.go b/agent/ssm/factory/factory.go
@@ -16,9 +16,11 @@ package factory
 import (
 	"time"
 
-	"github.com/aws/amazon-ecs-agent/agent/httpclient"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	ssmclient "github.com/aws/amazon-ecs-agent/agent/ssm"
+	agentversion "github.com/aws/amazon-ecs-agent/agent/version"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/httpclient"
 	"github.com/aws/aws-sdk-go/aws"
 	awscreds "github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -43,7 +45,7 @@ type ssmClientCreator struct{}
 func (*ssmClientCreator) NewSSMClient(region string,
 	creds credentials.IAMRoleCredentials) ssmclient.SSMClient {
 	cfg := aws.NewConfig().
-		WithHTTPClient(httpclient.New(roundtripTimeout, false)).
+		WithHTTPClient(httpclient.New(roundtripTimeout, false, agentversion.String(), config.OSType)).
 		WithRegion(region).
 		WithCredentials(
 			awscreds.NewStaticCredentials(creds.AccessKeyID, creds.SecretAccessKey,

diff --git a/agent/httpclient/httpclient.go → ...-agent/ecs-agent/httpclient/httpclient.go b/agent/httpclient/httpclient.go → ...-agent/ecs-agent/httpclient/httpclient.go
diff --git a/agent/httpclient/mock/gomock_helpers.go → ...s-agent/httpclient/mock/gomock_helpers.go b/agent/httpclient/mock/gomock_helpers.go → ...s-agent/httpclient/mock/gomock_helpers.go
diff --git a/agent/httpclient/mock/httpclient.go → ...t/ecs-agent/httpclient/mock/httpclient.go b/agent/httpclient/mock/httpclient.go → ...t/ecs-agent/httpclient/mock/httpclient.go
diff --git a/agent/vendor/modules.txt b/agent/vendor/modules.txt
@@ -32,6 +32,8 @@ github.com/aws/amazon-ecs-agent/ecs-agent/data
 github.com/aws/amazon-ecs-agent/ecs-agent/doctor
 github.com/aws/amazon-ecs-agent/ecs-agent/ecs_client/model/ecs
 github.com/aws/amazon-ecs-agent/ecs-agent/eventstream
+github.com/aws/amazon-ecs-agent/ecs-agent/httpclient
+github.com/aws/amazon-ecs-agent/ecs-agent/httpclient/mock
 github.com/aws/amazon-ecs-agent/ecs-agent/logger
 github.com/aws/amazon-ecs-agent/ecs-agent/logger/audit
 github.com/aws/amazon-ecs-agent/ecs-agent/logger/audit/mocks