feat(cmd/bundle): add new bundle build sub-commands

build/testing/testdata/cli.txt

@@ -11,6 +11,7 @@ $ flipt --config /path/to/config.yml migrate
 
 
 Available Commands:
+  bundle      Manage Flipt bundles
   config      Manage Flipt configuration
   export      Export Flipt data to file/stdout
   help        Help about any command

cmd/flipt/bundle.go

@@ -0,0 +1,106 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"github.com/spf13/cobra"
+	"go.flipt.io/flipt/internal/containers"
+	"go.flipt.io/flipt/internal/oci"
+)
+
+type bundleCommand struct{}
+
+func newBundleCommand() *cobra.Command {
+	bundle := &bundleCommand{}
+
+	cmd := &cobra.Command{
+		Use:   "bundle",
+		Short: "Manage Flipt bundles",
+	}
+
+	cmd.AddCommand(&cobra.Command{
+		Use:   "build",
+		Short: "Build a bundle",
+		RunE:  bundle.build,
+		Args:  cobra.ExactArgs(1),
+	})
+
+	cmd.AddCommand(&cobra.Command{
+		Use:   "list",
+		Short: "List all bundles",
+		RunE:  bundle.list,
+	})
+
+	return cmd
+}
+
+func (c *bundleCommand) build(cmd *cobra.Command, args []string) error {
+	store, err := c.getStore()
+	if err != nil {
+		return err
+	}
+
+	ref, err := oci.ParseReference(args[0])
+	if err != nil {
+		return err
+	}
+
+	bundle, err := store.Build(cmd.Context(), os.DirFS("."), ref)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println(bundle.Digest)
+
+	return nil
+}
+
+func (c *bundleCommand) list(cmd *cobra.Command, args []string) error {
+	store, err := c.getStore()
+	if err != nil {
+		return err
+	}
+
+	bundles, err := store.List(cmd.Context())
+	if err != nil {
+		return err
+	}
+
+	wr := writer()
+
+	fmt.Fprintf(wr, "DIGEST\tREPO\tTAG\tCREATED\t\n")
+	for _, bundle := range bundles {
+		fmt.Fprintf(wr, "%s\t%s\t%s\t%s\t\n", bundle.Digest.Hex()[:7], bundle.Repository, bundle.Tag, bundle.CreatedAt)
+	}
+
+	return wr.Flush()
+}
+
+func (c *bundleCommand) getStore() (*oci.Store, error) {
+	logger, cfg, err := buildConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	var opts []containers.Option[oci.StoreOptions]
+	if cfg := cfg.Storage.OCI; cfg != nil {
+		if cfg.BundleDirectory != "" {
+			opts = append(opts, oci.WithBundleDir(cfg.BundleDirectory))
+		}
+
+		if cfg.Authentication != nil {
+			opts = append(opts, oci.WithCredentials(
+				cfg.Authentication.Username,
+				cfg.Authentication.Password,
+			))
+		}
+	}
+
+	return oci.NewStore(logger, opts...)
+}
+
+func writer() *tabwriter.Writer {
+	return tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
+}

cmd/flipt/export.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -87,6 +88,7 @@ func (c *exportCommand) run(cmd *cobra.Command, _ []string) error {
 		// default to stdout
 		out    io.Writer = os.Stdout
 		logger           = zap.Must(zap.NewDevelopment())
+		enc              = ext.EncodingYML
 	)
 
 	// export to file
@@ -103,6 +105,11 @@ func (c *exportCommand) run(cmd *cobra.Command, _ []string) error {
 		fmt.Fprintf(fi, "# exported by Flipt (%s) on %s\n\n", version, time.Now().UTC().Format(time.RFC3339))
 
 		out = fi
+
+		if extn := filepath.Ext(c.filename); len(extn) > 0 {
+			// strip off the leading .
+			enc = ext.Encoding(extn[1:])
+		}
 	}
 
 	// Use client when remote address is configured.
@@ -111,7 +118,7 @@ func (c *exportCommand) run(cmd *cobra.Command, _ []string) error {
 		if err != nil {
 			return err
 		}
-		return c.export(cmd.Context(), out, client)
+		return c.export(cmd.Context(), enc, out, client)
 	}
 
 	// Otherwise, go direct to the DB using Flipt configuration file.
