[devbox] rm, add, and build flags (#2473)

## Summary
Implement a few improvements to the devbox CLI:
- `add` command now removes duplicates
- New `rm` command to remove a package
- `build` now accepts a `--no-cache` flag

## How was it tested?
Rebuilt and tested on example project

## Is this change backwards-compatible?
Yes

Author: loreto

BUILD.bazel

@@ -20,5 +20,6 @@ go_library(
         "//opensource/devbox/nix",
         "//opensource/devbox/planner",
         "@com_github_pkg_errors//:errors",
+        "@com_github_samber_lo//:lo",
     ],
 )

boxcli/BUILD.bazel

@@ -9,13 +9,15 @@ go_library(
         "generate.go",
         "init.go",
         "plan.go",
+        "rm.go",
         "root.go",
         "shell.go",
     ],
     importpath = "go.jetpack.io/axiom/opensource/devbox/boxcli",
     visibility = ["//visibility:public"],
     deps = [
         "//opensource/devbox",
+        "//opensource/devbox/docker",
         "@com_github_pkg_errors//:errors",
         "@com_github_spf13_cobra//:cobra",
     ],

boxcli/build.go

@@ -4,25 +4,36 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"go.jetpack.io/axiom/opensource/devbox"
+	"go.jetpack.io/axiom/opensource/devbox/docker"
 )
 
 func BuildCmd() *cobra.Command {
+	flags := &docker.BuildFlags{}
+
 	command := &cobra.Command{
 		Use:  "build [<dir>]",
 		Args: cobra.MaximumNArgs(1),
-		RunE: runBuildCmd,
+		RunE: buildCmdFunc(flags),
 	}
+
+	command.Flags().BoolVar(
+		&flags.NoCache, "no-cache", false, "Do not use a cache")
+
 	return command
 }
 
