Remove app admin command

server/internal/command/appcmd/admincmd/admin.go

@@ -1,19 +0,0 @@
-package admincmd
-
-import (
-	"github.com/shroff/phylum/server/internal/storage"
-	"github.com/spf13/cobra"
-)
-
-func SetupCommand(cs storage.Storage) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "admin",
-		Short: "Server Administration",
-	}
-	cmd.AddCommand([]*cobra.Command{
-		setupStorageCommand(cs),
-		setupUserCommand(),
-	}...)
-
-	return cmd
-}

server/internal/command/appcmd/appcmd.go

@@ -2,7 +2,6 @@ package appcmd
 
 import (
 	"github.com/shroff/phylum/server/internal/app"
-	"github.com/shroff/phylum/server/internal/command/appcmd/admincmd"
 	"github.com/shroff/phylum/server/internal/db"
 	"github.com/shroff/phylum/server/internal/storage"
 	"github.com/sirupsen/logrus"
@@ -42,9 +41,10 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
 	viper.BindPFlag("content_dir", flags.Lookup("content-dir"))
 
 	cmd.AddCommand([]*cobra.Command{
-		admincmd.SetupCommand(cs),
 		setupServeCommand(),
+		setupUserCommand(),
 		setupResourceCommand(),
+		setupStorageCommand(cs),
 	}...)
 
 	return cmd

server/internal/command/appcmd/storage.go

@@ -1,4 +1,4 @@
-package admincmd
+package appcmd
 
 import (
 	"bufio"

server/internal/command/appcmd/user.go

@@ -1,4 +1,4 @@
-package admincmd
+package appcmd
 
 import (
 	"context"

server/internal/command/command.go

@@ -52,8 +52,10 @@ func SetupCommand() {
 	}
 
 	defer func() {
-		logrus.Info("Shutting Down App")
-		database.Close()
+		if database != nil {
+			logrus.Info("Shutting Down App")
+			database.Close()
+		}
 	}()
 
 	rootCmd.AddCommand([]*cobra.Command{