diff --git a/ecs-agent/api/ecs/generate_mocks.go b/ecs-agent/api/ecs/generate_mocks.go
new file mode 100644
index 00000000000..41d613b616c
--- /dev/null
+++ b/ecs-agent/api/ecs/generate_mocks.go
@@ -0,0 +1,16 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package ecs
+
+//go:generate mockgen -destination=mocks/api_mocks.go -copyright_file=../../../scripts/copyright_file github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs ECSStandardSDK,ECSSubmitStateSDK,ECSClient,ECSTaskProtectionSDK
diff --git a/ecs-agent/api/ecs/interface.go b/ecs-agent/api/ecs/interface.go
new file mode 100644
index 00000000000..c13047b616c
--- /dev/null
+++ b/ecs-agent/api/ecs/interface.go
@@ -0,0 +1,92 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package ecs
+
+import (
+	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/statechange"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+// ECSClient is an interface over the ECSSDK interface which abstracts away some
+// details around constructing the request and reading the response down to the
+// parts the agent cares about.
+// For example, the ever-present 'Cluster' member is abstracted out so that it
+// may be configured once and used throughout transparently.
+type ECSClient interface {
+	// RegisterContainerInstance calculates the appropriate resources, creates
+	// the default cluster if necessary, and returns the registered
+	// ContainerInstanceARN if successful. Supplying a non-empty container
+	// instance ARN allows a container instance to update its registered
+	// resources.
+	RegisterContainerInstance(existingContainerInstanceArn string,
+		attributes []*ecs.Attribute, tags []*ecs.Tag, registrationToken string, platformDevices []*ecs.PlatformDevice,
+		outpostARN string) (string, string, error)
+	// SubmitTaskStateChange sends a state change and returns an error
+	// indicating if it was submitted
+	SubmitTaskStateChange(change statechange.TaskStateChange) error
+	// SubmitContainerStateChange sends a state change and returns an error
+	// indicating if it was submitted
+	SubmitContainerStateChange(change statechange.ContainerStateChange) error
+	// SubmitAttachmentStateChange sends an attachment state change and returns an error
+	// indicating if it was submitted
+	SubmitAttachmentStateChange(change statechange.AttachmentStateChange) error
+	// DiscoverPollEndpoint takes a ContainerInstanceARN and returns the
+	// endpoint at which this Agent should contact ACS
+	DiscoverPollEndpoint(containerInstanceArn string) (string, error)
+	// DiscoverTelemetryEndpoint takes a ContainerInstanceARN and returns the
+	// endpoint at which this Agent should contact Telemetry Service
+	DiscoverTelemetryEndpoint(containerInstanceArn string) (string, error)
+	// DiscoverServiceConnectEndpoint takes a ContainerInstanceARN and returns the
+	// endpoint at which this Agent should contact ServiceConnect
+	DiscoverServiceConnectEndpoint(containerInstanceArn string) (string, error)
+	// GetResourceTags retrieves the Tags associated with a certain resource
+	GetResourceTags(resourceArn string) ([]*ecs.Tag, error)
+	// UpdateContainerInstancesState updates the given container Instance ID with
+	// the given status. Only valid statuses are ACTIVE and DRAINING.
+	UpdateContainerInstancesState(instanceARN, status string) error
+	// GetHostResources retrieves a map that map the resource name to the corresponding resource
+	GetHostResources() (map[string]*ecs.Resource, error)
+}
+
+// ECSSDK is an interface that specifies the subset of the AWS Go SDK's ECS
+// client that the Agent uses.  This interface is meant to allow injecting a
+// mock for testing.
+type ECSStandardSDK interface {
+	CreateCluster(*ecs.CreateClusterInput) (*ecs.CreateClusterOutput, error)
+	RegisterContainerInstance(*ecs.RegisterContainerInstanceInput) (*ecs.RegisterContainerInstanceOutput, error)
+	DiscoverPollEndpoint(*ecs.DiscoverPollEndpointInput) (*ecs.DiscoverPollEndpointOutput, error)
+	ListTagsForResource(*ecs.ListTagsForResourceInput) (*ecs.ListTagsForResourceOutput, error)
+	UpdateContainerInstancesState(input *ecs.UpdateContainerInstancesStateInput) (*ecs.UpdateContainerInstancesStateOutput, error)
+}
+
+// ECSSubmitStateSDK is an interface with customized ecs client that
+// implements the SubmitTaskStateChange and SubmitContainerStateChange
+type ECSSubmitStateSDK interface {
+	SubmitContainerStateChange(*ecs.SubmitContainerStateChangeInput) (*ecs.SubmitContainerStateChangeOutput, error)
+	SubmitTaskStateChange(*ecs.SubmitTaskStateChangeInput) (*ecs.SubmitTaskStateChangeOutput, error)
+	SubmitAttachmentStateChanges(*ecs.SubmitAttachmentStateChangesInput) (*ecs.SubmitAttachmentStateChangesOutput, error)
+}
+
+// ECSTaskProtectionSDK is an interface with customized ecs client that
+// implements the UpdateTaskProtection and GetTaskProtection
+type ECSTaskProtectionSDK interface {
+	UpdateTaskProtection(input *ecs.UpdateTaskProtectionInput) (*ecs.UpdateTaskProtectionOutput, error)
+	UpdateTaskProtectionWithContext(ctx aws.Context, input *ecs.UpdateTaskProtectionInput,
+		opts ...request.Option) (*ecs.UpdateTaskProtectionOutput, error)
+	GetTaskProtection(input *ecs.GetTaskProtectionInput) (*ecs.GetTaskProtectionOutput, error)
+	GetTaskProtectionWithContext(ctx aws.Context, input *ecs.GetTaskProtectionInput,
+		opts ...request.Option) (*ecs.GetTaskProtectionOutput, error)
+}
diff --git a/ecs-agent/api/ecs/mocks/api_mocks.go b/ecs-agent/api/ecs/mocks/api_mocks.go
new file mode 100644
index 00000000000..161b8233e9f
--- /dev/null
+++ b/ecs-agent/api/ecs/mocks/api_mocks.go
@@ -0,0 +1,458 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+//
+
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs (interfaces: ECSStandardSDK,ECSSubmitStateSDK,ECSClient,ECSTaskProtectionSDK)
+
+// Package mock_ecs is a generated GoMock package.
+package mock_ecs
+
+import (
+	context "context"
+	reflect "reflect"
+
+	ecs "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/model/ecs"
+	statechange "github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/statechange"
+	request "github.com/aws/aws-sdk-go/aws/request"
+	gomock "github.com/golang/mock/gomock"
+)
+
+// MockECSStandardSDK is a mock of ECSStandardSDK interface.
+type MockECSStandardSDK struct {
+	ctrl     *gomock.Controller
+	recorder *MockECSStandardSDKMockRecorder
+}
+
+// MockECSStandardSDKMockRecorder is the mock recorder for MockECSStandardSDK.
+type MockECSStandardSDKMockRecorder struct {
+	mock *MockECSStandardSDK
+}
+
+// NewMockECSStandardSDK creates a new mock instance.
+func NewMockECSStandardSDK(ctrl *gomock.Controller) *MockECSStandardSDK {
+	mock := &MockECSStandardSDK{ctrl: ctrl}
+	mock.recorder = &MockECSStandardSDKMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockECSStandardSDK) EXPECT() *MockECSStandardSDKMockRecorder {
+	return m.recorder
+}
+
+// CreateCluster mocks base method.
+func (m *MockECSStandardSDK) CreateCluster(arg0 *ecs.CreateClusterInput) (*ecs.CreateClusterOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CreateCluster", arg0)
+	ret0, _ := ret[0].(*ecs.CreateClusterOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// CreateCluster indicates an expected call of CreateCluster.
+func (mr *MockECSStandardSDKMockRecorder) CreateCluster(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateCluster", reflect.TypeOf((*MockECSStandardSDK)(nil).CreateCluster), arg0)
+}
+
+// DiscoverPollEndpoint mocks base method.
+func (m *MockECSStandardSDK) DiscoverPollEndpoint(arg0 *ecs.DiscoverPollEndpointInput) (*ecs.DiscoverPollEndpointOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DiscoverPollEndpoint", arg0)
+	ret0, _ := ret[0].(*ecs.DiscoverPollEndpointOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DiscoverPollEndpoint indicates an expected call of DiscoverPollEndpoint.
+func (mr *MockECSStandardSDKMockRecorder) DiscoverPollEndpoint(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DiscoverPollEndpoint", reflect.TypeOf((*MockECSStandardSDK)(nil).DiscoverPollEndpoint), arg0)
+}
+
+// ListTagsForResource mocks base method.
+func (m *MockECSStandardSDK) ListTagsForResource(arg0 *ecs.ListTagsForResourceInput) (*ecs.ListTagsForResourceOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ListTagsForResource", arg0)
+	ret0, _ := ret[0].(*ecs.ListTagsForResourceOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ListTagsForResource indicates an expected call of ListTagsForResource.
+func (mr *MockECSStandardSDKMockRecorder) ListTagsForResource(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListTagsForResource", reflect.TypeOf((*MockECSStandardSDK)(nil).ListTagsForResource), arg0)
+}
+
+// RegisterContainerInstance mocks base method.
+func (m *MockECSStandardSDK) RegisterContainerInstance(arg0 *ecs.RegisterContainerInstanceInput) (*ecs.RegisterContainerInstanceOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RegisterContainerInstance", arg0)
+	ret0, _ := ret[0].(*ecs.RegisterContainerInstanceOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// RegisterContainerInstance indicates an expected call of RegisterContainerInstance.
+func (mr *MockECSStandardSDKMockRecorder) RegisterContainerInstance(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterContainerInstance", reflect.TypeOf((*MockECSStandardSDK)(nil).RegisterContainerInstance), arg0)
+}
+
+// UpdateContainerInstancesState mocks base method.
+func (m *MockECSStandardSDK) UpdateContainerInstancesState(arg0 *ecs.UpdateContainerInstancesStateInput) (*ecs.UpdateContainerInstancesStateOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateContainerInstancesState", arg0)
+	ret0, _ := ret[0].(*ecs.UpdateContainerInstancesStateOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateContainerInstancesState indicates an expected call of UpdateContainerInstancesState.
+func (mr *MockECSStandardSDKMockRecorder) UpdateContainerInstancesState(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateContainerInstancesState", reflect.TypeOf((*MockECSStandardSDK)(nil).UpdateContainerInstancesState), arg0)
+}
+
+// MockECSSubmitStateSDK is a mock of ECSSubmitStateSDK interface.
+type MockECSSubmitStateSDK struct {
+	ctrl     *gomock.Controller
+	recorder *MockECSSubmitStateSDKMockRecorder
+}
+
+// MockECSSubmitStateSDKMockRecorder is the mock recorder for MockECSSubmitStateSDK.
+type MockECSSubmitStateSDKMockRecorder struct {
+	mock *MockECSSubmitStateSDK
+}
+
+// NewMockECSSubmitStateSDK creates a new mock instance.
+func NewMockECSSubmitStateSDK(ctrl *gomock.Controller) *MockECSSubmitStateSDK {
+	mock := &MockECSSubmitStateSDK{ctrl: ctrl}
+	mock.recorder = &MockECSSubmitStateSDKMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockECSSubmitStateSDK) EXPECT() *MockECSSubmitStateSDKMockRecorder {
+	return m.recorder
+}
+
+// SubmitAttachmentStateChanges mocks base method.
+func (m *MockECSSubmitStateSDK) SubmitAttachmentStateChanges(arg0 *ecs.SubmitAttachmentStateChangesInput) (*ecs.SubmitAttachmentStateChangesOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitAttachmentStateChanges", arg0)
+	ret0, _ := ret[0].(*ecs.SubmitAttachmentStateChangesOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SubmitAttachmentStateChanges indicates an expected call of SubmitAttachmentStateChanges.
+func (mr *MockECSSubmitStateSDKMockRecorder) SubmitAttachmentStateChanges(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAttachmentStateChanges", reflect.TypeOf((*MockECSSubmitStateSDK)(nil).SubmitAttachmentStateChanges), arg0)
+}
+
+// SubmitContainerStateChange mocks base method.
+func (m *MockECSSubmitStateSDK) SubmitContainerStateChange(arg0 *ecs.SubmitContainerStateChangeInput) (*ecs.SubmitContainerStateChangeOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitContainerStateChange", arg0)
+	ret0, _ := ret[0].(*ecs.SubmitContainerStateChangeOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SubmitContainerStateChange indicates an expected call of SubmitContainerStateChange.
+func (mr *MockECSSubmitStateSDKMockRecorder) SubmitContainerStateChange(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitContainerStateChange", reflect.TypeOf((*MockECSSubmitStateSDK)(nil).SubmitContainerStateChange), arg0)
+}
+
+// SubmitTaskStateChange mocks base method.
+func (m *MockECSSubmitStateSDK) SubmitTaskStateChange(arg0 *ecs.SubmitTaskStateChangeInput) (*ecs.SubmitTaskStateChangeOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitTaskStateChange", arg0)
+	ret0, _ := ret[0].(*ecs.SubmitTaskStateChangeOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SubmitTaskStateChange indicates an expected call of SubmitTaskStateChange.
+func (mr *MockECSSubmitStateSDKMockRecorder) SubmitTaskStateChange(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitTaskStateChange", reflect.TypeOf((*MockECSSubmitStateSDK)(nil).SubmitTaskStateChange), arg0)
+}
+
+// MockECSClient is a mock of ECSClient interface.
+type MockECSClient struct {
+	ctrl     *gomock.Controller
+	recorder *MockECSClientMockRecorder
+}
+
+// MockECSClientMockRecorder is the mock recorder for MockECSClient.
+type MockECSClientMockRecorder struct {
+	mock *MockECSClient
+}
+
+// NewMockECSClient creates a new mock instance.
+func NewMockECSClient(ctrl *gomock.Controller) *MockECSClient {
+	mock := &MockECSClient{ctrl: ctrl}
+	mock.recorder = &MockECSClientMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockECSClient) EXPECT() *MockECSClientMockRecorder {
+	return m.recorder
+}
+
+// DiscoverPollEndpoint mocks base method.
+func (m *MockECSClient) DiscoverPollEndpoint(arg0 string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DiscoverPollEndpoint", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DiscoverPollEndpoint indicates an expected call of DiscoverPollEndpoint.
+func (mr *MockECSClientMockRecorder) DiscoverPollEndpoint(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DiscoverPollEndpoint", reflect.TypeOf((*MockECSClient)(nil).DiscoverPollEndpoint), arg0)
+}
+
+// DiscoverServiceConnectEndpoint mocks base method.
+func (m *MockECSClient) DiscoverServiceConnectEndpoint(arg0 string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DiscoverServiceConnectEndpoint", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DiscoverServiceConnectEndpoint indicates an expected call of DiscoverServiceConnectEndpoint.
+func (mr *MockECSClientMockRecorder) DiscoverServiceConnectEndpoint(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DiscoverServiceConnectEndpoint", reflect.TypeOf((*MockECSClient)(nil).DiscoverServiceConnectEndpoint), arg0)
+}
+
+// DiscoverTelemetryEndpoint mocks base method.
+func (m *MockECSClient) DiscoverTelemetryEndpoint(arg0 string) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DiscoverTelemetryEndpoint", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DiscoverTelemetryEndpoint indicates an expected call of DiscoverTelemetryEndpoint.
+func (mr *MockECSClientMockRecorder) DiscoverTelemetryEndpoint(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DiscoverTelemetryEndpoint", reflect.TypeOf((*MockECSClient)(nil).DiscoverTelemetryEndpoint), arg0)
+}
+
+// GetHostResources mocks base method.
+func (m *MockECSClient) GetHostResources() (map[string]*ecs.Resource, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetHostResources")
+	ret0, _ := ret[0].(map[string]*ecs.Resource)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetHostResources indicates an expected call of GetHostResources.
+func (mr *MockECSClientMockRecorder) GetHostResources() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetHostResources", reflect.TypeOf((*MockECSClient)(nil).GetHostResources))
+}
+
+// GetResourceTags mocks base method.
+func (m *MockECSClient) GetResourceTags(arg0 string) ([]*ecs.Tag, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetResourceTags", arg0)
+	ret0, _ := ret[0].([]*ecs.Tag)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetResourceTags indicates an expected call of GetResourceTags.
+func (mr *MockECSClientMockRecorder) GetResourceTags(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetResourceTags", reflect.TypeOf((*MockECSClient)(nil).GetResourceTags), arg0)
+}
+
+// RegisterContainerInstance mocks base method.
+func (m *MockECSClient) RegisterContainerInstance(arg0 string, arg1 []*ecs.Attribute, arg2 []*ecs.Tag, arg3 string, arg4 []*ecs.PlatformDevice, arg5 string) (string, string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RegisterContainerInstance", arg0, arg1, arg2, arg3, arg4, arg5)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(string)
+	ret2, _ := ret[2].(error)
+	return ret0, ret1, ret2
+}
+
+// RegisterContainerInstance indicates an expected call of RegisterContainerInstance.
+func (mr *MockECSClientMockRecorder) RegisterContainerInstance(arg0, arg1, arg2, arg3, arg4, arg5 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterContainerInstance", reflect.TypeOf((*MockECSClient)(nil).RegisterContainerInstance), arg0, arg1, arg2, arg3, arg4, arg5)
+}
+
+// SubmitAttachmentStateChange mocks base method.
+func (m *MockECSClient) SubmitAttachmentStateChange(arg0 statechange.AttachmentStateChange) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitAttachmentStateChange", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SubmitAttachmentStateChange indicates an expected call of SubmitAttachmentStateChange.
+func (mr *MockECSClientMockRecorder) SubmitAttachmentStateChange(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAttachmentStateChange", reflect.TypeOf((*MockECSClient)(nil).SubmitAttachmentStateChange), arg0)
+}
+
+// SubmitContainerStateChange mocks base method.
+func (m *MockECSClient) SubmitContainerStateChange(arg0 statechange.ContainerStateChange) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitContainerStateChange", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SubmitContainerStateChange indicates an expected call of SubmitContainerStateChange.
+func (mr *MockECSClientMockRecorder) SubmitContainerStateChange(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitContainerStateChange", reflect.TypeOf((*MockECSClient)(nil).SubmitContainerStateChange), arg0)
+}
+
+// SubmitTaskStateChange mocks base method.
+func (m *MockECSClient) SubmitTaskStateChange(arg0 statechange.TaskStateChange) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SubmitTaskStateChange", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SubmitTaskStateChange indicates an expected call of SubmitTaskStateChange.
+func (mr *MockECSClientMockRecorder) SubmitTaskStateChange(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitTaskStateChange", reflect.TypeOf((*MockECSClient)(nil).SubmitTaskStateChange), arg0)
+}
+
+// UpdateContainerInstancesState mocks base method.
+func (m *MockECSClient) UpdateContainerInstancesState(arg0, arg1 string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateContainerInstancesState", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// UpdateContainerInstancesState indicates an expected call of UpdateContainerInstancesState.
+func (mr *MockECSClientMockRecorder) UpdateContainerInstancesState(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateContainerInstancesState", reflect.TypeOf((*MockECSClient)(nil).UpdateContainerInstancesState), arg0, arg1)
+}
+
+// MockECSTaskProtectionSDK is a mock of ECSTaskProtectionSDK interface.
+type MockECSTaskProtectionSDK struct {
+	ctrl     *gomock.Controller
+	recorder *MockECSTaskProtectionSDKMockRecorder
+}
+
+// MockECSTaskProtectionSDKMockRecorder is the mock recorder for MockECSTaskProtectionSDK.
+type MockECSTaskProtectionSDKMockRecorder struct {
+	mock *MockECSTaskProtectionSDK
+}
+
+// NewMockECSTaskProtectionSDK creates a new mock instance.
+func NewMockECSTaskProtectionSDK(ctrl *gomock.Controller) *MockECSTaskProtectionSDK {
+	mock := &MockECSTaskProtectionSDK{ctrl: ctrl}
+	mock.recorder = &MockECSTaskProtectionSDKMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *MockECSTaskProtectionSDK) EXPECT() *MockECSTaskProtectionSDKMockRecorder {
+	return m.recorder
+}
+
+// GetTaskProtection mocks base method.
+func (m *MockECSTaskProtectionSDK) GetTaskProtection(arg0 *ecs.GetTaskProtectionInput) (*ecs.GetTaskProtectionOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetTaskProtection", arg0)
+	ret0, _ := ret[0].(*ecs.GetTaskProtectionOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetTaskProtection indicates an expected call of GetTaskProtection.
+func (mr *MockECSTaskProtectionSDKMockRecorder) GetTaskProtection(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTaskProtection", reflect.TypeOf((*MockECSTaskProtectionSDK)(nil).GetTaskProtection), arg0)
+}
+
+// GetTaskProtectionWithContext mocks base method.
+func (m *MockECSTaskProtectionSDK) GetTaskProtectionWithContext(arg0 context.Context, arg1 *ecs.GetTaskProtectionInput, arg2 ...request.Option) (*ecs.GetTaskProtectionOutput, error) {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{arg0, arg1}
+	for _, a := range arg2 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "GetTaskProtectionWithContext", varargs...)
+	ret0, _ := ret[0].(*ecs.GetTaskProtectionOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetTaskProtectionWithContext indicates an expected call of GetTaskProtectionWithContext.
+func (mr *MockECSTaskProtectionSDKMockRecorder) GetTaskProtectionWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTaskProtectionWithContext", reflect.TypeOf((*MockECSTaskProtectionSDK)(nil).GetTaskProtectionWithContext), varargs...)
+}
+
+// UpdateTaskProtection mocks base method.
+func (m *MockECSTaskProtectionSDK) UpdateTaskProtection(arg0 *ecs.UpdateTaskProtectionInput) (*ecs.UpdateTaskProtectionOutput, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateTaskProtection", arg0)
+	ret0, _ := ret[0].(*ecs.UpdateTaskProtectionOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateTaskProtection indicates an expected call of UpdateTaskProtection.
+func (mr *MockECSTaskProtectionSDKMockRecorder) UpdateTaskProtection(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTaskProtection", reflect.TypeOf((*MockECSTaskProtectionSDK)(nil).UpdateTaskProtection), arg0)
+}
+
+// UpdateTaskProtectionWithContext mocks base method.
+func (m *MockECSTaskProtectionSDK) UpdateTaskProtectionWithContext(arg0 context.Context, arg1 *ecs.UpdateTaskProtectionInput, arg2 ...request.Option) (*ecs.UpdateTaskProtectionOutput, error) {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{arg0, arg1}
+	for _, a := range arg2 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "UpdateTaskProtectionWithContext", varargs...)
+	ret0, _ := ret[0].(*ecs.UpdateTaskProtectionOutput)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// UpdateTaskProtectionWithContext indicates an expected call of UpdateTaskProtectionWithContext.
+func (mr *MockECSTaskProtectionSDKMockRecorder) UpdateTaskProtectionWithContext(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTaskProtectionWithContext", reflect.TypeOf((*MockECSTaskProtectionSDK)(nil).UpdateTaskProtectionWithContext), varargs...)
+}
diff --git a/ecs-agent/ecs/model/api/api-2.json b/ecs-agent/api/ecs/model/api/api-2.json
similarity index 100%
rename from ecs-agent/ecs/model/api/api-2.json
rename to ecs-agent/api/ecs/model/api/api-2.json
diff --git a/ecs-agent/ecs/model/api/docs-2.json b/ecs-agent/api/ecs/model/api/docs-2.json
similarity index 100%
rename from ecs-agent/ecs/model/api/docs-2.json
rename to ecs-agent/api/ecs/model/api/docs-2.json
diff --git a/ecs-agent/ecs/model/api/paginators-1.json b/ecs-agent/api/ecs/model/api/paginators-1.json
similarity index 100%
rename from ecs-agent/ecs/model/api/paginators-1.json
rename to ecs-agent/api/ecs/model/api/paginators-1.json
diff --git a/ecs-agent/ecs/model/api/waiters-2.json b/ecs-agent/api/ecs/model/api/waiters-2.json
similarity index 100%
rename from ecs-agent/ecs/model/api/waiters-2.json
rename to ecs-agent/api/ecs/model/api/waiters-2.json
diff --git a/ecs-agent/ecs/model/ecs/api.go b/ecs-agent/api/ecs/model/ecs/api.go
similarity index 100%
rename from ecs-agent/ecs/model/ecs/api.go
rename to ecs-agent/api/ecs/model/ecs/api.go
diff --git a/ecs-agent/ecs/model/ecs/errors.go b/ecs-agent/api/ecs/model/ecs/errors.go
similarity index 100%
rename from ecs-agent/ecs/model/ecs/errors.go
rename to ecs-agent/api/ecs/model/ecs/errors.go
diff --git a/ecs-agent/ecs/model/ecs/service.go b/ecs-agent/api/ecs/model/ecs/service.go
similarity index 100%
rename from ecs-agent/ecs/model/ecs/service.go
rename to ecs-agent/api/ecs/model/ecs/service.go
diff --git a/ecs-agent/ecs/model/generate.go b/ecs-agent/api/ecs/model/generate.go
similarity index 81%
rename from ecs-agent/ecs/model/generate.go
rename to ecs-agent/api/ecs/model/generate.go
index 8ad4a62735a..d6c15ebe718 100644
--- a/ecs-agent/ecs/model/generate.go
+++ b/ecs-agent/api/ecs/model/generate.go
@@ -14,4 +14,4 @@
 package model
 
 // codegen tag required by AWS SDK generators
-//go:generate go run -tags codegen ../../../ecs-agent/gogenerate/awssdk.go -typesOnly=false -copyright_file ../../../scripts/copyright_file
+//go:generate go run -tags codegen ../../../../ecs-agent/gogenerate/awssdk.go -typesOnly=false -copyright_file ../../../../scripts/copyright_file