Prod deploy

.github/workflows/release-beta.yml

@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: "16.x"
           registry-url: "https://registry.npmjs.org"

.github/workflows/tag-npm.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: "16.x"
           registry-url: "https://registry.npmjs.org"

cmd/branches.go

@@ -35,6 +35,7 @@ var (
 	}
 	persistent bool
 	withData   bool
+	notifyURL  string
 
 	branchCreateCmd = &cobra.Command{
 		Use:   "create [name]",
@@ -59,6 +60,9 @@ var (
 			if cmdFlags.Changed("with-data") {
 				body.WithData = &withData
 			}
+			if cmdFlags.Changed("notify-url") {
+				body.NotifyUrl = &notifyURL
+			}
 			return create.Run(cmd.Context(), body, afero.NewOsFs())
 		},
 	}
@@ -124,6 +128,9 @@ var (
 			if cmdFlags.Changed("status") {
 				body.Status = (*api.UpdateBranchBodyStatus)(&branchStatus.Value)
 			}
+			if cmdFlags.Changed("notify-url") {
+				body.NotifyUrl = &notifyURL
+			}
 			ctx := cmd.Context()
 			fsys := afero.NewOsFs()
 			if len(args) > 0 {
@@ -203,6 +210,7 @@ func init() {
 	createFlags.Var(&size, "size", "Select a desired instance size for the branch database.")
 	createFlags.BoolVar(&persistent, "persistent", false, "Whether to create a persistent branch.")
 	createFlags.BoolVar(&withData, "with-data", false, "Whether to clone production data to the branch database.")
+	createFlags.StringVar(&notifyURL, "notify-url", "", "URL to notify when branch is active healthy.")
 	branchesCmd.AddCommand(branchCreateCmd)
 	branchesCmd.AddCommand(branchListCmd)
 	branchesCmd.AddCommand(branchGetCmd)
@@ -211,6 +219,7 @@ func init() {
 	updateFlags.StringVar(&gitBranch, "git-branch", "", "Change the associated git branch.")
 	updateFlags.BoolVar(&persistent, "persistent", false, "Switch between ephemeral and persistent branch.")
 	updateFlags.Var(&branchStatus, "status", "Override the current branch status.")
+	updateFlags.StringVar(&notifyURL, "notify-url", "", "URL to notify when branch is active healthy.")
 	branchesCmd.AddCommand(branchUpdateCmd)
 	branchesCmd.AddCommand(branchDeleteCmd)
 	branchesCmd.AddCommand(branchDisableCmd)

cmd/db.go

@@ -271,7 +271,7 @@ func init() {
 	dumpFlags := dbDumpCmd.Flags()
 	dumpFlags.BoolVar(&dryRun, "dry-run", false, "Prints the pg_dump script that would be executed.")
 	dumpFlags.BoolVar(&dataOnly, "data-only", false, "Dumps only data records.")
-	dumpFlags.BoolVar(&useCopy, "use-copy", false, "Uses copy statements in place of inserts.")
+	dumpFlags.BoolVar(&useCopy, "use-copy", false, "Use copy statements in place of inserts.")
 	dumpFlags.StringSliceVarP(&excludeTable, "exclude", "x", []string{}, "List of schema.tables to exclude from data-only dump.")
 	dumpFlags.BoolVar(&roleOnly, "role-only", false, "Dumps only cluster roles.")
 	dbDumpCmd.MarkFlagsMutuallyExclusive("role-only", "data-only")

cmd/link.go

@@ -13,6 +13,8 @@ import (
 )
 
 var (
+	skipPooler bool
+
 	linkCmd = &cobra.Command{
 		GroupID: groupLocalDev,
 		Use:     "link",
@@ -35,7 +37,7 @@ var (
 			}
 			// TODO: move this to root cmd
 			cobra.CheckErr(viper.BindPFlag("DB_PASSWORD", cmd.Flags().Lookup("password")))
-			return link.Run(ctx, flags.ProjectRef, fsys)
+			return link.Run(ctx, flags.ProjectRef, skipPooler, fsys)
 		},
 	}
 )
@@ -44,6 +46,7 @@ func init() {
 	linkFlags := linkCmd.Flags()
 	linkFlags.StringVar(&flags.ProjectRef, "project-ref", "", "Project ref of the Supabase project.")
 	linkFlags.StringVarP(&dbPassword, "password", "p", "", "Password to your remote Postgres database.")
+	linkFlags.BoolVar(&skipPooler, "skip-pooler", false, "Use direct connection instead of pooler.")
 	// For some reason, BindPFlag only works for StringVarP instead of StringP
 	rootCmd.AddCommand(linkCmd)
 }

cmd/root.go

@@ -260,7 +260,7 @@ func GetRootCmd() *cobra.Command {
 
 func addSentryScope(scope *sentry.Scope) {
 	serviceImages := utils.Config.GetServiceImages()
-	imageToVersion := make(map[string]interface{}, len(serviceImages))
+	imageToVersion := make(map[string]any, len(serviceImages))
 	for _, image := range serviceImages {
 		parts := strings.Split(image, ":")
 		// Bypasses sentry's IP sanitization rule, ie. 15.1.0.147
@@ -271,7 +271,7 @@ func addSentryScope(scope *sentry.Scope) {
 		}
 	}
 	scope.SetContext("Services", imageToVersion)
-	scope.SetContext("Config", map[string]interface{}{
+	scope.SetContext("Config", map[string]any{
 		"Image Registry": utils.GetRegistry(),
 		"Project ID":     flags.ProjectRef,
 	})

cmd/start.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"slices"
 	"sort"
 	"strings"
 
@@ -18,7 +19,7 @@ func validateExcludedContainers(excludedContainers []string) {
 	var invalidContainers []string
 
 	for _, e := range excludedContainers {
-		if !utils.SliceContains(validContainers, e) {
+		if !slices.Contains(validContainers, e) {
 			invalidContainers = append(invalidContainers, e)
 		}
 	}

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/docker/docker v28.5.1+incompatible
 	github.com/docker/go-connections v0.6.0
 	github.com/fsnotify/fsnotify v1.9.0
-	github.com/getsentry/sentry-go v0.35.3
+	github.com/getsentry/sentry-go v0.36.0
 	github.com/go-errors/errors v1.5.1
 	github.com/go-git/go-git/v5 v5.16.3
 	github.com/go-playground/validator/v10 v10.28.0

go.sum

@@ -300,8 +300,8 @@ github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIp
 github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/getkin/kin-openapi v0.131.0 h1:NO2UeHnFKRYhZ8wg6Nyh5Cq7dHk4suQQr72a4pMrDxE=
 github.com/getkin/kin-openapi v0.131.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaEDsjiKUV8nL58=
-github.com/getsentry/sentry-go v0.35.3 h1:u5IJaEqZyPdWqe/hKlBKBBnMTSxB/HenCqF3QLabeds=
-github.com/getsentry/sentry-go v0.35.3/go.mod h1:mdL49ixwT2yi57k5eh7mpnDyPybixPzlzEJFu0Z76QA=
+github.com/getsentry/sentry-go v0.36.0 h1:UkCk0zV28PiGf+2YIONSSYiYhxwlERE5Li3JPpZqEns=
+github.com/getsentry/sentry-go v0.36.0/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
 github.com/ghostiam/protogetter v0.3.15 h1:1KF5sXel0HE48zh1/vn0Loiw25A9ApyseLzQuif1mLY=
 github.com/ghostiam/protogetter v0.3.15/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=

internal/bootstrap/bootstrap.go

@@ -99,7 +99,7 @@ func Run(ctx context.Context, starter StarterTemplate, fsys afero.Fs, options ..
 	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
-	link.LinkServices(ctx, flags.ProjectRef, tenant.NewApiKey(keys).Anon, fsys)
+	link.LinkServices(ctx, flags.ProjectRef, tenant.NewApiKey(keys).Anon, false, fsys)
 	if err := utils.WriteFile(utils.ProjectRefPath, []byte(flags.ProjectRef), fsys); err != nil {
 		return err
 	}

internal/db/branch/switch_/switch__test.go

@@ -48,7 +48,7 @@ func TestSwitchCommand(t *testing.T) {
 			Query(reset.TERMINATE_BACKENDS).
 			Reply("SELECT 1").
 			Query(reset.COUNT_REPLICATION_SLOTS).
-			Reply("SELECT 1", []interface{}{0}).
+			Reply("SELECT 1", []any{0}).
 			Query("ALTER DATABASE postgres RENAME TO main;").
 			Reply("ALTER DATABASE").
 			Query("ALTER DATABASE " + branch + " RENAME TO postgres;").
@@ -237,7 +237,7 @@ func TestSwitchDatabase(t *testing.T) {
 			Query(reset.TERMINATE_BACKENDS).
 			Reply("SELECT 1").
 			Query(reset.COUNT_REPLICATION_SLOTS).
-			Reply("SELECT 1", []interface{}{0}).
+			Reply("SELECT 1", []any{0}).
 			Query("ALTER DATABASE postgres RENAME TO main;").
 			ReplyError(pgerrcode.DuplicateDatabase, `database "main" already exists`)
 		// Setup mock docker
@@ -267,7 +267,7 @@ func TestSwitchDatabase(t *testing.T) {
 			Query(reset.TERMINATE_BACKENDS).
 			Reply("SELECT 1").
 			Query(reset.COUNT_REPLICATION_SLOTS).
-			Reply("SELECT 1", []interface{}{0}).
+			Reply("SELECT 1", []any{0}).
 			Query("ALTER DATABASE postgres RENAME TO main;").
 			Reply("ALTER DATABASE").
 			Query("ALTER DATABASE target RENAME TO postgres;").

internal/db/diff/diff_test.go

@@ -136,6 +136,8 @@ func TestMigrateShadow(t *testing.T) {
 			Query(CREATE_TEMPLATE).
 			Reply("CREATE DATABASE")
 		helper.MockMigrationHistory(conn).
+			Query("RESET ALL").
+			Reply("RESET").
 			Query(sql).
 			Reply("CREATE SCHEMA").
 			Query(migration.INSERT_MIGRATION_VERSION, "0", "test", []string{sql}).
@@ -313,6 +315,8 @@ create schema public`)
 			Query(CREATE_TEMPLATE).
 			Reply("CREATE DATABASE")
 		helper.MockMigrationHistory(conn).
+			Query("RESET ALL").
+			Reply("RESET").
 			Query(sql).
 			Reply("CREATE SCHEMA").
 			Query(migration.INSERT_MIGRATION_VERSION, "0", "test", []string{sql}).

internal/db/lint/lint_test.go

@@ -62,7 +62,7 @@ func TestLintCommand(t *testing.T) {
 		Query(ENABLE_PGSQL_CHECK).
 		Reply("CREATE EXTENSION").
 		Query(checkSchemaScript, "public").
-		Reply("SELECT 1", []interface{}{"f1", string(data)}).
+		Reply("SELECT 1", []any{"f1", string(data)}).
 		Query("rollback").Reply("ROLLBACK")
 	// Run test
 	err = Run(context.Background(), []string{"public"}, "warning", "none", dbConfig, fsys, conn.Intercept)
@@ -117,8 +117,8 @@ func TestLintDatabase(t *testing.T) {
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
 			Reply("SELECT 2",
-				[]interface{}{"f1", string(r1)},
-				[]interface{}{"f2", string(r2)},
+				[]any{"f1", string(r1)},
+				[]any{"f2", string(r2)},
 			).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
@@ -158,9 +158,9 @@ func TestLintDatabase(t *testing.T) {
 			Query(ENABLE_PGSQL_CHECK).
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
-			Reply("SELECT 1", []interface{}{"where_clause", string(r1)}).
+			Reply("SELECT 1", []any{"where_clause", string(r1)}).
 			Query(checkSchemaScript, "private").
-			Reply("SELECT 1", []interface{}{"f2", string(r2)}).
+			Reply("SELECT 1", []any{"f2", string(r2)}).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
 		result, err := LintDatabase(context.Background(), conn.MockClient(t), []string{"public", "private"})
@@ -191,7 +191,7 @@ func TestLintDatabase(t *testing.T) {
 			Query(ENABLE_PGSQL_CHECK).
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
-			Reply("SELECT 1", []interface{}{"f1", "malformed"}).
+			Reply("SELECT 1", []any{"f1", "malformed"}).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
 		_, err := LintDatabase(context.Background(), conn.MockClient(t), []string{"public"})
@@ -253,7 +253,7 @@ func TestPrintResult(t *testing.T) {
 			Query(ENABLE_PGSQL_CHECK).
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
-			Reply("SELECT 1", []interface{}{"f1", `{"function":"22751","issues":[{"level":"warning","message":"test warning"}]}`}).
+			Reply("SELECT 1", []any{"f1", `{"function":"22751","issues":[{"level":"warning","message":"test warning"}]}`}).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
 		err := Run(context.Background(), []string{"public"}, "warning", "warning", dbConfig, fsys, conn.Intercept)
@@ -271,7 +271,7 @@ func TestPrintResult(t *testing.T) {
 			Query(ENABLE_PGSQL_CHECK).
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
-			Reply("SELECT 1", []interface{}{"f1", `{"function":"22751","issues":[{"level":"error","message":"test error"}]}`}).
+			Reply("SELECT 1", []any{"f1", `{"function":"22751","issues":[{"level":"error","message":"test error"}]}`}).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
 		err := Run(context.Background(), []string{"public"}, "warning", "error", dbConfig, fsys, conn.Intercept)
@@ -289,7 +289,7 @@ func TestPrintResult(t *testing.T) {
 			Query(ENABLE_PGSQL_CHECK).
 			Reply("CREATE EXTENSION").
 			Query(checkSchemaScript, "public").
-			Reply("SELECT 1", []interface{}{"f1", `{"function":"22751","issues":[{"level":"error","message":"test error"}]}`}).
+			Reply("SELECT 1", []any{"f1", `{"function":"22751","issues":[{"level":"error","message":"test error"}]}`}).
 			Query("rollback").Reply("ROLLBACK")
 		// Run test
 		err := Run(context.Background(), []string{"public"}, "warning", "none", dbConfig, fsys, conn.Intercept)

internal/db/pull/pull.go

@@ -7,6 +7,7 @@ import (
 	"math"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -120,7 +121,7 @@ func diffRemoteSchema(ctx context.Context, schema []string, path string, config
 func diffUserSchemas(ctx context.Context, schema []string, path string, config pgconn.Config, fsys afero.Fs) error {
 	var managed, user []string
 	for _, s := range schema {
-		if utils.SliceContains(managedSchemas, s) {
+		if slices.Contains(managedSchemas, s) {
 			managed = append(managed, s)
 		} else {
 			user = append(user, s)

internal/db/pull/pull_test.go

@@ -92,7 +92,7 @@ func TestPullSchema(t *testing.T) {
 		conn := pgtest.NewConn()
 		defer conn.Close(t)
 		conn.Query(migration.LIST_MIGRATION_VERSION).
-			Reply("SELECT 1", []interface{}{"0"}).
+			Reply("SELECT 1", []any{"0"}).
 			Query(migration.ListSchemas, migration.ManagedSchemas).
 			ReplyError(pgerrcode.DuplicateTable, `relation "test" already exists`)
 		// Run test
@@ -116,7 +116,7 @@ func TestPullSchema(t *testing.T) {
 		conn := pgtest.NewConn()
 		defer conn.Close(t)
 		conn.Query(migration.LIST_MIGRATION_VERSION).
-			Reply("SELECT 1", []interface{}{"0"})
+			Reply("SELECT 1", []any{"0"})
 		// Run test
 		err := run(context.Background(), []string{"public"}, "", conn.MockClient(t), fsys)
 		// Check error
@@ -167,7 +167,7 @@ func TestSyncRemote(t *testing.T) {
 		conn := pgtest.NewConn()
 		defer conn.Close(t)
 		conn.Query(migration.LIST_MIGRATION_VERSION).
-			Reply("SELECT 1", []interface{}{"20220727064247"})
+			Reply("SELECT 1", []any{"20220727064247"})
 		// Run test
 		err := assertRemoteInSync(context.Background(), conn.MockClient(t), fsys)
 		// Check error

internal/db/push/push_test.go

@@ -99,6 +99,8 @@ func TestMigrationPush(t *testing.T) {
 		conn.Query(migration.LIST_MIGRATION_VERSION).
 			Reply("SELECT 0")
 		helper.MockMigrationHistory(conn).
+			Query("RESET ALL").
+			Reply("RESET").
 			Query(migration.INSERT_MIGRATION_VERSION, "0", "test", nil).
 			ReplyError(pgerrcode.NotNullViolation, `null value in column "version" of relation "schema_migrations"`)
 		// Run test
@@ -121,6 +123,8 @@ func TestPushAll(t *testing.T) {
 		conn.Query(migration.LIST_MIGRATION_VERSION).
 			Reply("SELECT 0")
 		helper.MockMigrationHistory(conn).
+			Query("RESET ALL").
+			Reply("RESET").
 			Query(migration.INSERT_MIGRATION_VERSION, "0", "test", nil).
 			Reply("INSERT 0 1")
 		// Run test
@@ -179,6 +183,8 @@ func TestPushAll(t *testing.T) {
 			Query(migration.SELECT_SEED_TABLE).
 			Reply("SELECT 0")
 		helper.MockMigrationHistory(conn).
+			Query("RESET ALL").
+			Reply("RESET").
 			Query(migration.INSERT_MIGRATION_VERSION, "0", "test", nil).
 			Reply("INSERT 0 1")
 		helper.MockSeedHistory(conn).

internal/db/reset/reset_test.go

@@ -206,7 +206,7 @@ func TestRecreateDatabase(t *testing.T) {
 			Query(TERMINATE_BACKENDS).
 			Reply("SELECT 1").
 			Query(COUNT_REPLICATION_SLOTS).
-			Reply("SELECT 1", []interface{}{0}).
+			Reply("SELECT 1", []any{0}).
 			Query("DROP DATABASE IF EXISTS postgres WITH (FORCE)").
 			Reply("DROP DATABASE").
 			Query("CREATE DATABASE postgres WITH OWNER postgres").
@@ -269,7 +269,7 @@ func TestRecreateDatabase(t *testing.T) {
 			Query(TERMINATE_BACKENDS).
 			Reply("SELECT 1").
 			Query(COUNT_REPLICATION_SLOTS).
-			Reply("SELECT 1", []interface{}{0}).
+			Reply("SELECT 1", []any{0}).
 			Query("DROP DATABASE IF EXISTS postgres WITH (FORCE)").
 			ReplyError(pgerrcode.ObjectInUse, `database "postgres" is used by an active logical replication slot`).
 			Query("CREATE DATABASE postgres WITH OWNER postgres").

internal/hostnames/common_test.go

@@ -19,7 +19,7 @@ func TestVerifyCNAME(t *testing.T) {
 		MatchParam("type", "5").
 		MatchHeader("accept", "application/dns-json").
 		Reply(http.StatusOK).
-		JSON(&map[string]interface{}{"Answer": []map[string]interface{}{
+		JSON(&map[string]any{"Answer": []map[string]any{
 			{
 				"Type": 5, "Data": "foobarbaz.supabase.co.",
 			},
@@ -36,7 +36,7 @@ func TestVerifyCNAMEFailures(t *testing.T) {
 		MatchParam("type", "5").
 		MatchHeader("accept", "application/dns-json").
 		Reply(http.StatusOK).
-		JSON(&map[string]interface{}{"Answer": []map[string]interface{}{
+		JSON(&map[string]any{"Answer": []map[string]any{
 			{
 				"Type": 28, "Data": "127.0.0.1",
 			},

internal/init/init.go

@@ -99,7 +99,7 @@ func updateGitIgnore(ignorePath string, fsys afero.Fs) error {
 	return nil
 }
 
-type VSCodeSettings map[string]interface{}
+type VSCodeSettings map[string]any
 
 func loadUserSettings(path string, fsys afero.Fs) (VSCodeSettings, error) {
 	data, err := afero.ReadFile(fsys, path)