snapshot of https://github.com/ory/kratos.git (master, 2026-09-15; blobs > 131072B omitted)
Some checks failed
CI / Run tests and lints (push) Failing after 29s
CI / Build CLI docs (push) Has been skipped
CI / Run Playwright end-to-end tests (mysql) (push) Failing after 3s
CI / Run Playwright end-to-end tests (postgres) (push) Failing after 2s
CI / Run Playwright end-to-end tests (sqlite) (push) Failing after 3s
CodeQL / Analyze (go) (push) Failing after 4s
CodeQL / Analyze (javascript) (push) Failing after 3s
Docker Image Scanners / scanners (push) Failing after 4s
Synchronize Issue Labels / Synchronize Issue Labels (push) Has been skipped
CI / Run end-to-end tests (postgres) (push) Failing after 19s
CI / Run end-to-end tests (sqlite) (push) Failing after 2s
CI / Run Playwright end-to-end tests (cockroach) (push) Failing after 2s
CI / Draft newsletter (push) Has been skipped
CI / Generate release (push) Has been skipped
CI / Pending approval Slack notification (push) Has been skipped
CI / Send newsletter (push) Has been skipped
Some checks failed
CI / Run tests and lints (push) Failing after 29s
CI / Build CLI docs (push) Has been skipped
CI / Run Playwright end-to-end tests (mysql) (push) Failing after 3s
CI / Run Playwright end-to-end tests (postgres) (push) Failing after 2s
CI / Run Playwright end-to-end tests (sqlite) (push) Failing after 3s
CodeQL / Analyze (go) (push) Failing after 4s
CodeQL / Analyze (javascript) (push) Failing after 3s
Docker Image Scanners / scanners (push) Failing after 4s
Synchronize Issue Labels / Synchronize Issue Labels (push) Has been skipped
CI / Run end-to-end tests (postgres) (push) Failing after 19s
CI / Run end-to-end tests (sqlite) (push) Failing after 2s
CI / Run Playwright end-to-end tests (cockroach) (push) Failing after 2s
CI / Draft newsletter (push) Has been skipped
CI / Generate release (push) Has been skipped
CI / Pending approval Slack notification (push) Has been skipped
CI / Send newsletter (push) Has been skipped
This commit is contained in:
67
cmd/cleanup/handler.go
Normal file
67
cmd/cleanup/handler.go
Normal file
@@ -0,0 +1,67 @@
|
||||
// Copyright © 2023 Ory Corp
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package cleanup
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/ory/x/contextx"
|
||||
|
||||
"github.com/ory/x/configx"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/ory/kratos/driver"
|
||||
"github.com/ory/kratos/driver/config"
|
||||
"github.com/ory/x/flagx"
|
||||
)
|
||||
|
||||
type CleanupHandler struct{}
|
||||
|
||||
func NewCleanupHandler() *CleanupHandler {
|
||||
return &CleanupHandler{}
|
||||
}
|
||||
|
||||
func (h *CleanupHandler) CleanupSQL(cmd *cobra.Command, args []string) error {
|
||||
opts := []configx.OptionModifier{
|
||||
configx.WithFlags(cmd.Flags()),
|
||||
configx.SkipValidation(),
|
||||
}
|
||||
|
||||
if !flagx.MustGetBool(cmd, "read-from-env") {
|
||||
if len(args) != 1 {
|
||||
return errors.New(`expected to get the DSN as an argument, or the "read-from-env" flag`)
|
||||
}
|
||||
opts = append(opts, configx.WithValue(config.ViperKeyDSN, args[0]))
|
||||
}
|
||||
|
||||
d, err := driver.NewWithoutInit(
|
||||
cmd.Context(),
|
||||
cmd.ErrOrStderr(),
|
||||
driver.WithConfigOptions(opts...),
|
||||
)
|
||||
if len(d.Config().DSN(cmd.Context())) == 0 {
|
||||
return errors.New(`required config value "dsn" was not set`)
|
||||
} else if err != nil {
|
||||
return errors.Wrap(err, "An error occurred initializing cleanup")
|
||||
}
|
||||
|
||||
err = d.Init(cmd.Context(), &contextx.Default{})
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "An error occurred initializing cleanup")
|
||||
}
|
||||
|
||||
keepLast := flagx.MustGetDuration(cmd, "keep-last")
|
||||
|
||||
err = d.Persister().CleanupDatabase(
|
||||
cmd.Context(),
|
||||
d.Config().DatabaseCleanupSleepTables(cmd.Context()),
|
||||
keepLast,
|
||||
d.Config().DatabaseCleanupBatchSize(cmd.Context()))
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "An error occurred while cleaning up expired data")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
25
cmd/cleanup/root.go
Normal file
25
cmd/cleanup/root.go
Normal file
@@ -0,0 +1,25 @@
|
||||
// Copyright © 2023 Ory Corp
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package cleanup
|
||||
|
||||
import (
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/ory/x/configx"
|
||||
)
|
||||
|
||||
func NewCleanupCmd() *cobra.Command {
|
||||
c := &cobra.Command{
|
||||
Use: "cleanup",
|
||||
Short: "Various cleanup helpers",
|
||||
}
|
||||
configx.RegisterFlags(c.PersistentFlags())
|
||||
return c
|
||||
}
|
||||
|
||||
func RegisterCommandRecursive(parent *cobra.Command) {
|
||||
c := NewCleanupCmd()
|
||||
parent.AddCommand(c)
|
||||
c.AddCommand(NewCleanupSQLCmd())
|
||||
}
|
||||
49
cmd/cleanup/sql.go
Normal file
49
cmd/cleanup/sql.go
Normal file
@@ -0,0 +1,49 @@
|
||||
// Copyright © 2023 Ory Corp
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package cleanup
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/ory/x/cmdx"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/ory/kratos/driver/config"
|
||||
|
||||
"github.com/ory/x/configx"
|
||||
)
|
||||
|
||||
// cleanupSqlCmd represents the sql command
|
||||
func NewCleanupSQLCmd() *cobra.Command {
|
||||
c := &cobra.Command{
|
||||
Use: "sql <database-url>",
|
||||
Short: "Cleanup sql database from expired flows and sessions",
|
||||
Long: `Run this command as frequently as you need.
|
||||
It is recommended to run this command close to the SQL instance (e.g. same subnet) instead of over the public internet.
|
||||
This decreases risk of failure and decreases time required.
|
||||
You can read in the database URL using the -e flag, for example:
|
||||
export DSN=...
|
||||
kratos cleanup sql -e
|
||||
### WARNING ###
|
||||
Before running this command on an existing database, create a back up!
|
||||
`,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
err := NewCleanupHandler().CleanupSQL(cmd, args)
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(cmd.OutOrStdout(), err)
|
||||
return cmdx.FailSilently(cmd)
|
||||
}
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
configx.RegisterFlags(c.PersistentFlags())
|
||||
c.Flags().BoolP("read-from-env", "e", true, "If set, reads the database connection string from the environment variable DSN or config file key dsn.")
|
||||
c.Flags().Duration(config.ViperKeyDatabaseCleanupSleepTables, time.Minute, "How long to wait between each table cleanup")
|
||||
c.Flags().IntP(config.ViperKeyDatabaseCleanupBatchSize, "b", 100, "Set the number of records to be cleaned per run")
|
||||
c.Flags().Duration("keep-last", 0, "Don't remove records younger than")
|
||||
return c
|
||||
}
|
||||
27
cmd/cleanup/sql_test.go
Normal file
27
cmd/cleanup/sql_test.go
Normal file
@@ -0,0 +1,27 @@
|
||||
// Copyright © 2023 Ory Corp
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package cleanup
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func Test_ExecuteCleanupFailedDSN(t *testing.T) {
|
||||
cmd := NewCleanupSQLCmd()
|
||||
b := bytes.NewBufferString("")
|
||||
cmd.SetOut(b)
|
||||
cmd.SetArgs([]string{"--read-from-env=false"})
|
||||
_ = cmd.Execute()
|
||||
out, err := io.ReadAll(b)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !strings.Contains(string(out), "expected to get the DSN as an argument") {
|
||||
t.Fatalf("expected \"%s\" got \"%s\"", "expected to get the DSN as an argument", string(out))
|
||||
}
|
||||
_ = cmd.Execute()
|
||||
}
|
||||
Reference in New Issue
Block a user