chore(hydra): clean up command setup

GitOrigin-RevId: 4d037e659e0d7dcfe21935ad3bfc4f707224c0af

Author: zepatrik

cmd/cli/handler.go

@@ -5,7 +5,6 @@ package cli
 
 import (
 	"github.com/ory/hydra/v2/driver"
-	"github.com/ory/x/configx"
 	"github.com/ory/x/servicelocatorx"
 )
 
@@ -14,9 +13,9 @@ type Handler struct {
 	Janitor   *JanitorHandler
 }
 
-func NewHandler(slOpts []servicelocatorx.Option, dOpts []driver.OptionsModifier, cOpts []configx.OptionModifier) *Handler {
+func NewHandler(slOpts []servicelocatorx.Option, dOpts []driver.OptionsModifier) *Handler {
 	return &Handler{
-		Migration: newMigrateHandler(slOpts, dOpts, cOpts),
-		Janitor:   NewJanitorHandler(slOpts, dOpts, cOpts),
+		Migration: newMigrateHandler(slOpts, dOpts),
+		Janitor:   NewJanitorHandler(slOpts, dOpts),
 	}
 }

cmd/cli/handler_janitor.go

@@ -38,14 +38,12 @@ const (
 type JanitorHandler struct {
 	slOpts []servicelocatorx.Option
 	dOpts  []driver.OptionsModifier
-	cOpts  []configx.OptionModifier
 }
 
-func NewJanitorHandler(slOpts []servicelocatorx.Option, dOpts []driver.OptionsModifier, cOpts []configx.OptionModifier) *JanitorHandler {
+func NewJanitorHandler(slOpts []servicelocatorx.Option, dOpts []driver.OptionsModifier) *JanitorHandler {
 	return &JanitorHandler{
 		slOpts: slOpts,
 		dOpts:  dOpts,
-		cOpts:  cOpts,
 	}
 }
 
@@ -122,7 +120,7 @@ func purge(cmd *cobra.Command, args []string, sl *servicelocatorx.Options, dOpts
 	do := append(dOpts,
 		driver.DisableValidation(),
 		driver.DisablePreloading(),
-		driver.WithOptions(co...),
+		driver.WithConfigOptions(co...),
 	)
 
 	d, err := driver.New(ctx, sl, do)

cmd/cli/handler_janitor_test.go

@@ -21,7 +21,7 @@ import (
 )
 
 func newJanitorCmd() *cobra.Command {
-	return cmd.NewRootCmd(nil, nil, nil)
+	return cmd.NewRootCmd(nil, nil)
 }
 
 func TestJanitorHandler_PurgeTokenNotAfter(t *testing.T) {
@@ -189,69 +189,69 @@ func TestJanitorHandler_PurgeLoginConsent(t *testing.T) {
 }
 
 func TestJanitorHandler_Arguments(t *testing.T) {
-	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil, nil),
+	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil),
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		"memory",
 	)
-	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil, nil),
+	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil),
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyTokens),
 		"memory",
 	)
-	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil, nil),
+	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil),
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyGrants),
 		"memory",
 	)
 
-	_, _, err := cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err := cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		"memory")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Janitor requires at least one of --tokens, --requests or --grants to be set")
 
-	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil, nil),
+	cmdx.ExecNoErr(t, cmd.NewRootCmd(nil, nil),
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.Limit, "1000"),
 		fmt.Sprintf("--%s=%s", cli.BatchSize, "100"),
 		"memory",
 	)
 
-	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.Limit, "0"),
 		"memory")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Values for --limit and --batch-size should both be greater than 0")
 
-	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.Limit, "-100"),
 		"memory")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Values for --limit and --batch-size should both be greater than 0")
 
-	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.BatchSize, "0"),
 		"memory")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Values for --limit and --batch-size should both be greater than 0")
 
-	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.BatchSize, "-100"),
 		"memory")
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Values for --limit and --batch-size should both be greater than 0")
 
-	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil, nil), nil,
+	_, _, err = cmdx.ExecCtx(context.Background(), cmd.NewRootCmd(nil, nil), nil,
 		"janitor",
 		fmt.Sprintf("--%s", cli.OnlyRequests),
 		fmt.Sprintf("--%s=%s", cli.Limit, "100"),