chore: separate API-only CLI packages from server code

GitOrigin-RevId: 52bf0fb46dd46fa26c666d2c769c0dc8a518927c

Author: alnr

cmd/cliclient/cleanup.go cmd/cleanup/handler.gocmd/cliclient/cleanup.go renamed to cmd/cleanup/handler.go

@@ -1,7 +1,7 @@
 // Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
-package cliclient
+package cleanup
 
 import (
 	"github.com/pkg/errors"

cmd/cleanup/sql.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/ory/kratos/driver/config"
 
-	"github.com/ory/kratos/cmd/cliclient"
 	"github.com/ory/x/configx"
 )
 
@@ -32,7 +31,7 @@ You can read in the database URL using the -e flag, for example:
 Before running this command on an existing database, create a back up!
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := cliclient.NewCleanupHandler().CleanupSQL(cmd, args)
+			err := NewCleanupHandler().CleanupSQL(cmd, args)
 			if err != nil {
 				_, _ = fmt.Fprintln(cmd.OutOrStdout(), err)
 				return cmdx.FailSilently(cmd)

cmd/identities/get.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 
 	kratos "github.com/ory/kratos/pkg/httpclient"
-	"github.com/ory/kratos/x"
 	"github.com/ory/x/cmdx"
 	"github.com/ory/x/stringsx"
 
@@ -87,7 +86,7 @@ To get an identity by its external ID, run:
 						Execute()
 				}
 
-				if x.SDKError(err) != nil {
+				if clihelpers.SDKError(err) != nil {
 					failed[id] = cmdx.PrintOpenAPIError(cmd, err)
 					continue
 				}

cmd/identities/list.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/ory/x/flagx"
 
-	"github.com/ory/x/pagination/keysetpagination"
+	"github.com/ory/x/pagination/keysetclient"
 
 	"github.com/ory/kratos/cmd/cliclient"
 	"github.com/ory/x/cmdx"
@@ -65,7 +65,7 @@ Eventual consistency means that the list operation will return faster and might
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}
 
-			pages := keysetpagination.ParseHeader(res)
+			pages := keysetclient.ParseHeader(res)
 			cmdx.PrintTable(cmd, &outputIdentityCollection{
 				Identities:       identities,
 				NextPageToken:    pages.NextToken,

cmd/cliclient/migrate.go cmd/migrate/handler.gocmd/cliclient/migrate.go renamed to cmd/migrate/handler.go

@@ -1,7 +1,7 @@
 // Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
-package cliclient
+package migrate
 
 import (
 	"fmt"

cmd/migrate/normalize_phone.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/ory/kratos/cmd/cliclient"
 	"github.com/ory/kratos/driver"
 	"github.com/ory/x/configx"
 )
@@ -36,7 +35,7 @@ You can read in the database URL using the -e flag, for example:
 Before running this command on an existing database, create a back up!
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			err := cliclient.NewNormalizePhoneHandler().NormalizePhoneNumbers(cmd, args, opts...)
+			err := NewNormalizePhoneHandler().NormalizePhoneNumbers(cmd, args, opts...)
 			if err != nil {
 				_, _ = fmt.Fprintln(cmd.ErrOrStderr(), err)
 				return err

cmd/cliclient/normalize_phone.go cmd/migrate/normalize_phone_handler.gocmd/cliclient/normalize_phone.go renamed to cmd/migrate/normalize_phone_handler.go

@@ -1,7 +1,7 @@
 // Copyright © 2026 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
-package cliclient
+package migrate
 
 import (
 	"fmt"

cmd/cliclient/normalize_phone_test.go …/migrate/normalize_phone_handler_test.gocmd/cliclient/normalize_phone_test.go renamed to cmd/migrate/normalize_phone_handler_test.go cmd/cliclient/normalize_phone_test.go renamed to cmd/migrate/normalize_phone_handler_test.go

@@ -1,7 +1,7 @@
 // Copyright © 2026 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
-package cliclient
+package migrate
 
 import (
 	"testing"

cmd/migrate/root.go

@@ -6,7 +6,6 @@ package migrate
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/ory/kratos/cmd/cliclient"
 	"github.com/ory/kratos/driver"
 	"github.com/ory/x/configx"
 	"github.com/ory/x/popx"
@@ -31,18 +30,18 @@ func RegisterCommandRecursive(parent *cobra.Command) {
 
 func NewMigrateSQLDownCmd(opts ...driver.RegistryOption) *cobra.Command {
 	return popx.NewMigrateSQLDownCmd(func(cmd *cobra.Command, args []string) error {
-		return cliclient.NewMigrateHandler().MigrateSQLDown(cmd, args, opts...)
+		return NewMigrateHandler().MigrateSQLDown(cmd, args, opts...)
 	})
 }
 
 func NewMigrateSQLUpCmd(opts ...driver.RegistryOption) *cobra.Command {
 	return popx.NewMigrateSQLUpCmd(func(cmd *cobra.Command, args []string) error {
-		return cliclient.NewMigrateHandler().MigrateSQLUp(cmd, args, opts...)
+		return NewMigrateHandler().MigrateSQLUp(cmd, args, opts...)
 	})
 }
 
 func NewMigrateSQLStatusCmd(opts ...driver.RegistryOption) *cobra.Command {
 	return popx.NewMigrateSQLStatusCmd(func(cmd *cobra.Command, args []string) error {
-		return cliclient.NewMigrateHandler().MigrateSQLStatus(cmd, args, opts...)
+		return NewMigrateHandler().MigrateSQLStatus(cmd, args, opts...)
 	})
 }

cmd/migrate/sql.go

@@ -6,7 +6,6 @@ package migrate
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/ory/kratos/cmd/cliclient"
 	"github.com/ory/kratos/driver"
 	"github.com/ory/x/configx"
 )
@@ -30,7 +29,7 @@ You can read in the database URL using the -e flag, for example:
 Before running this command on an existing database, create a back up!
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return cliclient.NewMigrateHandler().MigrateSQLUp(cmd, args, opts...)
+			return NewMigrateHandler().MigrateSQLUp(cmd, args, opts...)
 		},
 	}