-func runBuildCmd(cmd *cobra.Command, args []string) error {
-	path := pathArg(args)
+type runFunc func(cmd *cobra.Command, args []string) error
 
-	// Check the directory exists.
-	box, err := devbox.Open(path)
-	if err != nil {
-		return errors.WithStack(err)
-	}
+func buildCmdFunc(flags *docker.BuildFlags) runFunc {
+	return func(cmd *cobra.Command, args []string) error {
+		path := pathArg(args)
+
+		// Check the directory exists.
+		box, err := devbox.Open(path)
+		if err != nil {
+			return errors.WithStack(err)
+		}
 
-	return box.Build()
+		return box.Build(docker.WithFlags(flags))
+	}
 }

boxcli/rm.go

@@ -0,0 +1,25 @@
+package boxcli
+
+import (
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"go.jetpack.io/axiom/opensource/devbox"
+)
+
+func RemoveCmd() *cobra.Command {
+	command := &cobra.Command{
+		Use:  "rm <pkg>...",
+		Args: cobra.MinimumNArgs(1),
+		RunE: runRemoveCmd,
+	}
+	return command
+}
+
+func runRemoveCmd(cmd *cobra.Command, args []string) error {
+	box, err := devbox.Open(".")
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	return box.Remove(args...)
+}

boxcli/root.go

@@ -22,6 +22,7 @@ func RootCmd() *cobra.Command {
 	command.AddCommand(BuildCmd())
 	command.AddCommand(GenerateCmd())
 	command.AddCommand(PlanCmd())
+	command.AddCommand(RemoveCmd())
 	command.AddCommand(InitCmd())
 	command.AddCommand(ShellCmd())
 	return command

devbox.go

@@ -4,6 +4,7 @@ import (
 	"path/filepath"
 
 	"github.com/pkg/errors"
+	"github.com/samber/lo"
 	"go.jetpack.io/axiom/opensource/devbox/cuecfg"
 	"go.jetpack.io/axiom/opensource/devbox/docker"
 	"go.jetpack.io/axiom/opensource/devbox/nix"
@@ -38,25 +39,40 @@ func Open(dir string) (*Devbox, error) {
 }
 
 func (d *Devbox) Add(pkgs ...string) error {
+	// Check packages exist before adding.
 	for _, pkg := range pkgs {
 		ok := nix.PkgExists(pkg)
 		if !ok {
 			return errors.Errorf("Package %s not found.", pkg)
 		}
 	}
-	// TODO: detect duplicates
-	d.cfg.Packages = append(d.cfg.Packages, pkgs...)
+	// Merge and remove duplicates:
+	merged := append(d.cfg.Packages, pkgs...)
+	d.cfg.Packages = lo.FindUniques(merged)
+
+	// Save config.
 	return d.saveCfg()
 }
 
-func (d *Devbox) Build() error {
+func (d *Devbox) Remove(pkgs ...string) error {
+	// Remove packages from config.
+	d.cfg.Packages = lo.Without(d.cfg.Packages, pkgs...)
+
+	// Save config.
+	return d.saveCfg()
+}
+
+func (d *Devbox) Build(opts ...docker.BuildOptions) error {
+	defaultFlags := &docker.BuildFlags{
+		Name: "devbox",
+	}
+	opts = append([]docker.BuildOptions{docker.WithFlags(defaultFlags)}, opts...)
+
 	err := d.Generate()
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	return docker.Build(d.srcDir, docker.BuildOpts{
-		Name: "devbox", // TODO: make it configurable.
-	})
+	return docker.Build(d.srcDir, opts...)
 }
 
 func (d *Devbox) Plan() *planner.BuildPlan {

docker/BUILD.bazel

@@ -8,4 +8,5 @@ go_library(
     ],
     importpath = "go.jetpack.io/axiom/opensource/devbox/docker",
     visibility = ["//visibility:public"],
+    deps = ["@com_github_imdario_mergo//:mergo"],
 )

docker/args.go

@@ -5,17 +5,27 @@ import (
 	"strings"
 )
 
-func ToArgs(args []string, opts BuildOpts) []string {
-	if opts.Name != "" {
-		args = append(args, "-t", opts.Name)
+func ToArgs(args []string, flags *BuildFlags) []string {
+	if flags == nil {
+		return args
+	}
+	if args == nil {
+		args = []string{}
+	}
+	if flags.Name != "" {
+		args = append(args, "-t", flags.Name)
 
-		for _, tag := range opts.Tags {
-			args = append(args, "-t", fmt.Sprintf("%s:%s", opts.Name, tag))
+		for _, tag := range flags.Tags {
+			args = append(args, "-t", fmt.Sprintf("%s:%s", flags.Name, tag))
 		}
 	}
 
-	if len(opts.Platforms) > 0 {
-		args = append(args, fmt.Sprintf("--platform=%s", strings.Join(opts.Platforms, ",")))
+	if len(flags.Platforms) > 0 {
+		args = append(args, fmt.Sprintf("--platform=%s", strings.Join(flags.Platforms, ",")))
+	}
+
+	if flags.NoCache {
+		args = append(args, "--no-cache")
 	}
 
 	return args

docker/docker.go

@@ -4,6 +4,8 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+
+	"github.com/imdario/mergo"
 )
 
 // This package provides an API to build images using docker.
@@ -16,17 +18,38 @@ import (
 // + In the past we've had some trouble with docker go libraries, and dependency
 //   management.
 
-type BuildOpts struct {
+type BuildFlags struct {
 	Name      string
 	Tags      []string
 	Platforms []string
+	NoCache   bool
+}
+
+type BuildOptions func(*BuildFlags)
+
+func WithFlags(src *BuildFlags) BuildOptions {
+	return func(dst *BuildFlags) {
+		err := mergo.Merge(dst, src, mergo.WithOverride)
+		if err != nil {
+			panic(err)
+		}
+	}
 }
 
-func Build(path string, opts ...BuildOpts) error {
-	args := []string{"build", "."}
-	if len(opts) > 0 {
-		args = ToArgs(args, opts[0])
+func WithoutCache() BuildOptions {
+	return func(flags *BuildFlags) {
+		flags.NoCache = true
 	}
+}
+
+func Build(path string, opts ...BuildOptions) error {
+	flags := &BuildFlags{}
+	for _, opt := range opts {
+		opt(flags)
+	}
+
+	args := []string{"buildx", "build", "."}
+	args = ToArgs(args, flags)
 
 	dir, fileName := parsePath(path)
 	if fileName != "" {

nix/nix.go

@@ -35,9 +35,9 @@ func PkgExists(pkg string) bool {
 
 type Info struct {
 	NixName string
-	Name string
+	Name    string
 	Version string
-	System string
+	System  string
 }
 
 func PkgInfo(pkg string) (*Info, bool) {
@@ -70,11 +70,11 @@ func parseInfo(pkg string, data []byte) *Info {
 	for _, result := range results {
 		pkgInfo := &Info{
 			NixName: pkg,
-			Name: result["pname"].(string),
+			Name:    result["pname"].(string),
 			Version: result["version"].(string),
-			System: result["system"].(string),
+			System:  result["system"].(string),
 		}
 		return pkgInfo
 	}
 	return nil
-}
+}