Remove using ResourceFields; Use config in TaskResource Initialize instead

Author: TheanLim

agent/api/task/task.go

@@ -3312,13 +3312,13 @@ func (task *Task) getASMSecretsResource() ([]taskresource.TaskResource, bool) {
 // InitializeResources initializes the required field in the task on agent restart
 // Some of the fields in task isn't saved in the agent state file, agent needs
 // to initialize these fields before processing the task, eg: docker client in resource
-func (task *Task) InitializeResources(resourceFields *taskresource.ResourceFields) {
+func (task *Task) InitializeResources(config *config.Config, resourceFields *taskresource.ResourceFields) {
 	task.lock.Lock()
 	defer task.lock.Unlock()
 
 	for _, resources := range task.ResourcesMapUnsafe {
 		for _, resource := range resources {
-			resource.Initialize(resourceFields, task.KnownStatusUnsafe, task.DesiredStatusUnsafe)
+			resource.Initialize(config, resourceFields, task.KnownStatusUnsafe, task.DesiredStatusUnsafe)
 		}
 	}
 }

agent/app/agent_unix.go

@@ -176,7 +176,6 @@ func (agent *ecsAgent) initializeResourceFields(credentialsManager credentials.M
 			S3ClientCreator:    s3factory.NewS3ClientCreator(),
 			CredentialsManager: credentialsManager,
 			EC2InstanceID:      agent.getEC2InstanceID(),
-			IPCompatibility:    agent.getConfig().InstanceIPCompatibility,
 		},
 		Ctx:              agent.ctx,
 		DockerClient:     agent.dockerClient,

agent/app/agent_windows.go

@@ -323,7 +323,6 @@ func (agent *ecsAgent) initializeResourceFields(credentialsManager credentials.M
 			FSxClientCreator:   fsxfactory.NewFSxClientCreator(),
 			S3ClientCreator:    s3factory.NewS3ClientCreator(),
 			CredentialsManager: credentialsManager,
-			IPCompatibility:    agent.getConfig().InstanceIPCompatibility,
 		},
 		Ctx:          agent.ctx,
 		DockerClient: agent.dockerClient,

agent/engine/docker_task_engine.go

@@ -682,7 +682,7 @@ func (engine *DockerTaskEngine) synchronizeState() {
 	engine.reconcileHostResources()
 	tasksToStart := engine.filterTasksToStartUnsafe(tasks)
 	for _, task := range tasks {
-		task.InitializeResources(engine.resourceFields)
+		task.InitializeResources(engine.cfg, engine.resourceFields)
 		engine.saveTaskData(task)
 	}
 

agent/engine/docker_task_engine_test.go

@@ -2629,7 +2629,7 @@ func TestSynchronizeResource(t *testing.T) {
 	}
 	// add the task to the state to simulate the agent restored the state on restart
 	state.AddTask(testTask)
-	cgroupResource.EXPECT().Initialize(gomock.Any(), gomock.Any(), gomock.Any())
+	cgroupResource.EXPECT().Initialize(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any())
 	cgroupResource.EXPECT().SetDesiredStatus(gomock.Any()).MaxTimes(1)
 	cgroupResource.EXPECT().GetDesiredStatus().MaxTimes(2)
 	cgroupResource.EXPECT().TerminalStatus().MaxTimes(1)

agent/taskresource/asmauth/asmauth.go

@@ -21,6 +21,7 @@ import (
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
 	"github.com/aws/amazon-ecs-agent/agent/asm"
 	"github.com/aws/amazon-ecs-agent/agent/asm/factory"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
 	resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
 	apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
@@ -349,7 +350,9 @@ func (auth *ASMAuthResource) PutASMDockerAuthConfig(secretID string, authCfg reg
 	auth.dockerAuthData[secretID] = authCfg
 }
 
-func (auth *ASMAuthResource) Initialize(resourceFields *taskresource.ResourceFields,
+func (auth *ASMAuthResource) Initialize(
+	config *config.Config,
+	resourceFields *taskresource.ResourceFields,
 	taskKnownStatus status.TaskStatus,
 	taskDesiredStatus status.TaskStatus) {
 	auth.initStatusToTransition()

agent/taskresource/asmauth/asmauth_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/aws/amazon-ecs-agent/agent/asm"
 	mock_factory "github.com/aws/amazon-ecs-agent/agent/asm/factory/mocks"
 	mock_secretsmanageriface "github.com/aws/amazon-ecs-agent/agent/asm/mocks"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
 	resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
 	apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
@@ -157,12 +158,14 @@ func TestInitialize(t *testing.T) {
 					knownStatusUnsafe:   resourcestatus.ResourceCreated,
 					desiredStatusUnsafe: resourcestatus.ResourceCreated,
 				}
-				asmRes.Initialize(&taskresource.ResourceFields{
-					ResourceFieldsCommon: &taskresource.ResourceFieldsCommon{
-						ASMClientCreator:   asmClientCreator,
-						CredentialsManager: credentialsManager,
-					},
-				}, tc.taskKnownStatus, tc.taskDesiredStatus)
+				asmRes.Initialize(
+					&config.Config{},
+					&taskresource.ResourceFields{
+						ResourceFieldsCommon: &taskresource.ResourceFieldsCommon{
+							ASMClientCreator:   asmClientCreator,
+							CredentialsManager: credentialsManager,
+						},
+					}, tc.taskKnownStatus, tc.taskDesiredStatus)
 				if tc.expectReset {
 					assert.Equal(t, resourcestatus.ResourceStatusNone, asmRes.GetKnownStatus())
 				} else {

agent/taskresource/asmsecret/asmsecret.go

@@ -26,6 +26,7 @@ import (
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
 	"github.com/aws/amazon-ecs-agent/agent/asm"
 	"github.com/aws/amazon-ecs-agent/agent/asm/factory"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
 	resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
 	apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
@@ -445,7 +446,9 @@ func (secret *ASMSecretResource) SetCachedSecretValue(secretKey string, secretVa
 	secret.secretData[secretKey] = secretValue
 }
 
-func (secret *ASMSecretResource) Initialize(resourceFields *taskresource.ResourceFields,
+func (secret *ASMSecretResource) Initialize(
+	config *config.Config,
+	resourceFields *taskresource.ResourceFields,
 	taskKnownStatus status.TaskStatus,
 	taskDesiredStatus status.TaskStatus) {
 	secret.initStatusToTransition()

agent/taskresource/asmsecret/asmsecret_test.go

@@ -27,6 +27,7 @@ import (
 	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
 	mock_factory "github.com/aws/amazon-ecs-agent/agent/asm/factory/mocks"
 	mock_secretsmanageriface "github.com/aws/amazon-ecs-agent/agent/asm/mocks"
+	"github.com/aws/amazon-ecs-agent/agent/config"
 	"github.com/aws/amazon-ecs-agent/agent/taskresource"
 	resourcestatus "github.com/aws/amazon-ecs-agent/agent/taskresource/status"
 	apitaskstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/task/status"
@@ -238,12 +239,14 @@ func TestInitialize(t *testing.T) {
 		knownStatusUnsafe:   resourcestatus.ResourceCreated,
 		desiredStatusUnsafe: resourcestatus.ResourceCreated,
 	}
-	asmRes.Initialize(&taskresource.ResourceFields{
-		ResourceFieldsCommon: &taskresource.ResourceFieldsCommon{
-			ASMClientCreator:   asmClientCreator,
-			CredentialsManager: credentialsManager,
-		},
-	}, apitaskstatus.TaskStatusNone, apitaskstatus.TaskRunning)
+	asmRes.Initialize(
+		&config.Config{},
+		&taskresource.ResourceFields{
+			ResourceFieldsCommon: &taskresource.ResourceFieldsCommon{
+				ASMClientCreator:   asmClientCreator,
+				CredentialsManager: credentialsManager,
+			},
+		}, apitaskstatus.TaskStatusNone, apitaskstatus.TaskRunning)
 	assert.Equal(t, resourcestatus.ResourceStatusNone, asmRes.GetKnownStatus())
 	assert.Equal(t, resourcestatus.ResourceCreated, asmRes.GetDesiredStatus())
 

agent/taskresource/cgroup/cgroup.go

@@ -379,7 +379,9 @@ func (cgroup *CgroupResource) GetCgroupMountPath() string {
 }
 
 // Initialize initializes the resource fileds in cgroup
-func (cgroup *CgroupResource) Initialize(resourceFields *taskresource.ResourceFields,
+func (cgroup *CgroupResource) Initialize(
+	config *config.Config,
+	resourceFields *taskresource.ResourceFields,
 	taskKnownStatus status.TaskStatus,
 	taskDesiredStatus status.TaskStatus) {
 	cgroup.lock.Lock()