Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(compose): Add EFS volume support to ECS Params. #1019

Merged
merged 19 commits into from
May 26, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions ecs-cli/modules/utils/compose/convert_task_definition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package utils

import (
"fmt"
"io/ioutil"
"os"
"reflect"
Expand Down Expand Up @@ -1405,6 +1406,61 @@ func TestConvertToTaskDefinitionWithECSParamsVolumeWithoutNameError(t *testing.T
assert.Error(t, err, "Expected error converting Task Definition with ECS Params volume without name")
}

func TestConvertToTaskDefinitionWithEFSVolume(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add tests for the error cases as well? (no system id, encryption required but missing)

containerConfig := &adapter.ContainerConfig{
Name: "web",
Image: "httpd",
MountPoints: []*ecs.MountPoint{{
SourceVolume: aws.String("myEFSVolume"),
ContainerPath: aws.String("/mount/efs"),
ReadOnly: aws.Bool(true),
}},
}

ecsParamsString := `version: 1
task_definition:
efs_volumes:
- name: myEFSVolume
filesystem_id: fs-1234
root_directory: /
transit_encryption: "DISABLED"
iam_auth_enabled: "DISABLED"`

ecsParams, err := createTempECSParamsForTest(t, ecsParamsString)
assert.NoError(t, err)

containerConfigs := []adapter.ContainerConfig{*containerConfig}
volumes := adapter.Volumes{
VolumeWithHost: map[string]string{
"/mount/efs": "myEFSVolume",
},
}
testParams := ConvertTaskDefParams{
TaskDefName: projectName,
TaskRoleArn: "",
RequiredCompatibilites: "",
Volumes: &volumes,
ContainerConfigs: containerConfigs,
ECSParams: ecsParams,
ECSRegistryCreds: nil,
}

taskDefinition, err := ConvertToTaskDefinition(testParams)
assert.NoError(t, err)
containerDefs := taskDefinition.ContainerDefinitions
web := findContainerByName("web", containerDefs)
mp := web.MountPoints[0]
efsVolCfg := taskDefinition.Volumes[0].EfsVolumeConfiguration
fmt.Printf("%v\n", efsVolCfg)
if assert.NoError(t, err) {
assert.Equal(t, *mp.SourceVolume, "myEFSVolume")
assert.Equal(t, mp.ContainerPath, aws.String("/mount/efs"))
// assert.Equal(t, efsVolCfg.FileSystemId, aws.String("fs-1234"))
// assert.Equal(t, efsVolCfg.RootDirectory, aws.String("/"))
assert.Equal(t, *taskDefinition.Volumes[0].Name, "myEFSVolume")
}
}

func TestIsZeroForEmptyConfig(t *testing.T) {
containerConfig := &adapter.ContainerConfig{}

Expand Down