Create config separately

Signed-off-by: rajashree <[email protected]>

Author: mrajashree

config/merge.go

@@ -23,36 +23,55 @@ var (
 	}
 )
 
+// CreateConfig unmarshals bytes to config and creates config based on version
+func CreateConfig(bytes []byte) (*Config, error) {
+	var config Config
+	if err := yaml.Unmarshal(bytes, &config); err != nil {
+		return nil, err
+	}
+	if config.Version == "2" {
+		for key, value := range config.Networks {
+			if value == nil {
+				config.Networks[key] = &NetworkConfig{}
+			}
+		}
+		for key, value := range config.Volumes {
+			if value == nil {
+				config.Volumes[key] = &VolumeConfig{}
+			}
+		}
+	} else {
+		var baseRawServices RawServiceMap
+		if err := yaml.Unmarshal(bytes, &baseRawServices); err != nil {
+			return nil, err
+		}
+		config.Services = baseRawServices
+	}
+
+	return &config, nil
+}
+
 // Merge merges a compose file into an existing set of service configs
 func Merge(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, bytes []byte, options *ParseOptions) (string, map[string]*ServiceConfig, map[string]*VolumeConfig, map[string]*NetworkConfig, error) {
 	if options == nil {
 		options = &defaultParseOptions
 	}
 
-	var config Config
-	if err := yaml.Unmarshal(bytes, &config); err != nil {
+	config, err := CreateConfig(bytes)
+	if err != nil {
 		return "", nil, nil, nil, err
 	}
+	baseRawServices := config.Services
 
 	var serviceConfigs map[string]*ServiceConfig
-	var volumeConfigs map[string]*VolumeConfig
-	var networkConfigs map[string]*NetworkConfig
 	if config.Version == "2" {
 		var err error
-		serviceConfigs, err = MergeServicesV2(existingServices, environmentLookup, resourceLookup, file, bytes, options)
-		if err != nil {
-			return "", nil, nil, nil, err
-		}
-		volumeConfigs, err = ParseVolumes(bytes)
-		if err != nil {
-			return "", nil, nil, nil, err
-		}
-		networkConfigs, err = ParseNetworks(bytes)
+		serviceConfigs, err = MergeServicesV2(existingServices, environmentLookup, resourceLookup, file, baseRawServices, options)
 		if err != nil {
 			return "", nil, nil, nil, err
 		}
 	} else {
-		serviceConfigsV1, err := MergeServicesV1(existingServices, environmentLookup, resourceLookup, file, bytes, options)
+		serviceConfigsV1, err := MergeServicesV1(existingServices, environmentLookup, resourceLookup, file, baseRawServices, options)
 		if err != nil {
 			return "", nil, nil, nil, err
 		}
@@ -72,7 +91,7 @@ func Merge(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup
 		}
 	}
 
-	return config.Version, serviceConfigs, volumeConfigs, networkConfigs, nil
+	return config.Version, serviceConfigs, config.Volumes, config.Networks, nil
 }
 
 func adjustValues(configs map[string]*ServiceConfig) {

config/merge_test.go

@@ -406,15 +406,17 @@ services:
 	}
 }
 
