fix: unmarshal remote override into base config (#3028)

* fix: unmarshal remote override into base config * chore: account for project ref flag when loading config * fix: restore project id from base config
supabase · Jan 10, 2025 · 88cd609 · 88cd609
1 parent 9898451
commit 88cd609
Show file tree

Hide file tree

Showing 31 changed files with 124 additions and 127 deletions.
diff --git a/cmd/link.go b/cmd/link.go
@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/supabase/cli/internal/link"
-	"github.com/supabase/cli/internal/utils"
 	"github.com/supabase/cli/internal/utils/flags"
 	"golang.org/x/term"
 )
@@ -31,8 +30,7 @@ var (
 				return err
 			}
 			fsys := afero.NewOsFs()
-			utils.Config.ProjectId = flags.ProjectRef
-			if err := utils.LoadConfigFS(fsys); err != nil {
+			if err := flags.LoadConfig(fsys); err != nil {
 				return err
 			}
 			return link.Run(ctx, flags.ProjectRef, fsys)

diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
@@ -95,7 +95,7 @@ func Run(ctx context.Context, starter StarterTemplate, fsys afero.Fs, options ..
 		return err
 	}
 	// 4. Link project
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	link.LinkServices(ctx, flags.ProjectRef, tenant.NewApiKey(keys).Anon, fsys)

diff --git a/internal/config/push/push.go b/internal/config/push/push.go
@@ -7,16 +7,20 @@ import (
 
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/config"
 )
 
 func Run(ctx context.Context, ref string, fsys afero.Fs) error {
-	utils.Config.ProjectId = ref
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	client := config.NewConfigUpdater(*utils.GetSupabase())
-	remote, _ := utils.Config.GetRemoteByProjectRef(ref)
+	remote, err := utils.Config.GetRemoteByProjectRef(ref)
+	if err != nil {
+		// Use base config when no remote is declared
+		remote.ProjectId = ref
+	}
 	fmt.Fprintln(os.Stderr, "Pushing config to project:", remote.ProjectId)
 	console := utils.NewConsole()
 	keep := func(name string) bool {

diff --git a/internal/db/branch/create/create.go b/internal/db/branch/create/create.go
@@ -14,6 +14,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 var (
@@ -22,7 +23,7 @@ var (
 )
 
 func Run(branch string, fsys afero.Fs) error {
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if err := utils.AssertSupabaseDbIsRunning(); err != nil {

diff --git a/internal/db/branch/delete/delete.go b/internal/db/branch/delete/delete.go
@@ -12,10 +12,11 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 func Run(branch string, fsys afero.Fs) error {
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if err := utils.AssertSupabaseDbIsRunning(); err != nil {

diff --git a/internal/db/branch/switch_/switch_.go b/internal/db/branch/switch_/switch_.go
@@ -12,12 +12,13 @@ import (
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/db/reset"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 func Run(ctx context.Context, target string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
 	// 1. Sanity checks
 	{
-		if err := utils.LoadConfigFS(fsys); err != nil {
+		if err := flags.LoadConfig(fsys); err != nil {
 			return err
 		}
 		if err := utils.AssertSupabaseDbIsRunning(); err != nil {

diff --git a/internal/db/diff/diff.go b/internal/db/diff/diff.go
@@ -24,6 +24,7 @@ import (
 	"github.com/supabase/cli/internal/db/start"
 	"github.com/supabase/cli/internal/gen/keys"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 	"github.com/supabase/cli/pkg/parser"
 )
@@ -32,7 +33,7 @@ type DiffFunc func(context.Context, string, string, []string) (string, error)
 
 func Run(ctx context.Context, schema []string, file string, config pgconn.Config, differ DiffFunc, fsys afero.Fs, options ...func(*pgx.ConnConfig)) (err error) {
 	// Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if utils.IsLocalDatabase(config) {

diff --git a/internal/db/diff/pgadmin.go b/internal/db/diff/pgadmin.go
@@ -11,6 +11,7 @@ import (
 	"github.com/supabase/cli/internal/db/start"
 	"github.com/supabase/cli/internal/migration/new"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/config"
 )
 
@@ -35,7 +36,7 @@ func SaveDiff(out, file string, fsys afero.Fs) error {
 func RunPgAdmin(ctx context.Context, schema []string, file string, config pgconn.Config, fsys afero.Fs) error {
 	// Sanity checks.
 	{
-		if err := utils.LoadConfigFS(fsys); err != nil {
+		if err := flags.LoadConfig(fsys); err != nil {
 			return err
 		}
 		if err := utils.AssertSupabaseDbIsRunning(); err != nil {

diff --git a/internal/db/pull/pull.go b/internal/db/pull/pull.go
@@ -18,6 +18,7 @@ import (
 	"github.com/supabase/cli/internal/migration/new"
 	"github.com/supabase/cli/internal/migration/repair"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
@@ -35,7 +36,7 @@ var (
 
 func Run(ctx context.Context, schema []string, config pgconn.Config, name string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
 	// 1. Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	// 2. Check postgres connection

diff --git a/internal/db/push/push.go b/internal/db/push/push.go
@@ -31,9 +31,10 @@ func Run(ctx context.Context, dryRun, ignoreVersionMismatch bool, includeRoles,
 	}
 	var seeds []migration.SeedFile
 	if includeSeed {
-		if remote, _ := utils.Config.GetRemoteByProjectRef(flags.ProjectRef); !remote.Db.Seed.Enabled {
-			fmt.Fprintln(os.Stderr, "Skipping seed because it is disabled in config.toml for project:", remote.ProjectId)
-		} else if seeds, err = migration.GetPendingSeeds(ctx, remote.Db.Seed.SqlPaths, conn, afero.NewIOFS(fsys)); err != nil {
+		// TODO: flag should override config but we don't resolve glob paths when seed is disabled.
+		if !utils.Config.Db.Seed.Enabled {
+			fmt.Fprintln(os.Stderr, "Skipping seed because it is disabled in config.toml for project:", flags.ProjectRef)
+		} else if seeds, err = migration.GetPendingSeeds(ctx, utils.Config.Db.Seed.SqlPaths, conn, afero.NewIOFS(fsys)); err != nil {
 			return err
 		}
 	}

diff --git a/internal/db/remote/changes/changes.go b/internal/db/remote/changes/changes.go
@@ -8,14 +8,15 @@ import (
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/db/diff"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
 var output string
 
 func Run(ctx context.Context, schema []string, config pgconn.Config, fsys afero.Fs) error {
 	// Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 

diff --git a/internal/db/remote/commit/commit.go b/internal/db/remote/commit/commit.go
@@ -15,12 +15,13 @@ import (
 	"github.com/supabase/cli/internal/migration/list"
 	"github.com/supabase/cli/internal/migration/repair"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
 func Run(ctx context.Context, schema []string, config pgconn.Config, fsys afero.Fs) error {
 	// Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 

diff --git a/internal/db/reset/reset.go b/internal/db/reset/reset.go
@@ -27,7 +27,6 @@ import (
 	"github.com/supabase/cli/internal/migration/repair"
 	"github.com/supabase/cli/internal/seed/buckets"
 	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
@@ -250,15 +249,11 @@ func resetRemote(ctx context.Context, version string, config pgconn.Config, fsys
 	if err := migration.ApplyMigrations(ctx, migrations, conn, afero.NewIOFS(fsys)); err != nil {
 		return err
 	}
-	remote, _ := utils.Config.GetRemoteByProjectRef(flags.ProjectRef)
-	if !remote.Db.Seed.Enabled {
-		fmt.Fprintln(os.Stderr, "Skipping seed because it is disabled in config.toml for project:", remote.ProjectId)
-		return nil
-	} else if !utils.Config.Db.Seed.Enabled {
+	if !utils.Config.Db.Seed.Enabled {
 		// Skip because --no-seed flag is set
 		return nil
 	}
-	seeds, err := migration.GetPendingSeeds(ctx, remote.Db.Seed.SqlPaths, conn, afero.NewIOFS(fsys))
+	seeds, err := migration.GetPendingSeeds(ctx, utils.Config.Db.Seed.SqlPaths, conn, afero.NewIOFS(fsys))
 	if err != nil {
 		return err
 	}

diff --git a/internal/db/start/start.go b/internal/db/start/start.go
@@ -23,6 +23,7 @@ import (
 	"github.com/supabase/cli/internal/migration/apply"
 	"github.com/supabase/cli/internal/status"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
@@ -39,7 +40,7 @@ var (
 )
 
 func Run(ctx context.Context, fromBackup string, fsys afero.Fs) error {
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if err := utils.AssertSupabaseDbIsRunning(); err == nil {

diff --git a/internal/functions/deploy/deploy.go b/internal/functions/deploy/deploy.go
@@ -18,7 +18,7 @@ import (
 
 func Run(ctx context.Context, slugs []string, projectRef string, noVerifyJWT *bool, importMapPath string, fsys afero.Fs) error {
 	// Load function config and project id
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	} else if len(slugs) > 0 {
 		for _, s := range slugs {
@@ -60,8 +60,7 @@ func GetFunctionSlugs(fsys afero.Fs) (slugs []string, err error) {
 		}
 	}
 	// Add all function slugs declared in config file
-	remote, _ := utils.Config.GetRemoteByProjectRef(flags.ProjectRef)
-	for slug := range remote.Functions {
+	for slug := range utils.Config.Functions {
 		slugs = append(slugs, slug)
 	}
 	return slugs, nil
@@ -82,10 +81,9 @@ func GetFunctionConfig(slugs []string, importMapPath string, noVerifyJWT *bool,
 	if len(importMapPath) > 0 && !filepath.IsAbs(importMapPath) {
 		importMapPath = filepath.Join(utils.CurrentDirAbs, importMapPath)
 	}
-	remote, _ := utils.Config.GetRemoteByProjectRef(flags.ProjectRef)
 	functionConfig := make(config.FunctionConfig, len(slugs))
 	for _, name := range slugs {
-		function := remote.Functions[name]
+		function := utils.Config.Functions[name]
 		// Precedence order: flag > config > fallback
 		functionDir := filepath.Join(utils.FunctionsDir, name)
 		if len(function.Entrypoint) == 0 {

diff --git a/internal/functions/download/download.go b/internal/functions/download/download.go
@@ -16,6 +16,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/api"
 )
 
@@ -112,7 +113,7 @@ func Run(ctx context.Context, slug string, projectRef string, useLegacyBundle bo
 		return RunLegacy(ctx, slug, projectRef, fsys)
 	}
 	// 1. Sanity check
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	// 2. Download eszip to temp file

diff --git a/internal/functions/new/new.go b/internal/functions/new/new.go
@@ -11,6 +11,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 var (
@@ -45,7 +46,7 @@ func Run(ctx context.Context, slug string, fsys afero.Fs) error {
 		}
 
 		// Load config if available
-		if err := utils.LoadConfigFS(fsys); err != nil {
+		if err := flags.LoadConfig(fsys); err != nil {
 			utils.CmdSuggestion = ""
 		}
 

diff --git a/internal/functions/serve/serve.go b/internal/functions/serve/serve.go
@@ -19,6 +19,7 @@ import (
 	"github.com/supabase/cli/internal/functions/deploy"
 	"github.com/supabase/cli/internal/secrets/set"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 type InspectMode string
@@ -70,7 +71,7 @@ var (
 
 func Run(ctx context.Context, envFilePath string, noVerifyJWT *bool, importMapPath string, runtimeOption RuntimeOption, fsys afero.Fs) error {
 	// 1. Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if err := utils.AssertSupabaseDbIsRunning(); err != nil {

diff --git a/internal/gen/types/types.go b/internal/gen/types/types.go
@@ -31,8 +31,7 @@ func Run(ctx context.Context, projectId string, dbConfig pgconn.Config, lang str
 	originalURL := utils.ToPostgresURL(dbConfig)
 	// Add default schemas if --schema flag is not specified
 	if len(schemas) == 0 {
-		remote, _ := utils.Config.GetRemoteByProjectRef(projectId)
-		schemas = utils.RemoveDuplicates(append([]string{"public"}, remote.Api.Schemas...))
+		schemas = utils.RemoveDuplicates(append([]string{"public"}, utils.Config.Api.Schemas...))
 	}
 	included := strings.Join(schemas, ",")
 

diff --git a/internal/migration/squash/squash.go b/internal/migration/squash/squash.go
@@ -20,6 +20,7 @@ import (
 	"github.com/supabase/cli/internal/migration/list"
 	"github.com/supabase/cli/internal/migration/repair"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/migration"
 )
 
@@ -34,7 +35,7 @@ func Run(ctx context.Context, version string, config pgconn.Config, fsys afero.F
 			return err
 		}
 	}
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	// 1. Squash local migrations

diff --git a/internal/seed/buckets/buckets.go b/internal/seed/buckets/buckets.go
@@ -26,9 +26,8 @@ func Run(ctx context.Context, projectRef string, interactive bool, fsys afero.Fs
 		}
 		return shouldOverwrite
 	}
-	remote, _ := utils.Config.GetRemoteByProjectRef(projectRef)
-	if err := api.UpsertBuckets(ctx, remote.Storage.Buckets, filter); err != nil {
+	if err := api.UpsertBuckets(ctx, utils.Config.Storage.Buckets, filter); err != nil {
 		return err
 	}
-	return api.UpsertObjects(ctx, remote.Storage.Buckets, utils.NewRootFS(fsys))
+	return api.UpsertObjects(ctx, utils.Config.Storage.Buckets, utils.NewRootFS(fsys))
 }
diff --git a/internal/start/start.go b/internal/start/start.go
@@ -37,7 +37,7 @@ import (
 func Run(ctx context.Context, fsys afero.Fs, excludedContainers []string, ignoreHealthCheck bool) error {
 	// Sanity checks.
 	{
-		if err := utils.LoadConfigFS(fsys); err != nil {
+		if err := flags.LoadConfig(fsys); err != nil {
 			return err
 		}
 		if err := utils.AssertSupabaseDbIsRunning(); err == nil {

diff --git a/internal/status/status.go b/internal/status/status.go
@@ -19,6 +19,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/pkg/fetcher"
 )
 
@@ -67,7 +68,7 @@ func (c *CustomName) toValues(exclude ...string) map[string]string {
 
 func Run(ctx context.Context, names CustomName, format string, fsys afero.Fs) error {
 	// Sanity checks.
-	if err := utils.LoadConfigFS(fsys); err != nil {
+	if err := flags.LoadConfig(fsys); err != nil {
 		return err
 	}
 	if err := assertContainerHealthy(ctx, utils.DbId); err != nil {

diff --git a/internal/stop/stop.go b/internal/stop/stop.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/docker/api/types/volume"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
+	"github.com/supabase/cli/internal/utils/flags"
 )
 
 func Run(ctx context.Context, backup bool, projectId string, all bool, fsys afero.Fs) error {
@@ -17,7 +18,7 @@ func Run(ctx context.Context, backup bool, projectId string, all bool, fsys afer
 		// Sanity checks.
 		if len(projectId) > 0 {
 			utils.Config.ProjectId = projectId
-		} else if err := utils.LoadConfigFS(fsys); err != nil {
+		} else if err := flags.LoadConfig(fsys); err != nil {
 			return err
 		}
 		searchProjectIdFilter = utils.Config.ProjectId