@@ -131,9 +138,9 @@ func (c *exportCommand) run(cmd *cobra.Command, _ []string) error {
 
 	defer cleanup()
 
-	return c.export(cmd.Context(), out, server)
+	return c.export(cmd.Context(), enc, out, server)
 }
 
-func (c *exportCommand) export(ctx context.Context, dst io.Writer, lister ext.Lister) error {
-	return ext.NewExporter(lister, c.namespaces, c.allNamespaces).Export(ctx, dst)
+func (c *exportCommand) export(ctx context.Context, enc ext.Encoding, dst io.Writer, lister ext.Lister) error {
+	return ext.NewExporter(lister, c.namespaces, c.allNamespaces).Export(ctx, enc, dst)
 }

cmd/flipt/import.go

@@ -65,6 +65,7 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 	var (
 		in     io.Reader = os.Stdin
 		logger           = zap.Must(zap.NewDevelopment())
+		enc              = ext.EncodingYML
 	)
 
 	if !c.importStdin {
@@ -89,6 +90,11 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 		defer fi.Close()
 
 		in = fi
+
+		if extn := filepath.Ext(importFilename); len(extn) > 0 {
+			// strip off leading .
+			enc = ext.Encoding(extn[1:])
+		}
 	}
 
 	// Use client when remote address is configured.
@@ -97,7 +103,7 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		return ext.NewImporter(client).Import(cmd.Context(), in)
+		return ext.NewImporter(client).Import(cmd.Context(), enc, in)
 	}
 
 	logger, cfg, err := buildConfig()
@@ -150,5 +156,5 @@ func (c *importCommand) run(cmd *cobra.Command, args []string) error {
 
 	return ext.NewImporter(
 		server,
-	).Import(cmd.Context(), in)
+	).Import(cmd.Context(), enc, in)
 }

cmd/flipt/main.go

@@ -140,6 +140,7 @@ func exec() error {
 	rootCmd.AddCommand(newConfigCommand())
 	rootCmd.AddCommand(newCompletionCommand())
 	rootCmd.AddCommand(newDocCommand())
+	rootCmd.AddCommand(newBundleCommand())
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

cmd/flipt/validate.go

@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/cobra"
 	"go.flipt.io/flipt/internal/cue"
 	"go.flipt.io/flipt/internal/storage/fs"
-	"go.uber.org/zap"
 )
 
 type validateCommand struct {
@@ -43,11 +42,15 @@ func newValidateCommand() *cobra.Command {
 }
 
 func (v *validateCommand) run(cmd *cobra.Command, args []string) error {
-	var err error
+	logger, _, err := buildConfig()
+	if err != nil {
+		return err
+	}
+
 	if len(args) == 0 {
-		_, err = fs.SnapshotFromFS(zap.NewNop(), os.DirFS("."))
+		_, err = fs.SnapshotFromFS(logger, os.DirFS("."))
 	} else {
-		_, err = fs.SnapshotFromPaths(os.DirFS("."), args...)
+		_, err = fs.SnapshotFromPaths(logger, os.DirFS("."), args...)
 	}
 
 	errs, ok := cue.Unwrap(err)

internal/config/storage.go

@@ -3,8 +3,6 @@ package config
 import (
 	"errors"
 	"fmt"
-	"os"
-	"path/filepath"
 	"time"
 
 	"github.com/spf13/viper"
@@ -63,18 +61,6 @@ func (c *StorageConfig) setDefaults(v *viper.Viper) error {
 		}
 	case string(OCIStorageType):
 		v.SetDefault("store.oci.insecure", false)
-
-		configDir, err := Dir()
-		if err != nil {
-			return fmt.Errorf("setting oci default: %w", err)
-		}
-
-		bundlesDir := filepath.Join(configDir, "bundles")
-		if err := os.MkdirAll(bundlesDir, 0755); err != nil {
-			return fmt.Errorf("creating image directory: %w", err)
-		}
-
-		v.SetDefault("store.oci.bundles_directory", bundlesDir)
 	default:
 		v.SetDefault("storage.type", "database")
 	}