-func TestParseNetworks(t *testing.T) {
-	composeFile := []byte(`networks:
+func TestNilNetworks(t *testing.T) {
+	composeFile := []byte(`
+version: '2'
+networks:
   public:`)
 
-	networkConfigs, err := ParseNetworks(composeFile)
+	config, err := CreateConfig(composeFile)
 	if err != nil {
 		t.Fatal(err)
 	}
-	for key, networkConfig := range networkConfigs {
+	for key, networkConfig := range config.Networks {
 		if networkConfig == nil {
 			t.Fatalf("networkConfig %s was nil, shouldn't be", key)
 		}

config/merge_v1.go

@@ -6,16 +6,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/utils"
-	"gopkg.in/yaml.v2"
 )
 
 // MergeServicesV1 merges a v1 compose file into an existing set of service configs
-func MergeServicesV1(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, bytes []byte, options *ParseOptions) (map[string]*ServiceConfigV1, error) {
-	datas := make(RawServiceMap)
-	if err := yaml.Unmarshal(bytes, &datas); err != nil {
-		return nil, err
-	}
-
+func MergeServicesV1(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, datas RawServiceMap, options *ParseOptions) (map[string]*ServiceConfigV1, error) {
 	if options.Interpolate {
 		if err := Interpolate(environmentLookup, &datas); err != nil {
 			return nil, err
@@ -116,10 +110,11 @@ func parseV1(resourceLookup ResourceLookup, environmentLookup EnvironmentLookup,
 			return nil, err
 		}
 
-		var baseRawServices RawServiceMap
-		if err := yaml.Unmarshal(bytes, &baseRawServices); err != nil {
+		config, err := CreateConfig(bytes)
+		if err != nil {
 			return nil, err
 		}
+		baseRawServices := config.Services
 
 		if options.Interpolate {
 			err = Interpolate(environmentLookup, &baseRawServices)

config/merge_v2.go

@@ -6,18 +6,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/utils"
-	"gopkg.in/yaml.v2"
 )
 
 // MergeServicesV2 merges a v2 compose file into an existing set of service configs
-func MergeServicesV2(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, bytes []byte, options *ParseOptions) (map[string]*ServiceConfig, error) {
-	var config Config
-	if err := yaml.Unmarshal(bytes, &config); err != nil {
-		return nil, err
-	}
-
-	datas := config.Services
-
+func MergeServicesV2(existingServices *ServiceConfigs, environmentLookup EnvironmentLookup, resourceLookup ResourceLookup, file string, datas RawServiceMap, options *ParseOptions) (map[string]*ServiceConfig, error) {
 	if options.Interpolate {
 		if err := Interpolate(environmentLookup, &datas); err != nil {
 			return nil, err
@@ -65,44 +57,6 @@ func MergeServicesV2(existingServices *ServiceConfigs, environmentLookup Environ
 	return serviceConfigs, nil
 }
 
-// ParseVolumes parses volumes in a compose file
-func ParseVolumes(bytes []byte) (map[string]*VolumeConfig, error) {
-	volumeConfigs := make(map[string]*VolumeConfig)
-
-	var config Config
-	if err := yaml.Unmarshal(bytes, &config); err != nil {
-		return nil, err
-	}
-
-	if err := utils.Convert(config.Volumes, &volumeConfigs); err != nil {
-		return nil, err
-	}
-
-	return volumeConfigs, nil
-}
-
-// ParseNetworks parses networks in a compose file
-func ParseNetworks(bytes []byte) (map[string]*NetworkConfig, error) {
-	networkConfigs := make(map[string]*NetworkConfig)
-
-	var config Config
-	if err := yaml.Unmarshal(bytes, &config); err != nil {
-		return nil, err
-	}
-
-	if err := utils.Convert(config.Networks, &networkConfigs); err != nil {
-		return nil, err
-	}
-
-	for key, value := range networkConfigs {
-		if value == nil {
-			networkConfigs[key] = &NetworkConfig{}
-		}
-	}
-
-	return networkConfigs, nil
-}
-
 func parseV2(resourceLookup ResourceLookup, environmentLookup EnvironmentLookup, inFile string, serviceData RawService, datas RawServiceMap, options *ParseOptions) (RawService, error) {
 	serviceData, err := readEnvFile(resourceLookup, inFile, serviceData)
 	if err != nil {
@@ -147,11 +101,10 @@ func parseV2(resourceLookup ResourceLookup, environmentLookup EnvironmentLookup,
 			return nil, err
 		}
 
-		var config Config
-		if err := yaml.Unmarshal(bytes, &config); err != nil {
+		config, err := CreateConfig(bytes)
+		if err != nil {
 			return nil, err
 		}
-
 		baseRawServices := config.Services
 
 		if options.Interpolate {