extract ContainerSpec from ServiceConfig

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

graph/graph_test.go

@@ -31,8 +31,10 @@ import (
 
 func TestTraversalWithMultipleParents(t *testing.T) {
 	dependent := types.ServiceConfig{
-		Name:      "dependent",
-		DependsOn: make(types.DependsOnConfig),
+		Name: "dependent",
+		ContainerSpec: types.ContainerSpec{
+			DependsOn: make(types.DependsOnConfig),
+		},
 	}
 
 	project := types.Project{
@@ -119,8 +121,10 @@ func TestBuildGraph(t *testing.T) {
 			desc: "builds graph with single service",
 			services: types.Services{
 				"test": {
-					Name:      "test",
-					DependsOn: types.DependsOnConfig{},
+					Name: "test",
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 			},
 			expectedVertices: map[string]*vertex[types.ServiceConfig]{
@@ -136,12 +140,16 @@ func TestBuildGraph(t *testing.T) {
 			desc: "builds graph with two separate services",
 			services: types.Services{
 				"test": {
-					Name:      "test",
-					DependsOn: types.DependsOnConfig{},
+					Name: "test",
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 				"another": {
-					Name:      "another",
-					DependsOn: types.DependsOnConfig{},
+					Name: "another",
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 			},
 			expectedVertices: map[string]*vertex[types.ServiceConfig]{
@@ -164,13 +172,17 @@ func TestBuildGraph(t *testing.T) {
 			services: types.Services{
 				"test": {
 					Name: "test",
-					DependsOn: types.DependsOnConfig{
-						"another": types.ServiceDependency{},
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another": types.ServiceDependency{},
+						},
 					},
 				},
 				"another": {
-					Name:      "another",
-					DependsOn: types.DependsOnConfig{},
+					Name: "another",
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 			},
 			expectedVertices: map[string]*vertex[types.ServiceConfig]{
@@ -197,9 +209,11 @@ func TestBuildGraph(t *testing.T) {
 			services: types.Services{
 				"test": {
 					Name: "test",
-					DependsOn: types.DependsOnConfig{
-						"another": types.ServiceDependency{
-							Required: false,
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another": types.ServiceDependency{
+								Required: false,
+							},
 						},
 					},
 				},
@@ -218,9 +232,11 @@ func TestBuildGraph(t *testing.T) {
 			services: types.Services{
 				"test": {
 					Name: "test",
-					DependsOn: types.DependsOnConfig{
-						"another": types.ServiceDependency{
-							Required: true,
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another": types.ServiceDependency{
+								Required: true,
+							},
 						},
 					},
 				},
@@ -232,18 +248,22 @@ func TestBuildGraph(t *testing.T) {
 			services: types.Services{
 				"test": {
 					Name: "test",
-					DependsOn: types.DependsOnConfig{
-						"another": types.ServiceDependency{
-							Required: true,
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another": types.ServiceDependency{
+								Required: true,
+							},
 						},
 					},
 				},
 			},
 			disabled: types.Services{
 				"another": {
-					Name:      "another",
-					Profiles:  []string{"test"},
-					DependsOn: types.DependsOnConfig{},
+					Name:     "another",
+					Profiles: []string{"test"},
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 			},
 			expectedError: `service "another" is required by "test" but is disabled. Can be enabled by profiles [test]`,
@@ -253,19 +273,25 @@ func TestBuildGraph(t *testing.T) {
 			services: types.Services{
 				"test": {
 					Name: "test",
-					DependsOn: types.DependsOnConfig{
-						"another": types.ServiceDependency{},
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another": types.ServiceDependency{},
+						},
 					},
 				},
 				"another": {
 					Name: "another",
-					DependsOn: types.DependsOnConfig{
-						"another_dep": types.ServiceDependency{},
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{
+							"another_dep": types.ServiceDependency{},
+						},
 					},
 				},
 				"another_dep": {
-					Name:      "another_dep",
-					DependsOn: types.DependsOnConfig{},
+					Name: "another_dep",
+					ContainerSpec: types.ContainerSpec{
+						DependsOn: types.DependsOnConfig{},
+					},
 				},
 			},
 			expectedVertices: map[string]*vertex[types.ServiceConfig]{
@@ -435,14 +461,18 @@ func exampleProject() *types.Project {
 		Services: types.Services{
 			"test1": {
 				Name: "test1",
-				DependsOn: map[string]types.ServiceDependency{
-					"test2": {},
+				ContainerSpec: types.ContainerSpec{
+					DependsOn: map[string]types.ServiceDependency{
+						"test2": {},
+					},
 				},
 			},
 			"test2": {
 				Name: "test2",
-				DependsOn: map[string]types.ServiceDependency{
-					"test3": {},
+				ContainerSpec: types.ContainerSpec{
+					DependsOn: map[string]types.ServiceDependency{
+						"test3": {},
+					},
 				},
 			},
 			"test3": {

loader/include_test.go

@@ -90,10 +90,12 @@ services:
 	})
 	assert.NilError(t, err)
 	assert.DeepEqual(t, p.Services["bar"], types.ServiceConfig{
-		Name:  "bar",
-		Image: "busybox",
-		Environment: types.MappingWithEquals{
-			"ZOT": strPtr("QIX"),
+		Name: "bar",
+		ContainerSpec: types.ContainerSpec{
+			Image: "busybox",
+			Environment: types.MappingWithEquals{
+				"ZOT": strPtr("QIX"),
+			},
 		},
 	})
 }

loader/loader.go

@@ -777,6 +777,7 @@ func Transform(source interface{}, target interface{}) error {
 		),
 		Result:   target,
 		TagName:  "yaml",
+		Squash:   true,
 		Metadata: &data,
 	}
 	decoder, err := mapstructure.NewDecoder(config)