-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: handle migrations in migrate command
- Loading branch information
Showing
20 changed files
with
247 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package bunmigrate | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
| "fmt" | ||
| "github.com/formancehq/stack/libs/go-libs/bun/bunconnect" | ||
| sharedlogging "github.com/formancehq/stack/libs/go-libs/logging" | ||
| "github.com/formancehq/stack/libs/go-libs/pointer" | ||
| "github.com/formancehq/stack/libs/go-libs/service" | ||
| "github.com/pkg/errors" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| "github.com/uptrace/bun" | ||
| "github.com/uptrace/bun/extra/bundebug" | ||
| "github.com/xo/dburl" | ||
| "io" | ||
| ) | ||
|
|
||
| func ensureDatabaseExists(ctx context.Context, connectionOptions bunconnect.ConnectionOptions) error { | ||
| url, err := dburl.Parse(connectionOptions.DatabaseSourceName) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| originalPath := url.Path | ||
| url.Path = "postgres" // notes(gfyrag): default "postgres" database (most of the time?) | ||
| connectionOptions.DatabaseSourceName = url.String() | ||
|
|
||
| db, err := bunconnect.OpenSQLDB(connectionOptions) | ||
| if err != nil { | ||
| return errors.Wrap(err, "opening database") | ||
| } | ||
| defer func() { | ||
| err := db.Close() | ||
| if err != nil { | ||
| sharedlogging.FromContext(ctx).Errorf("Closing database: %s", err) | ||
| } | ||
| }() | ||
|
|
||
| row := db.QueryRowContext(ctx, `SELECT datname FROM pg_database WHERE datname = ?`, originalPath[1:]) | ||
| if row.Err() != nil { | ||
| return row.Err() | ||
| } | ||
|
|
||
| if err := row.Scan(pointer.For("")); err != nil { | ||
| if !errors.Is(err, sql.ErrNoRows) { | ||
| return err | ||
| } | ||
|
|
||
| _, err = db.ExecContext(ctx, fmt.Sprintf(`CREATE DATABASE "%s"`, originalPath[1:])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func run(ctx context.Context, output io.Writer, args []string, connectionOptions *bunconnect.ConnectionOptions, | ||
| executor func(args []string, db *bun.DB) error) error { | ||
|
|
||
| if err := ensureDatabaseExists(ctx, *connectionOptions); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| db, err := bunconnect.OpenSQLDB(*connectionOptions) | ||
| if err != nil { | ||
| return errors.Wrap(err, "opening database") | ||
| } | ||
| defer func() { | ||
| _ = db.Close() | ||
| }() | ||
| if viper.GetBool(service.DebugFlag) { | ||
| db.AddQueryHook(bundebug.NewQueryHook(bundebug.WithWriter(output))) | ||
| } | ||
|
|
||
| return errors.Wrap(executor(args, db), "executing migration") | ||
| } | ||
|
|
||
| func Run(cmd *cobra.Command, args []string, executor Executor) error { | ||
| connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(viper.GetViper(), cmd.OutOrStdout(), viper.GetBool(service.DebugFlag)) | ||
| if err != nil { | ||
| return errors.Wrap(err, "evaluating connection options") | ||
| } | ||
| return run(cmd.Context(), cmd.OutOrStdout(), args, connectionOptions, func(args []string, db *bun.DB) error { | ||
| return executor(cmd, args, db) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package bunmigrate | ||
|
|
||
| import ( | ||
| "github.com/formancehq/stack/libs/go-libs/bun/bunconnect" | ||
| "github.com/formancehq/stack/libs/go-libs/logging" | ||
| "github.com/formancehq/stack/libs/go-libs/pgtesting" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/uptrace/bun" | ||
| "os" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestRunMigrate(t *testing.T) { | ||
| require.NoError(t, pgtesting.CreatePostgresServer()) | ||
| t.Cleanup(func() { | ||
| require.NoError(t, pgtesting.DestroyPostgresServer()) | ||
| }) | ||
|
|
||
| connectionOptions := &bunconnect.ConnectionOptions{ | ||
| DatabaseSourceName: pgtesting.Server().GetDatabaseDSN("testing"), | ||
| Debug: testing.Verbose(), | ||
| Writer: os.Stdout, | ||
| } | ||
| executor := func(args []string, db *bun.DB) error { | ||
| return nil | ||
| } | ||
|
|
||
| err := run(logging.TestingContext(), os.Stdout, []string{}, connectionOptions, executor) | ||
| require.NoError(t, err) | ||
|
|
||
| // Must be idempotent | ||
| err = run(logging.TestingContext(), os.Stdout, []string{}, connectionOptions, executor) | ||
| require.NoError(t, err) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -165,8 +165,6 @@ spec: | |
| items: | ||
| type: string | ||
| type: array | ||
| version: | ||
| type: string | ||
| required: | ||
| - authEnabled | ||
| type: object | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.