Skip to content

Commit 346d885

Browse files
SoManyHsallisaurus
SoManyHs
authored and
allisaurus
committed
Rename containerconfig pkg to adapter
1 parent c61eb70 commit 346d885

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎ecs-cli/modules/cli/compose/containerconfig/containerconfig.go renamed to ‎ecs-cli/modules/cli/compose/adapter/containerconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package containerconfig
1+
package adapter
22

33
import "github.com/aws/aws-sdk-go/service/ecs"
44

‎ecs-cli/modules/cli/compose/project/mock/project.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package mock_project
1818

1919
import (
20-
containerconfig "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
20+
adapter "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
2121
context "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/context"
2222
entity "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/entity"
2323
config "github.com/docker/libcompose/config"
@@ -46,9 +46,9 @@ func (_m *MockProject) EXPECT() *_MockProjectRecorder {
4646
return _m.recorder
4747
}
4848

49-
func (_m *MockProject) ContainerConfigs() []containerconfig.ContainerConfig {
49+
func (_m *MockProject) ContainerConfigs() []adapter.ContainerConfig {
5050
ret := _m.ctrl.Call(_m, "ContainerConfigs")
51-
ret0, _ := ret[0].([]containerconfig.ContainerConfig)
51+
ret0, _ := ret[0].([]adapter.ContainerConfig)
5252
return ret0
5353
}
5454

‎ecs-cli/modules/cli/compose/project/project.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package project
1616
import (
1717
"fmt"
1818

19-
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
19+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
2020
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/context"
2121
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/entity"
2222
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/entity/service"
@@ -37,7 +37,7 @@ type Project interface {
3737

3838
Context() *context.ECSContext
3939
ServiceConfigs() *config.ServiceConfigs
40-
ContainerConfigs() []containerconfig.ContainerConfig // TODO change this to a pointer to slice?
40+
ContainerConfigs() []adapter.ContainerConfig // TODO change this to a pointer to slice?
4141
Entity() entity.ProjectEntity
4242

4343
// commands
@@ -56,7 +56,7 @@ type ecsProject struct {
5656
project.Project
5757

5858
// TODO: use this instead of project.Project
59-
containerConfigs []containerconfig.ContainerConfig
59+
containerConfigs []adapter.ContainerConfig
6060

6161
ecsContext *context.ECSContext
6262

@@ -72,7 +72,7 @@ func NewProject(ecsContext *context.ECSContext) Project {
7272
p := &ecsProject{
7373
ecsContext: ecsContext,
7474
Project: *libcomposeProject,
75-
containerConfigs: []containerconfig.ContainerConfig{},
75+
containerConfigs: []adapter.ContainerConfig{},
7676
}
7777

7878
if ecsContext.IsService {
@@ -104,7 +104,7 @@ func (p *ecsProject) VolumeConfigs() map[string]*config.VolumeConfig {
104104
return p.Project.VolumeConfigs
105105
}
106106

107-
func (p *ecsProject) ContainerConfigs() []containerconfig.ContainerConfig {
107+
func (p *ecsProject) ContainerConfigs() []adapter.ContainerConfig {
108108
return p.containerConfigs
109109
}
110110

‎ecs-cli/modules/cli/compose/project/project_parseV1V2.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package project
22

33
import (
44
"fmt"
5-
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
5+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
66
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils/compose"
77
"github.com/aws/aws-sdk-go/aws"
88
"github.com/docker/libcompose/config"
99
"github.com/docker/libcompose/project"
1010
"github.com/sirupsen/logrus"
1111
)
1212

13-
func (p *ecsProject) parseV1V2() (*[]containerconfig.ContainerConfig, error) {
13+
func (p *ecsProject) parseV1V2() (*[]adapter.ContainerConfig, error) {
1414
logrus.Debug("Parsing v1/2 project...")
1515

1616
// libcompose.Project#Parse populates project information based on its
@@ -31,7 +31,7 @@ func (p *ecsProject) parseV1V2() (*[]containerconfig.ContainerConfig, error) {
3131
serviceConfigs := p.Project.ServiceConfigs
3232

3333
// convert ServiceConfigs to ContainerConfigs
34-
containerConfigs := []containerconfig.ContainerConfig{}
34+
containerConfigs := []adapter.ContainerConfig{}
3535
for _, serviceName := range serviceConfigs.Keys() {
3636
serviceConfig, ok := serviceConfigs.Get(serviceName)
3737
if !ok {
@@ -48,7 +48,7 @@ func (p *ecsProject) parseV1V2() (*[]containerconfig.ContainerConfig, error) {
4848
return &containerConfigs, nil
4949
}
5050

51-
func convertV1V2ToContainerConfig(context *project.Context, serviceName string, volumes *utils.Volumes, service *config.ServiceConfig) (*containerconfig.ContainerConfig, error) {
51+
func convertV1V2ToContainerConfig(context *project.Context, serviceName string, volumes *utils.Volumes, service *config.ServiceConfig) (*adapter.ContainerConfig, error) {
5252

5353
environment := utils.ConvertToKeyValuePairs(context, service.Environment, serviceName)
5454

@@ -92,7 +92,7 @@ func convertV1V2ToContainerConfig(context *project.Context, serviceName string,
9292
return nil, err
9393
}
9494

95-
outputConfig := &containerconfig.ContainerConfig{
95+
outputConfig := &adapter.ContainerConfig{
9696
Name: serviceName,
9797
CapAdd: service.CapAdd,
9898
CapDrop: service.CapDrop,

‎ecs-cli/modules/cli/compose/project/project_parseV1V2_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77
"testing"
88

9-
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
9+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
1010
"github.com/aws/aws-sdk-go/aws"
1111
"github.com/aws/aws-sdk-go/service/ecs"
1212

@@ -455,7 +455,7 @@ services:
455455
assert.Equal(t, expectedEnv, web.Environment, "Expected Environment to match")
456456
}
457457

458-
func getContainerConfigByName(name string, configs *[]containerconfig.ContainerConfig) (*containerconfig.ContainerConfig, error) {
458+
func getContainerConfigByName(name string, configs *[]adapter.ContainerConfig) (*adapter.ContainerConfig, error) {
459459
for _, config := range *configs {
460460
if config.Name == name {
461461
return &config, nil

‎ecs-cli/modules/cli/compose/project/project_parseV3.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"path/filepath"
66
"reflect"
77

8-
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
8+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
99
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils/compose"
1010
"github.com/aws/aws-sdk-go/aws"
1111
"github.com/aws/aws-sdk-go/service/ecs"
@@ -17,7 +17,7 @@ import (
1717
"github.com/docker/libcompose/yaml"
1818
)
1919

20-
func (p *ecsProject) parseV3() (*[]containerconfig.ContainerConfig, error) {
20+
func (p *ecsProject) parseV3() (*[]adapter.ContainerConfig, error) {
2121
log.Debug("Parsing v3 project...")
2222

2323
v3Config, err := getV3Config(p.ecsContext.ComposeFiles)
@@ -26,7 +26,7 @@ func (p *ecsProject) parseV3() (*[]containerconfig.ContainerConfig, error) {
2626
}
2727

2828
// convert ServiceConfigs to ContainerConfigs
29-
conConfigs := []containerconfig.ContainerConfig{}
29+
conConfigs := []adapter.ContainerConfig{}
3030
for _, service := range v3Config.Services {
3131
cCon, err := convertToContainerConfig(service)
3232
if err != nil {
@@ -79,9 +79,9 @@ func getV3Config(composeFiles []string) (*types.Config, error) {
7979
return config, nil
8080
}
8181

82-
func convertToContainerConfig(serviceConfig types.ServiceConfig) (*containerconfig.ContainerConfig, error) {
82+
func convertToContainerConfig(serviceConfig types.ServiceConfig) (*adapter.ContainerConfig, error) {
8383
//TODO: Add Healthcheck, Devices to ContainerConfig
84-
c := &containerconfig.ContainerConfig{
84+
c := &adapter.ContainerConfig{
8585
CapAdd: serviceConfig.CapAdd,
8686
CapDrop: serviceConfig.CapDrop,
8787
Command: serviceConfig.Command,

‎ecs-cli/modules/cli/compose/project/project_parseV3_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"testing"
77

8-
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
8+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
99

1010
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils/compose"
1111
"github.com/aws/aws-sdk-go/aws"
@@ -246,7 +246,7 @@ services:
246246
verifyConvertToContainerConfigOutput(t, expectedConfig, *actualConfig)
247247
}
248248

249-
func verifyConvertToContainerConfigOutput(t *testing.T, expected types.ServiceConfig, actual containerconfig.ContainerConfig) {
249+
func verifyConvertToContainerConfigOutput(t *testing.T, expected types.ServiceConfig, actual adapter.ContainerConfig) {
250250

251251
// verify equivalent fields
252252
assert.Equal(t, expected.CapAdd, actual.CapAdd, "Expected CapAdd to match")

‎ecs-cli/modules/utils/compose/convert_task_definition.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strconv"
2222
"strings"
2323

24-
containers "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
24+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
2525
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/utils"
2626
"github.com/aws/aws-sdk-go/aws"
2727
"github.com/aws/aws-sdk-go/service/ecs"
@@ -107,7 +107,7 @@ type TaskDefParams struct {
107107
// ConvertToTaskDefinition transforms the yaml configs to its ecs equivalent (task definition)
108108
// TODO container config a pointer to slice?
109109
func ConvertToTaskDefinition(context *project.Context, volumeConfigs map[string]*config.VolumeConfig,
110-
containerConfigs []containers.ContainerConfig, taskRoleArn string, requiredCompatibilites string, ecsParams *ECSParams) (*ecs.TaskDefinition, error) {
110+
containerConfigs []adapter.ContainerConfig, taskRoleArn string, requiredCompatibilites string, ecsParams *ECSParams) (*ecs.TaskDefinition, error) {
111111
if len(containerConfigs) == 0 {
112112
return nil, errors.New("cannot create a task definition with no containers; invalid service config")
113113
}
@@ -263,7 +263,7 @@ func isZero(v reflect.Value) bool {
263263

264264
// convertToContainerDef transforms each service in docker-compose.yml and
265265
// ecs-params.yml to an equivalent ECS container definition
266-
func convertToContainerDef(inputCfg *containers.ContainerConfig, ecsContainerDef *ContainerDef) (*ecs.ContainerDefinition, error) {
266+
func convertToContainerDef(inputCfg *adapter.ContainerConfig, ecsContainerDef *ContainerDef) (*ecs.ContainerDefinition, error) {
267267
outputContDef := &ecs.ContainerDefinition{}
268268

269269
mem := inputCfg.Memory

‎ecs-cli/modules/utils/compose/convert_task_definition_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strconv"
2222
"testing"
2323

24-
containers "github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/containerconfig"
24+
"github.com/aws/amazon-ecs-cli/ecs-cli/modules/cli/compose/adapter"
2525
"github.com/aws/aws-sdk-go/aws"
2626
"github.com/aws/aws-sdk-go/service/ecs"
2727
"github.com/docker/libcompose/config"
@@ -45,7 +45,7 @@ var defaultNetwork = &yaml.Network{
4545
}
4646

4747
// TODO Extract test docker file and use in test (to avoid gaps between parse and conversion unit tests)
48-
var testContainerConfig = &containers.ContainerConfig{
48+
var testContainerConfig = &adapter.ContainerConfig{
4949
Name: "mysql",
5050
Command: []string{"cmd"},
5151
CPU: int64(131072),
@@ -252,7 +252,7 @@ func TestConvertToTaskDefinition(t *testing.T) {
252252

253253
// ConvertToContainerDefinition tests
254254
func TestConvertToTaskDefinitionWithNoSharedMemorySize(t *testing.T) {
255-
containerConfig := &containers.ContainerConfig{
255+
containerConfig := &adapter.ContainerConfig{
256256
ShmSize: int64(0),
257257
}
258258

@@ -263,7 +263,7 @@ func TestConvertToTaskDefinitionWithNoSharedMemorySize(t *testing.T) {
263263
}
264264

265265
func TestConvertToTaskDefinitionWithNoTmpfs(t *testing.T) {
266-
containerConfig := &containers.ContainerConfig{
266+
containerConfig := &adapter.ContainerConfig{
267267
Tmpfs: nil,
268268
}
269269

@@ -277,7 +277,7 @@ func TestConvertToTaskDefinitionWithNoTmpfs(t *testing.T) {
277277

278278
// Test Launch Types
279279
func TestConvertToTaskDefinitionLaunchTypeEmpty(t *testing.T) {
280-
containerConfig := &containers.ContainerConfig{}
280+
containerConfig := &adapter.ContainerConfig{}
281281

282282
taskDefinition := convertToTaskDefinitionInTest(t, nil, containerConfig, "", "")
283283
if len(taskDefinition.RequiresCompatibilities) > 0 {
@@ -286,7 +286,7 @@ func TestConvertToTaskDefinitionLaunchTypeEmpty(t *testing.T) {
286286
}
287287

288288
func TestConvertToTaskDefinitionLaunchTypeEC2(t *testing.T) {
289-
containerConfig := &containers.ContainerConfig{}
289+
containerConfig := &adapter.ContainerConfig{}
290290

291291
taskDefinition := convertToTaskDefinitionInTest(t, nil, containerConfig, "", "EC2")
292292
if len(taskDefinition.RequiresCompatibilities) != 1 {
@@ -296,7 +296,7 @@ func TestConvertToTaskDefinitionLaunchTypeEC2(t *testing.T) {
296296
}
297297

298298
func TestConvertToTaskDefinitionLaunchTypeFargate(t *testing.T) {
299-
containerConfig := &containers.ContainerConfig{}
299+
containerConfig := &adapter.ContainerConfig{}
300300

301301
taskDefinition := convertToTaskDefinitionInTest(t, nil, containerConfig, "", "FARGATE")
302302
if len(taskDefinition.RequiresCompatibilities) != 1 {
@@ -306,10 +306,10 @@ func TestConvertToTaskDefinitionLaunchTypeFargate(t *testing.T) {
306306
}
307307

308308
// Test Conversion with ECS Params
309-
func testContainerConfigs(names []string) []containers.ContainerConfig {
310-
containerConfigs := []containers.ContainerConfig{}
309+
func testContainerConfigs(names []string) []adapter.ContainerConfig {
310+
containerConfigs := []adapter.ContainerConfig{}
311311
for _, name := range names {
312-
config := containers.ContainerConfig{Name: name}
312+
config := adapter.ContainerConfig{Name: name}
313313
containerConfigs = append(containerConfigs, config)
314314
}
315315

@@ -775,7 +775,7 @@ func TestMemReservationHigherThanMemLimit(t *testing.T) {
775775
user := "user"
776776
workingDir := "/var"
777777

778-
containerConfig := containers.ContainerConfig{
778+
containerConfig := adapter.ContainerConfig{
779779
CPU: cpu,
780780
Command: []string{command},
781781
Hostname: hostname,
@@ -790,7 +790,7 @@ func TestMemReservationHigherThanMemLimit(t *testing.T) {
790790

791791
volumeConfigs := make(map[string]*config.VolumeConfig)
792792

793-
containerConfigs := []containers.ContainerConfig{containerConfig}
793+
containerConfigs := []adapter.ContainerConfig{containerConfig}
794794

795795
envLookup, err := GetDefaultEnvironmentLookup()
796796
assert.NoError(t, err, "Unexpected error setting up environment lookup")
@@ -1209,11 +1209,11 @@ func TestConvertToVolumes_ErrorsWithExternalSubfield(t *testing.T) {
12091209
assert.Error(t, err, "Expected error converting libcompose volume configs when external is specified")
12101210
}
12111211

1212-
func convertToTaskDefinitionInTest(t *testing.T, volumeConfig *config.VolumeConfig, containerConfig *containers.ContainerConfig, taskRoleArn string, launchType string) *ecs.TaskDefinition {
1212+
func convertToTaskDefinitionInTest(t *testing.T, volumeConfig *config.VolumeConfig, containerConfig *adapter.ContainerConfig, taskRoleArn string, launchType string) *ecs.TaskDefinition {
12131213
volumeConfigs := make(map[string]*config.VolumeConfig)
12141214
volumeConfigs[namedVolume] = volumeConfig
12151215

1216-
containerConfigs := []containers.ContainerConfig{}
1216+
containerConfigs := []adapter.ContainerConfig{}
12171217
containerConfigs = append(containerConfigs, *containerConfig)
12181218

12191219
envLookup, err := GetDefaultEnvironmentLookup()
@@ -1237,7 +1237,7 @@ func convertToTaskDefinitionInTest(t *testing.T, volumeConfig *config.VolumeConf
12371237
return taskDefinition
12381238
}
12391239

1240-
func convertToTaskDefWithEcsParamsInTest(t *testing.T, volumeConfig *config.VolumeConfig, containerConfigs []containers.ContainerConfig, taskRoleArn string, ecsParams *ECSParams) (*ecs.TaskDefinition, error) {
1240+
func convertToTaskDefWithEcsParamsInTest(t *testing.T, volumeConfig *config.VolumeConfig, containerConfigs []adapter.ContainerConfig, taskRoleArn string, ecsParams *ECSParams) (*ecs.TaskDefinition, error) {
12411241
volumeConfigs := make(map[string]*config.VolumeConfig)
12421242
if volumeConfig != nil {
12431243
volumeConfigs[namedVolume] = volumeConfig
@@ -1273,7 +1273,7 @@ func findContainerByName(name string, containerDefs []*ecs.ContainerDefinition)
12731273
}
12741274

12751275
func TestIsZeroForEmptyConfig(t *testing.T) {
1276-
containerConfig := &containers.ContainerConfig{}
1276+
containerConfig := &adapter.ContainerConfig{}
12771277

12781278
configValue := reflect.ValueOf(containerConfig).Elem()
12791279
configType := configValue.Type()
@@ -1303,7 +1303,7 @@ func TestIsZeroWhenConfigHasValues(t *testing.T) {
13031303
"WorkingDirectory": true,
13041304
}
13051305

1306-
containerConfig := &containers.ContainerConfig{
1306+
containerConfig := &adapter.ContainerConfig{
13071307
CPU: int64(10),
13081308
Command: []string{"cmd"},
13091309
Hostname: "foobarbaz",

0 commit comments

Comments
 (0)