Integrate ecs api interface.

aws · Oct 31, 2023 · 9bc4f08 · 9bc4f08
1 parent d082d4f
commit 9bc4f08
Show file tree

Hide file tree

Showing 19 changed files with 741 additions and 341 deletions.
diff --git a/agent/handlers/agentapi/taskprotection/factory.go b/agent/handlers/agentapi/taskprotection/factory.go
@@ -18,7 +18,7 @@ import (
 	"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"
+	ecsapi "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
 
@@ -37,7 +37,7 @@ type TaskProtectionClientFactory struct {
 // Helper function for retrieving credential from credentials manager and create ecs client
 func (factory TaskProtectionClientFactory) NewTaskProtectionClient(
 	taskRoleCredential credentials.TaskIAMRoleCredentials,
-) api.ECSTaskProtectionSDK {
+) ecsapi.ECSTaskProtectionSDK {
 	taskCredential := taskRoleCredential.GetIAMRoleCredentials()
 	cfg := aws.NewConfig().
 		WithCredentials(awscreds.NewStaticCredentials(taskCredential.AccessKeyID,

diff --git a/agent/handlers/agentapi/taskprotection/factory_test.go b/agent/handlers/agentapi/taskprotection/factory_test.go
@@ -18,7 +18,7 @@ package taskprotection
 import (
 	"testing"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/api"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
@@ -52,7 +52,7 @@ func TestGetECSClientHappyCase(t *testing.T) {
 	defer ctrl.Finish()
 
 	ret := factory.NewTaskProtectionClient(testIAMRoleCredentials)
-	_, ok := ret.(api.ECSTaskProtectionSDK)
+	_, ok := ret.(ecs.ECSTaskProtectionSDK)
 
 	// Assert response
 	assert.True(t, ok)

diff --git a/agent/handlers/task_server_setup_test.go b/agent/handlers/task_server_setup_test.go
@@ -37,8 +37,8 @@ import (
 	v3 "github.com/aws/amazon-ecs-agent/agent/handlers/v3"
 	mock_stats "github.com/aws/amazon-ecs-agent/agent/stats/mock"
 	apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
+	mock_taskprotection "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/mocks"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
-	mock_taskprotection "github.com/aws/amazon-ecs-agent/ecs-agent/api/mocks"
 	apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
 	"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
 	mock_credentials "github.com/aws/amazon-ecs-agent/ecs-agent/credentials/mocks"

diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/generate_mocks.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/generate_mocks.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/interface.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/interface.go