Split project package into project, config, and yaml packages

Signed-off-by: Josh Curl <hello@joshcurl.com>

Author: joshwget

project/hash.go config/hash.goproject/hash.go renamed to config/hash.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import (
 	"crypto/sha1"
@@ -7,6 +7,8 @@ import (
 	"io"
 	"reflect"
 	"sort"
+
+	"github.com/docker/libcompose/yaml"
 )
 
 // GetServiceHash computes and returns a hash that will identify a service.
@@ -45,7 +47,7 @@ func GetServiceHash(name string, config *ServiceConfig) string {
 		io.WriteString(hash, fmt.Sprintf("\n  %v: ", serviceKey))
 
 		switch s := serviceValue.(type) {
-		case SliceorMap:
+		case yaml.SliceorMap:
 			sliceKeys := []string{}
 			for lkey := range s.MapParts() {
 				sliceKeys = append(sliceKeys, lkey)
@@ -55,35 +57,35 @@ func GetServiceHash(name string, config *ServiceConfig) string {
 			for _, sliceKey := range sliceKeys {
 				io.WriteString(hash, fmt.Sprintf("%s=%v, ", sliceKey, s.MapParts()[sliceKey]))
 			}
-		case MaporEqualSlice:
+		case yaml.MaporEqualSlice:
 			sliceKeys := s.Slice()
 			// do not sort keys as the order matters
 
 			for _, sliceKey := range sliceKeys {
 				io.WriteString(hash, fmt.Sprintf("%s, ", sliceKey))
 			}
-		case MaporColonSlice:
+		case yaml.MaporColonSlice:
 			sliceKeys := s.Slice()
 			// do not sort keys as the order matters
 
 			for _, sliceKey := range sliceKeys {
 				io.WriteString(hash, fmt.Sprintf("%s, ", sliceKey))
 			}
-		case MaporSpaceSlice:
+		case yaml.MaporSpaceSlice:
 			sliceKeys := s.Slice()
 			// do not sort keys as the order matters
 
 			for _, sliceKey := range sliceKeys {
 				io.WriteString(hash, fmt.Sprintf("%s, ", sliceKey))
 			}
-		case Command:
+		case yaml.Command:
 			sliceKeys := s.Slice()
 			// do not sort keys as the order matters
 
 			for _, sliceKey := range sliceKeys {
 				io.WriteString(hash, fmt.Sprintf("%s, ", sliceKey))
 			}
-		case Stringorslice:
+		case yaml.Stringorslice:
 			sliceKeys := s.Slice()
 			sort.Strings(sliceKeys)
 

project/interpolation.go config/interpolation.goproject/interpolation.go renamed to config/interpolation.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import (
 	"bytes"

project/interpolation_test.go config/interpolation_test.goproject/interpolation_test.go renamed to config/interpolation_test.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import (
 	"fmt"

config/marshal_config_test.go

@@ -0,0 +1,88 @@
+package config
+
+import (
+	"testing"
+
+	yaml "github.com/cloudfoundry-incubator/candiedyaml"
+	yamlTypes "github.com/docker/libcompose/yaml"
+	"github.com/stretchr/testify/assert"
+)
+
+type TestConfig struct {
+	SystemContainers map[string]*ServiceConfig
+}
+
+func newTestConfig() TestConfig {
+	return TestConfig{
+		SystemContainers: map[string]*ServiceConfig{
+			"udev": {
+				Image:      "udev",
+				Restart:    "always",
+				Net:        "host",
+				Privileged: true,
+				DNS:        yamlTypes.NewStringorslice("8.8.8.8", "8.8.4.4"),
+				Environment: yamlTypes.NewMaporEqualSlice([]string{
+					"DAEMON=true",
+				}),
+				Labels: yamlTypes.NewSliceorMap(map[string]string{
+					"io.rancher.os.detach": "true",
+					"io.rancher.os.scope":  "system",
+				}),
+				VolumesFrom: []string{
+					"system-volumes",
+				},
+				Ulimits: yamlTypes.Ulimits{
+					Elements: []yamlTypes.Ulimit{
+						yamlTypes.NewUlimit("nproc", 65557, 65557),
+					},
+				},
+			},
+			"system-volumes": {
+				Image:      "state",
+				Net:        "none",
+				ReadOnly:   true,
+				Privileged: true,
+				Labels: yamlTypes.NewSliceorMap(map[string]string{
+					"io.rancher.os.createonly": "true",
+					"io.rancher.os.scope":      "system",
+				}),
+				Volumes: []string{
+					"/dev:/host/dev",
+					"/var/lib/rancher/conf:/var/lib/rancher/conf",
+					"/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher",
+					"/lib/modules:/lib/modules",
+					"/lib/firmware:/lib/firmware",
+					"/var/run:/var/run",
+					"/var/log:/var/log",
+				},
+				LogDriver: "json-file",
+			},
+		},
+	}
+}
+
+func TestMarshalConfig(t *testing.T) {
+	config := newTestConfig()
+	bytes, err := yaml.Marshal(config)
+	assert.Nil(t, err)
+
+	config2 := TestConfig{}
+
+	err = yaml.Unmarshal(bytes, &config2)
+	assert.Nil(t, err)
+
+	assert.Equal(t, config, config2)
+}
+
+func TestMarshalServiceConfig(t *testing.T) {
+	configPtr := newTestConfig().SystemContainers["udev"]
+	bytes, err := yaml.Marshal(configPtr)
+	assert.Nil(t, err)
+
+	configPtr2 := &ServiceConfig{}
+
+	err = yaml.Unmarshal(bytes, configPtr2)
+	assert.Nil(t, err)
+
+	assert.Equal(t, configPtr, configPtr2)
+}

project/merge.go config/merge.goproject/merge.go renamed to config/merge.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import (
 	"bufio"
@@ -28,21 +28,16 @@ var (
 	}
 )
 
-// RawService is represent a Service in map form unparsed
-type RawService map[string]interface{}
-
-// RawServiceMap is a collection of RawServices
-type RawServiceMap map[string]RawService
-
-func mergeProject(p *Project, file string, bytes []byte) (map[string]*ServiceConfig, error) {
+// MergeServices merges a compose file into an existing set of service configs
+func MergeServices(existingServices *Configs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, bytes []byte) (map[string]*ServiceConfig, error) {
 	configs := make(map[string]*ServiceConfig)
 
 	datas := make(RawServiceMap)
 	if err := yaml.Unmarshal(bytes, &datas); err != nil {
 		return nil, err
 	}
 
-	if err := Interpolate(p.context.EnvironmentLookup, &datas); err != nil {
+	if err := Interpolate(environmentLookup, &datas); err != nil {
 		return nil, err
 	}
 
@@ -51,13 +46,13 @@ func mergeProject(p *Project, file string, bytes []byte) (map[string]*ServiceCon
 	}
 
 	for name, data := range datas {
-		data, err := parse(p.context.ResourceLookup, p.context.EnvironmentLookup, file, data, datas)
+		data, err := parse(resourceLookup, environmentLookup, file, data, datas)
 		if err != nil {
 			logrus.Errorf("Failed to parse service %s: %v", name, err)
 			return nil, err
 		}
 
-		if serviceConfig, ok := p.Configs.Get(name); ok {
+		if serviceConfig, ok := existingServices.Get(name); ok {
 			var rawExistingService RawService
 			if err := utils.Convert(serviceConfig, &rawExistingService); err != nil {
 				return nil, err

project/merge_test.go config/merge_test.goproject/merge_test.go renamed to config/merge_test.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import "testing"
 
@@ -14,11 +14,7 @@ func (n *NullLookup) ResolvePath(path, inFile string) string {
 }
 
 func TestExtendsInheritImage(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 parent:
   image: foo
 child:
@@ -47,11 +43,7 @@ child:
 }
 
 func TestExtendsInheritBuild(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 parent:
   build: .
 child:
@@ -80,11 +72,7 @@ child:
 }
 
 func TestExtendBuildOverImage(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 parent:
   image: foo
 child:
@@ -114,11 +102,7 @@ child:
 }
 
 func TestExtendImageOverBuild(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 parent:
   build: .
 child:
@@ -152,11 +136,7 @@ child:
 }
 
 func TestRestartNo(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 test:
   restart: "no"
   image: foo
@@ -174,11 +154,7 @@ test:
 }
 
 func TestRestartAlways(t *testing.T) {
-	p := NewProject(&Context{
-		ResourceLookup: &NullLookup{},
-	})
-
-	config, err := mergeProject(p, "", []byte(`
+	config, err := MergeServices(NewConfigs(), nil, &NullLookup{}, "", []byte(`
 test:
   restart: always
   image: foo

project/schema.go config/schema.goproject/schema.go renamed to config/schema.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 var schemaString = `{
   "$schema": "http://json-schema.org/draft-04/schema#",

project/schema_helpers.go config/schema_helpers.goproject/schema_helpers.go renamed to config/schema_helpers.go

@@ -1,4 +1,4 @@
-package project
+package config
 
 import (
 	"encoding/json"