From 3f5aad7c6ab267624e6a909418002372d88ee276 Mon Sep 17 00:00:00 2001 From: Yunhee Date: Thu, 16 Aug 2018 09:47:00 -0700 Subject: [PATCH] fix --- agent/api/task/taskvolume_test.go | 32 ++++++++++++------------- agent/config/config.go | 2 +- agent/config/config_windows.go | 36 ++++++++++++++--------------- agent/config/config_windows_test.go | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/agent/api/task/taskvolume_test.go b/agent/api/task/taskvolume_test.go index e179bf304ff..611875d6b16 100644 --- a/agent/api/task/taskvolume_test.go +++ b/agent/api/task/taskvolume_test.go @@ -133,7 +133,7 @@ func TestInitializeLocalDockerVolume(t *testing.T) { } func TestInitializeSharedProvisionedVolume(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -164,7 +164,7 @@ func TestInitializeSharedProvisionedVolume(t *testing.T) { // Expect the volume already exists on the instance dockerClient.EXPECT().InspectVolume(gomock.Any(), gomock.Any(), gomock.Any()).Return(dockerapi.VolumeResponse{}) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.NoError(t, err) assert.Len(t, testTask.ResourcesMapUnsafe, 0, "no volume resource should be provisioned by agent") @@ -172,7 +172,7 @@ func TestInitializeSharedProvisionedVolume(t *testing.T) { } func TestInitializeSharedProvisionedVolumeError(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -203,12 +203,12 @@ func TestInitializeSharedProvisionedVolumeError(t *testing.T) { // Expect the volume does not exists on the instance dockerClient.EXPECT().InspectVolume(gomock.Any(), gomock.Any(), gomock.Any()).Return(dockerapi.VolumeResponse{Error: errors.New("volume not exist")}) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.Error(t, err, "volume not found for auto-provisioned resource should cause task to fail") } func TestInitializeSharedNonProvisionedVolume(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -244,7 +244,7 @@ func TestInitializeSharedNonProvisionedVolume(t *testing.T) { Labels: map[string]string{"test": "test"}, }, }) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.NoError(t, err) assert.Len(t, testTask.ResourcesMapUnsafe, 0, "no volume resource should be provisioned by agent") @@ -252,7 +252,7 @@ func TestInitializeSharedNonProvisionedVolume(t *testing.T) { } func TestInitializeSharedNonProvisionedVolumeValidateNameOnly(t *testing.T) { - sharedVolumeValidateNameOnly := true + sharedVolumeMatchNameOnly := true ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -291,7 +291,7 @@ func TestInitializeSharedNonProvisionedVolumeValidateNameOnly(t *testing.T) { Labels: nil, }, }) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.NoError(t, err) assert.Len(t, testTask.ResourcesMapUnsafe, 0, "no volume resource should be provisioned by agent") @@ -299,7 +299,7 @@ func TestInitializeSharedNonProvisionedVolumeValidateNameOnly(t *testing.T) { } func TestInitializeSharedAutoprovisionVolumeNotFoundError(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -329,14 +329,14 @@ func TestInitializeSharedAutoprovisionVolumeNotFoundError(t *testing.T) { } dockerClient.EXPECT().InspectVolume(gomock.Any(), gomock.Any(), gomock.Any()).Return(dockerapi.VolumeResponse{Error: errors.New("not found")}) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.NoError(t, err) assert.Len(t, testTask.ResourcesMapUnsafe, 1, "volume resource should be provisioned by agent") assert.Len(t, testTask.Containers[0].TransitionDependenciesMap, 1, "volume resource should be in the container dependency map") } func TestInitializeSharedAutoprovisionVolumeNotMatchError(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -370,12 +370,12 @@ func TestInitializeSharedAutoprovisionVolumeNotMatchError(t *testing.T) { Labels: map[string]string{"test": "test"}, }, }) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.Error(t, err, "volume resource details not match should cause task fail") } func TestInitializeSharedAutoprovisionVolumeTimeout(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false ctrl := gomock.NewController(t) dockerClient := mock_dockerapi.NewMockDockerClient(ctrl) @@ -407,12 +407,12 @@ func TestInitializeSharedAutoprovisionVolumeTimeout(t *testing.T) { dockerClient.EXPECT().InspectVolume(gomock.Any(), gomock.Any(), gomock.Any()).Return(dockerapi.VolumeResponse{ Error: &dockerapi.DockerTimeoutError{}, }) - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, dockerClient, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, dockerClient, nil) assert.Error(t, err, "volume resource details not match should cause task fail") } func TestInitializeTaskVolume(t *testing.T) { - sharedVolumeValidateNameOnly := false + sharedVolumeMatchNameOnly := false testTask := &Task{ ResourcesMapUnsafe: make(map[string][]taskresource.TaskResource), Containers: []*apicontainer.Container{ @@ -437,7 +437,7 @@ func TestInitializeTaskVolume(t *testing.T) { }, } - err := testTask.initializeDockerVolumes(sharedVolumeValidateNameOnly, nil, nil) + err := testTask.initializeDockerVolumes(sharedVolumeMatchNameOnly, nil, nil) assert.NoError(t, err) assert.Len(t, testTask.ResourcesMapUnsafe, 1, "expect the resource map has an empty volume resource") assert.Len(t, testTask.Containers[0].TransitionDependenciesMap, 1, "expect a volume resource as the container dependency") diff --git a/agent/config/config.go b/agent/config/config.go index a54da3c26a6..1a294407411 100644 --- a/agent/config/config.go +++ b/agent/config/config.go @@ -105,7 +105,7 @@ const ( // DefaultTaskMetadataBurstRate is set to handle 60 burst requests at once DefaultTaskMetadataBurstRate = 60 - // DefaultSharedVolumeValidateNameOnly is set to true, requiring shared volumes to validate + // DefaultSharedVolumeMatchNameOnly is set to true, requiring shared volumes to validate // across name, driver options, and labels DefaultSharedVolumeMatchNameOnly = false ) diff --git a/agent/config/config_windows.go b/agent/config/config_windows.go index 6be76692dce..32fec57e575 100644 --- a/agent/config/config_windows.go +++ b/agent/config/config_windows.go @@ -74,24 +74,24 @@ func DefaultConfig() Config { DataDir: dataDir, // DataDirOnHost is identical to DataDir for Windows because we do not // run as a container - DataDirOnHost: dataDir, - ReservedMemory: 0, - AvailableLoggingDrivers: []dockerclient.LoggingDriver{dockerclient.JSONFileDriver, dockerclient.NoneDriver, dockerclient.AWSLogsDriver}, - TaskCleanupWaitDuration: DefaultTaskCleanupWaitDuration, - DockerStopTimeout: defaultDockerStopTimeout, - ContainerStartTimeout: defaultContainerStartTimeout, - CredentialsAuditLogFile: filepath.Join(ecsRoot, defaultCredentialsAuditLogFile), - CredentialsAuditLogDisabled: false, - ImageCleanupDisabled: false, - MinimumImageDeletionAge: DefaultImageDeletionAge, - ImageCleanupInterval: DefaultImageCleanupTimeInterval, - NumImagesToDeletePerCycle: DefaultNumImagesToDeletePerCycle, - ContainerMetadataEnabled: false, - TaskCPUMemLimit: ExplicitlyDisabled, - PlatformVariables: platformVariables, - TaskMetadataSteadyStateRate: DefaultTaskMetadataSteadyStateRate, - TaskMetadataBurstRate: DefaultTaskMetadataBurstRate, - SharedVolumeValidateNameOnly: DefaultSharedVolumeValidateNameOnly, + DataDirOnHost: dataDir, + ReservedMemory: 0, + AvailableLoggingDrivers: []dockerclient.LoggingDriver{dockerclient.JSONFileDriver, dockerclient.NoneDriver, dockerclient.AWSLogsDriver}, + TaskCleanupWaitDuration: DefaultTaskCleanupWaitDuration, + DockerStopTimeout: defaultDockerStopTimeout, + ContainerStartTimeout: defaultContainerStartTimeout, + CredentialsAuditLogFile: filepath.Join(ecsRoot, defaultCredentialsAuditLogFile), + CredentialsAuditLogDisabled: false, + ImageCleanupDisabled: false, + MinimumImageDeletionAge: DefaultImageDeletionAge, + ImageCleanupInterval: DefaultImageCleanupTimeInterval, + NumImagesToDeletePerCycle: DefaultNumImagesToDeletePerCycle, + ContainerMetadataEnabled: false, + TaskCPUMemLimit: ExplicitlyDisabled, + PlatformVariables: platformVariables, + TaskMetadataSteadyStateRate: DefaultTaskMetadataSteadyStateRate, + TaskMetadataBurstRate: DefaultTaskMetadataBurstRate, + SharedVolumeMatchNameOnly: DefaultSharedVolumeMatchNameOnly, } } diff --git a/agent/config/config_windows_test.go b/agent/config/config_windows_test.go index 2dce41a8dcb..b33e9e8416a 100644 --- a/agent/config/config_windows_test.go +++ b/agent/config/config_windows_test.go @@ -58,7 +58,7 @@ func TestConfigDefault(t *testing.T) { "Default TaskMetadataSteadyStateRate is set incorrectly") assert.Equal(t, DefaultTaskMetadataBurstRate, cfg.TaskMetadataBurstRate, "Default TaskMetadataBurstRate is set incorrectly") - assert.False(t, cfg.SharedVolumeValidateNameOnly, "Default SharedVolumeValidateNameOnly set incorrectly") + assert.False(t, cfg.SharedVolumeMatchNameOnly, "Default SharedVolumeMatchNameOnly set incorrectly") } func TestConfigIAMTaskRolesReserves80(t *testing.T) {