[server] Re-enable admin storage command

server/internal/command/admin/cmd.go

@@ -2,6 +2,7 @@ package admin
 
 import (
 	"github.com/shroff/phylum/server/internal/command/admin/schema"
+	"github.com/shroff/phylum/server/internal/command/admin/storage"
 	"github.com/shroff/phylum/server/internal/command/admin/user"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ func SetupCommand() *cobra.Command {
 	cmd.AddCommand([]*cobra.Command{
 		user.SetupCommand(),
 		schema.SetupCommand(),
-		// storage.SetupCommand(),
+		storage.SetupCommand(),
 	}...)
 
 	return cmd

server/internal/core/jobs.go

@@ -15,7 +15,6 @@ func moveVersionToTargetBackend(db db.Handler, versionID uuid.UUID) {
 	}
 }
 func moveVersionToTargetBackendErr(db db.Handler, versionID uuid.UUID) error {
-	logrus.Info("Moving to Target Storage: " + versionID.String())
 	if current, err := getCurrentStorage(db, versionID); err != nil {
 		return errors.New("failed to get current storage: " + err.Error())
 	} else if target, err := findTargetStorageForVersion(db, versionID); err != nil {

server/internal/storage/drivers.go

@@ -4,18 +4,21 @@ import "errors"
 
 var drivers = map[string]Driver{
 	"local": {
+		Name:   "local",
 		Params: []string{"root"},
 		Create: func(name string, params map[string]string) (Backend, error) {
 			return createLocalBackend(name, params)
 		},
 	},
 	"minio": {
+		Name:   "minio",
 		Params: []string{"endpoint", "key_id", "access_key", "bucket_name", "prefix"},
 		Create: createMinioBackend,
 	},
 }
 
 type Driver struct {
+	Name   string
 	Params []string
 	Create func(name string, params map[string]string) (Backend, error)
 }

server/internal/storage/local_storage.go

@@ -101,5 +101,5 @@ func (l localStorage) path(name string) string {
 }
 
 func (l localStorage) String() string {
-	return "local (" + string(l.root) + ")"
+	return "local (root: " + string(l.root) + ")"
 }

server/internal/storage/storage.go

@@ -93,7 +93,7 @@ func InsertBackend(db db.Handler, name string, driver Driver, params map[string]
 	if err != nil {
 		return err
 	}
-	if _, err := db.Exec(q, name, driver, p); err != nil {
+	if _, err := db.Exec(q, name, driver.Name, p); err != nil {
 		return err
 	}
 	backends[name] = backend