Code cleanup

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

internal/commands/build/compose.go

@@ -18,7 +18,7 @@ func parseCompose(app *types.App, options buildOptions) (map[string]build.Option
 		return nil, err
 	}
 
-	services, err := Load(parsed)
+	services, err := load(parsed)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to parse compose file: %s", err)
 	}

internal/commands/build/compose_test.go

@@ -1,7 +1,6 @@
 package build
 
 import (
-	"reflect"
 	"testing"
 
 	"github.com/docker/app/internal/packager"
@@ -56,18 +55,11 @@ func Test_parseCompose(t *testing.T) {
 
 			got, err := parseCompose(app, buildOptions{})
 			assert.NilError(t, err)
-			if _, ok := got["dontwant"]; ok {
-				t.Errorf("parseCompose() should have excluded 'dontwant' service")
-				return
-			}
+			_, ok := got["dontwant"]
+			assert.Assert(t, !ok, "parseCompose() should have excluded 'dontwant' service")
 			opt, ok := got[tt.service]
-			if !ok {
-				t.Errorf("parseCompose() error = %s not converted into a build.Options", tt.service)
-				return
-			}
-			if !reflect.DeepEqual(opt, tt.want) {
-				t.Errorf("parseCompose() got = %v, want = %v", opt, tt.want)
-			}
+			assert.Assert(t, ok, "parseCompose() error = %s not converted into a build.Options", tt.service)
+			assert.DeepEqual(t, opt, tt.want)
 		})
 	}
 }

internal/commands/build/types.go

@@ -24,7 +24,7 @@ type ImageBuildConfig struct {
 	Args       compose.MappingWithEquals `yaml:",omitempty" json:"args,omitempty"`
 }
 
-func Load(dict map[string]interface{}) ([]ServiceConfig, error) {
+func load(dict map[string]interface{}) ([]ServiceConfig, error) {
 	section, ok := dict["services"]
 	if !ok {
 		return nil, fmt.Errorf("compose file doesn't declare any service")
@@ -33,14 +33,14 @@ func Load(dict map[string]interface{}) ([]ServiceConfig, error) {
 	if !ok {
 		return nil, fmt.Errorf("Invalid compose file: 'services' should be a map")
 	}
-	return LoadServices(services)
+	return loadServices(services)
 }
 
-func LoadServices(servicesDict map[string]interface{}) ([]ServiceConfig, error) {
+func loadServices(servicesDict map[string]interface{}) ([]ServiceConfig, error) {
 	var services []ServiceConfig
 
 	for name, serviceDef := range servicesDict {
-		serviceConfig, err := LoadService(name, serviceDef.(map[string]interface{}))
+		serviceConfig, err := loadService(name, serviceDef.(map[string]interface{}))
 		if err != nil {
 			return nil, err
 		}
@@ -49,15 +49,14 @@ func LoadServices(servicesDict map[string]interface{}) ([]ServiceConfig, error)
 	return services, nil
 }
 
-func LoadService(name string, serviceDict map[string]interface{}) (*ServiceConfig, error) {
-	serviceConfig := &ServiceConfig{}
+func loadService(name string, serviceDict map[string]interface{}) (*ServiceConfig, error) {
+	serviceConfig := &ServiceConfig{Name: name}
 	if err := loader.Transform(serviceDict, serviceConfig, loader.Transformer{
 		TypeOf: reflect.TypeOf(ImageBuildConfig{}),
 		Func:   transformBuildConfig,
 	}); err != nil {
 		return nil, err
 	}
-	serviceConfig.Name = name
 	return serviceConfig, nil
 }