lint

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

Author: ndeloof

internal/commands/build/build.go

@@ -38,7 +38,7 @@ type buildOptions struct {
 	out      string
 }
 
-func BuildCmd(dockerCli command.Cli) *cobra.Command {
+func Cmd(dockerCli command.Cli) *cobra.Command {
 	var opts buildOptions
 	cmd := &cobra.Command{
 		Use:     "build [APPLICATION]",
@@ -124,8 +124,27 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 	}
 
 	fmt.Println("Successfully built service images")
-	debugSolveResponses(resp)
+	updateBundle(bundle, resp)
+
+	var ref reference.Named
+	ref, err = packager.GetNamedTagged(opt.tag)
+	if err != nil {
+		return nil, err
+	}
+	if ref == nil {
+		if ref, err = computeDigest(bundle); err != nil {
+			return nil, err
+		}
+	}
+
+	if err = persistBundle(opt, bundle, ref); err != nil {
+		return nil, err
+	}
+	return ref, nil
+}
 
+func updateBundle(bundle *bundle.Bundle, resp map[string]*client.SolveResponse) {
+	debugSolveResponses(resp)
 	for service, r := range resp {
 		digest := r.ExporterResponse["containerimage.digest"]
 		if service == "invocation-image" {
@@ -137,39 +156,33 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 			image.Digest = digest
 			bundle.Images[service] = image
 		}
-		fmt.Fprintf(dockerCli.Out(), "    - %s : %s\n", service, digest)
 	}
 	debugBundle(bundle)
+}
 
-	var ref reference.Named
-	ref, err = packager.GetNamedTagged(opt.tag)
-	if err != nil {
-		return nil, err
-	}
-	if ref == nil {
-		if ref, err = computeDigest(bundle); err != nil {
-			return nil, err
-		}
-	}
-
+func persistBundle(opt buildOptions, bndl *bundle.Bundle, ref reference.Named) error {
 	if opt.out != "" {
-		b, err := json.MarshalIndent(bundle, "", "  ")
+		b, err := json.MarshalIndent(bndl, "", "  ")
 		if err != nil {
-			return ref, err
+			return err
 		}
 		if opt.out == "-" {
 			_, err = os.Stdout.Write(b)
+			if err != nil {
+				return err
+			}
 		} else {
 			err = ioutil.WriteFile(opt.out, b, 0644)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		if err := packager.PersistInBundleStore(ref, bndl); err != nil {
+			return err
 		}
-		return ref, err
-	}
-
-	if err := packager.PersistInBundleStore(ref, bundle); err != nil {
-		return ref, err
 	}
-
-	return ref, nil
+	return nil
 }
 
 func createInvocationImageBuildOptions(dockerCli command.Cli, app *types.App) (build.Options, error) {

internal/commands/build/compose.go

@@ -26,7 +26,7 @@ func parseCompose(app *types.App, options buildOptions) (map[string]build.Option
 		return nil, fmt.Errorf("Failed to parse compose file: %s", err)
 	}
 
-	var zeroBuildConfig BuildConfig
+	var zeroBuildConfig ImageBuildConfig
 	opts := map[string]build.Options{}
 	for _, service := range services {
 		if reflect.DeepEqual(service.Build, zeroBuildConfig) {

internal/commands/build/types.go

@@ -14,10 +14,10 @@ import (
 type ServiceConfig struct {
 	Name string `yaml:"-" json:"-"`
 
-	Build BuildConfig
+	Build ImageBuildConfig
 }
 
-type BuildConfig struct {
+type ImageBuildConfig struct {
 	Context    string                    `yaml:",omitempty" json:"context,omitempty"`
 	Dockerfile string                    `yaml:",omitempty" json:"dockerfile,omitempty"`
 	Args       compose.MappingWithEquals `yaml:",omitempty" json:"args,omitempty"`
@@ -51,7 +51,7 @@ func LoadServices(servicesDict map[string]interface{}) ([]ServiceConfig, error)
 func LoadService(name string, serviceDict map[string]interface{}) (*ServiceConfig, error) {
 	serviceConfig := &ServiceConfig{}
 	if err := loader.Transform(serviceDict, serviceConfig, loader.Transformer{
-		TypeOf: reflect.TypeOf(BuildConfig{}),
+		TypeOf: reflect.TypeOf(ImageBuildConfig{}),
 		Func:   transformBuildConfig,
 	}); err != nil {
 		return nil, err

internal/commands/root.go

@@ -61,7 +61,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		pushCmd(dockerCli),
 		pullCmd(dockerCli),
 		image.Cmd(dockerCli),
-		build.BuildCmd(dockerCli),
+		build.Cmd(dockerCli),
 	)
 }