pkg/cmd: move root to own package

authzed · Dec 7, 2021 · f446a16 · f446a16
1 parent 475f1a1
commit f446a16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/spicedb/main.go b/cmd/spicedb/main.go
@@ -14,7 +14,7 @@ import (
 	"google.golang.org/grpc/balancer"
 
 	consistentbalancer "github.com/authzed/spicedb/pkg/balancer"
-	"github.com/authzed/spicedb/pkg/cmd"
+	"github.com/authzed/spicedb/pkg/cmd/root"
 	"github.com/authzed/spicedb/pkg/cmd/version"
 )
 
@@ -48,8 +48,8 @@ func main() {
 	// enable consistent hashring grpc load balancer
 	balancer.Register(consistentbalancer.NewConsistentHashringBuilder(xxhash.Sum64, hashringReplicationFactor, backendsPerKey))
 
-	rootCmd := cmd.NewRootCmd()
-	cmd.RegisterRootFlags(rootCmd)
+	rootCmd := root.NewCommand()
+	root.RegisterFlags(rootCmd)
 
 	versionCmd := version.NewCommand(rootCmd.Use)
 	version.RegisterVersionFlags(versionCmd)

diff --git a/pkg/cmd/root.go → pkg/cmd/root/root.go b/pkg/cmd/root.go → pkg/cmd/root/root.go
@@ -1,4 +1,4 @@
-package cmd
+package root
 
 import (
 	"fmt"
@@ -8,12 +8,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func RegisterRootFlags(cmd *cobra.Command) {
+func RegisterFlags(cmd *cobra.Command) {
 	cobrautil.RegisterZeroLogFlags(cmd.PersistentFlags(), "log")
 	cobrautil.RegisterOpenTelemetryFlags(cmd.PersistentFlags(), "otel", cmd.Use)
 }
 
-func NewRootCmd() *cobra.Command {
+func NewCommand() *cobra.Command {
 	return &cobra.Command{
 		Use:   "spicedb",
 		Short: "A modern permissions database",