diff --git a/pkg/cmd/migrate/migrate.go b/pkg/cmd/migrate/migrate.go index f02907d034..474a2957f0 100644 --- a/pkg/cmd/migrate/migrate.go +++ b/pkg/cmd/migrate/migrate.go @@ -10,7 +10,7 @@ import ( crdbmigrations "github.com/authzed/spicedb/internal/datastore/crdb/migrations" "github.com/authzed/spicedb/internal/datastore/postgres/migrations" - defaults "github.com/authzed/spicedb/pkg/cmd" + cmdutil "github.com/authzed/spicedb/pkg/cmd" "github.com/authzed/spicedb/pkg/migrate" ) @@ -24,7 +24,7 @@ func NewMigrateCommand(programName string) *cobra.Command { Use: "migrate [revision]", Short: "execute datastore schema migrations", Long: fmt.Sprintf("Executes datastore schema migrations for the datastore.\nThe special value \"%s\" can be used to migrate to the latest revision.", color.YellowString(migrate.Head)), - PreRunE: defaults.DefaultPreRunE(programName), + PreRunE: cmdutil.DefaultPreRunE(programName), Run: migrateRun, Args: cobra.ExactArgs(1), } @@ -76,7 +76,7 @@ func NewHeadCommand(programName string) *cobra.Command { return &cobra.Command{ Use: "head", Short: "compute the head database migration revision", - PreRunE: defaults.DefaultPreRunE(programName), + PreRunE: cmdutil.DefaultPreRunE(programName), Run: headRevisionRun, Args: cobra.ExactArgs(0), } diff --git a/pkg/cmd/serve/devtools.go b/pkg/cmd/serve/devtools.go index bbd224dad7..e2e9e2b57e 100644 --- a/pkg/cmd/serve/devtools.go +++ b/pkg/cmd/serve/devtools.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/reflection" v0svc "github.com/authzed/spicedb/internal/services/v0" - defaults "github.com/authzed/spicedb/pkg/cmd" + cmdutil "github.com/authzed/spicedb/pkg/cmd" ) func RegisterDevtoolsFlags(cmd *cobra.Command) { @@ -47,7 +47,7 @@ func NewDevtoolsCommand(programName string) *cobra.Command { Use: "serve-devtools", Short: "runs the developer tools service", Long: "Serves the authzed.api.v0.DeveloperService which is used for development tooling such as the Authzed Playground", - PreRunE: defaults.DefaultPreRunE(programName), + PreRunE: cmdutil.DefaultPreRunE(programName), Run: runfunc, Args: cobra.ExactArgs(0), } @@ -78,7 +78,7 @@ func runfunc(cmd *cobra.Command, args []string) { // Start the metrics endpoint. metricsSrv := cobrautil.HttpServerFromFlags(cmd, "metrics") - metricsSrv.Handler = defaults.MetricsHandler() + metricsSrv.Handler = cmdutil.MetricsHandler() go func() { if err := cobrautil.HttpListenFromFlags(cmd, "metrics", metricsSrv, zerolog.InfoLevel); err != nil { log.Fatal().Err(err).Msg("failed while serving metrics") diff --git a/pkg/cmd/serve/serve.go b/pkg/cmd/serve/serve.go index 13cb8d6e91..28487158e9 100644 --- a/pkg/cmd/serve/serve.go +++ b/pkg/cmd/serve/serve.go @@ -29,13 +29,13 @@ import ( "github.com/authzed/spicedb/internal/namespace" "github.com/authzed/spicedb/internal/services" v1alpha1svc "github.com/authzed/spicedb/internal/services/v1alpha1" - defaults "github.com/authzed/spicedb/pkg/cmd" + cmdutil "github.com/authzed/spicedb/pkg/cmd" logmw "github.com/authzed/spicedb/pkg/middleware/logging" "github.com/authzed/spicedb/pkg/middleware/requestid" "github.com/authzed/spicedb/pkg/validationfile" ) -func RegisterServeFlags(cmd *cobra.Command, dsConfig *defaults.DatastoreConfig) { +func RegisterServeFlags(cmd *cobra.Command, dsConfig *cmdutil.DatastoreConfig) { // Flags for the gRPC API server cobrautil.RegisterGrpcServerFlags(cmd.Flags(), "grpc", "gRPC", ":50051", true) cmd.Flags().String("grpc-preshared-key", "", "preshared key to require for authenticated requests") @@ -45,7 +45,7 @@ func RegisterServeFlags(cmd *cobra.Command, dsConfig *defaults.DatastoreConfig) } // Flags for the datastore - defaults.RegisterDatastoreFlags(cmd, dsConfig) + cmdutil.RegisterDatastoreFlags(cmd, dsConfig) cmd.Flags().Bool("datastore-readonly", false, "set the service to read-only mode") cmd.Flags().StringSlice("datastore-bootstrap-files", []string{}, "bootstrap data yaml files to load") cmd.Flags().Bool("datastore-bootstrap-overwrite", false, "overwrite any existing data with bootstrap data") @@ -80,12 +80,12 @@ func RegisterServeFlags(cmd *cobra.Command, dsConfig *defaults.DatastoreConfig) cobrautil.RegisterHttpServerFlags(cmd.Flags(), "metrics", "metrics", ":9090", true) } -func NewServeCommand(programName string, dsConfig *defaults.DatastoreConfig) *cobra.Command { +func NewServeCommand(programName string, dsConfig *cmdutil.DatastoreConfig) *cobra.Command { return &cobra.Command{ Use: "serve", Short: "serve the permissions database", Long: "A database that stores, computes, and validates application permissions", - PreRunE: defaults.DefaultPreRunE(programName), + PreRunE: cmdutil.DefaultPreRunE(programName), Run: func(cmd *cobra.Command, args []string) { serveRun(cmd, args, dsConfig) }, @@ -100,13 +100,13 @@ func NewServeCommand(programName string, dsConfig *defaults.DatastoreConfig) *co } } -func serveRun(cmd *cobra.Command, args []string, datastoreOpts *defaults.DatastoreConfig) { +func serveRun(cmd *cobra.Command, args []string, datastoreOpts *cmdutil.DatastoreConfig) { token := cobrautil.MustGetStringExpanded(cmd, "grpc-preshared-key") if len(token) < 1 { log.Fatal().Msg("a preshared key must be provided via --grpc-preshared-key to authenticate API requests") } - ds, err := defaults.NewDatastore(datastoreOpts.ToOption()) + ds, err := cmdutil.NewDatastore(datastoreOpts.ToOption()) if err != nil { log.Fatal().Err(err).Msg("failed to init datastore") } @@ -199,7 +199,7 @@ func serveRun(cmd *cobra.Command, args []string, datastoreOpts *defaults.Datasto combineddispatch.GrpcPresharedKey(cobrautil.MustGetStringExpanded(cmd, "grpc-preshared-key")), combineddispatch.GrpcDialOpts( grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()), - grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"consistent-hashring"}`), + grpc.WithcmdutilerviceConfig(`{"loadBalancingPolicy":"consistent-hashring"}`), ), ) if err != nil { @@ -256,7 +256,7 @@ func serveRun(cmd *cobra.Command, args []string, datastoreOpts *defaults.Datasto // Start the metrics endpoint. metricsSrv := cobrautil.HttpServerFromFlags(cmd, "metrics") - metricsSrv.Handler = defaults.MetricsHandler() + metricsSrv.Handler = cmdutil.MetricsHandler() go func() { if err := cobrautil.HttpListenFromFlags(cmd, "metrics", metricsSrv, zerolog.InfoLevel); err != nil { log.Fatal().Err(err).Msg("failed while serving metrics") diff --git a/pkg/cmd/serve/testing.go b/pkg/cmd/serve/testing.go index ece6329ae9..9d084b58e1 100644 --- a/pkg/cmd/serve/testing.go +++ b/pkg/cmd/serve/testing.go @@ -33,7 +33,7 @@ import ( "github.com/authzed/spicedb/internal/namespace" "github.com/authzed/spicedb/internal/services" v1alpha1svc "github.com/authzed/spicedb/internal/services/v1alpha1" - defaults "github.com/authzed/spicedb/pkg/cmd" + cmdutil "github.com/authzed/spicedb/pkg/cmd" "github.com/authzed/spicedb/pkg/validationfile" ) @@ -55,7 +55,7 @@ func NewTestingCommand(programName string) *cobra.Command { Use: "serve-testing", Short: "test server with an in-memory datastore", Long: "An in-memory spicedb server which serves completely isolated datastores per client-supplied auth token used.", - PreRunE: defaults.DefaultPreRunE(programName), + PreRunE: cmdutil.DefaultPreRunE(programName), Run: runTestServer, } }