Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@yhlee-aws
yhlee-aws committed Aug 16, 2018
1 parent 0d1c079 commit 3f5aad7
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
32 changes: 16 additions & 16 deletions agent/api/task/taskvolume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -164,15 +164,15 @@ 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")
assert.Len(t, testTask.Containers[0].TransitionDependenciesMap, 0, "resource already exists")
}

func TestInitializeSharedProvisionedVolumeError(t *testing.T) {
sharedVolumeValidateNameOnly := false
sharedVolumeMatchNameOnly := false
ctrl := gomock.NewController(t)
dockerClient := mock_dockerapi.NewMockDockerClient(ctrl)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -244,15 +244,15 @@ 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")
assert.Len(t, testTask.Containers[0].TransitionDependenciesMap, 0, "resource already exists")
}

func TestInitializeSharedNonProvisionedVolumeValidateNameOnly(t *testing.T) {
sharedVolumeValidateNameOnly := true
sharedVolumeMatchNameOnly := true

ctrl := gomock.NewController(t)
dockerClient := mock_dockerapi.NewMockDockerClient(ctrl)
Expand Down Expand Up @@ -291,15 +291,15 @@ 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")
assert.Len(t, testTask.Containers[0].TransitionDependenciesMap, 0, "resource already exists")
}

func TestInitializeSharedAutoprovisionVolumeNotFoundError(t *testing.T) {
sharedVolumeValidateNameOnly := false
sharedVolumeMatchNameOnly := false
ctrl := gomock.NewController(t)
dockerClient := mock_dockerapi.NewMockDockerClient(ctrl)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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{
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion agent/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
36 changes: 18 additions & 18 deletions agent/config/config_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down
2 changes: 1 addition & 1 deletion agent/config/config_windows_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 3f5aad7

Please sign in to comment.