Prod deploy

.github/dependabot.yml

@@ -18,6 +18,6 @@ updates:
       interval: "daily"
     ignore:
       - dependency-name: "library/kong"
-      - dependency-name: "inbucket/inbucket"
+      - dependency-name: "axllent/mailpit"
       - dependency-name: "darthsim/imgproxy"
       - dependency-name: "timberio/vector"

.github/workflows/ci.yml

@@ -56,6 +56,7 @@ jobs:
           cache: true
       - run: go build main.go
       - run: ./main init
+      - run: sed -i '/\[db.pooler\]/{n;s/.*/enabled = true/}' supabase/config.toml
       - run: ./main start
         env:
           SUPABASE_INTERNAL_IMAGE_REGISTRY: ghcr.io

cmd/branches.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/go-errors/errors"
+	"github.com/google/uuid"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 	"github.com/supabase/cli/internal/branches/create"
@@ -75,14 +76,11 @@ var (
 		Args:  cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
-			if len(args) == 0 {
-				if err := promptBranchId(ctx, flags.ProjectRef); err != nil {
-					return err
-				}
-			} else {
-				branchId = args[0]
+			fsys := afero.NewOsFs()
+			if err := promptBranchId(ctx, args, fsys); err != nil {
+				return err
 			}
-			return get.Run(ctx, branchId, afero.NewOsFs())
+			return get.Run(ctx, branchId, fsys)
 		},
 	}
 
@@ -101,7 +99,7 @@ var (
 	branchUpdateCmd = &cobra.Command{
 		Use:   "update [branch-id]",
 		Short: "Update a preview branch",
-		Long:  "Update a preview branch by its ID.",
+		Long:  "Update a preview branch by its name or ID.",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cmdFlags := cmd.Flags()
@@ -119,30 +117,24 @@ var (
 				body.Status = (*api.UpdateBranchBodyStatus)(&branchStatus.Value)
 			}
 			ctx := cmd.Context()
-			if len(args) == 0 {
-				if err := promptBranchId(ctx, flags.ProjectRef); err != nil {
-					return err
-				}
-			} else {
-				branchId = args[0]
+			fsys := afero.NewOsFs()
+			if err := promptBranchId(ctx, args, fsys); err != nil {
+				return err
 			}
-			return update.Run(cmd.Context(), branchId, body, afero.NewOsFs())
+			return update.Run(cmd.Context(), branchId, body, fsys)
 		},
 	}
 
 	branchDeleteCmd = &cobra.Command{
 		Use:   "delete [branch-id]",
 		Short: "Delete a preview branch",
-		Long:  "Delete a preview branch by its ID.",
+		Long:  "Delete a preview branch by its name or ID.",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
-			if len(args) == 0 {
-				if err := promptBranchId(ctx, flags.ProjectRef); err != nil {
-					return err
-				}
-			} else {
-				branchId = args[0]
+			fsys := afero.NewOsFs()
+			if err := promptBranchId(ctx, args, fsys); err != nil {
+				return err
 			}
 			return delete.Run(ctx, branchId)
 		},
@@ -165,8 +157,6 @@ func init() {
 	createFlags.Var(&branchRegion, "region", "Select a region to deploy the branch database.")
 	createFlags.Var(&size, "size", "Select a desired instance size for the branch database.")
 	createFlags.BoolVar(&persistent, "persistent", false, "Whether to create a persistent branch.")
-	getFlags := branchGetCmd.Flags()
-	getFlags.VarP(&utils.OutputFormat, "output", "o", "Output format of branch details.")
 	branchesCmd.AddCommand(branchCreateCmd)
 	branchesCmd.AddCommand(branchListCmd)
 	branchesCmd.AddCommand(branchGetCmd)
@@ -181,40 +171,43 @@ func init() {
 	rootCmd.AddCommand(branchesCmd)
 }
 
-func promptBranchId(ctx context.Context, ref string) error {
-	resp, err := utils.GetSupabase().V1ListAllBranchesWithResponse(ctx, ref)
-	if err != nil {
-		return errors.Errorf("failed to list preview branches: %w", err)
-	}
-	if resp.JSON200 == nil {
-		return errors.New("Unexpected error listing preview branches: " + string(resp.Body))
-	}
-	console := utils.NewConsole()
-	if !console.IsTTY {
-		// Fallback to current git branch on GHA
-		gitBranch := keys.GetGitBranch(afero.NewOsFs())
-		title := "Enter the name of your branch: "
-		if len(gitBranch) > 0 {
-			title = fmt.Sprintf("%-2s (or leave blank to use %s): ", title, utils.Aqua(gitBranch))
+func promptBranchId(ctx context.Context, args []string, fsys afero.Fs) error {
+	var filter []list.BranchFilter
+	if len(args) > 0 {
+		if branchId = args[0]; uuid.Validate(branchId) == nil {
+			return nil
+		}
+		// Try resolving as branch name
+		filter = append(filter, list.FilterByName(branchId))
+	} else if console := utils.NewConsole(); !console.IsTTY {
+		// Only read from stdin if the terminal is non-interactive
+		title := "Enter the name of your branch"
+		if branchId = keys.GetGitBranch(fsys); len(branchId) > 0 {
+			title += fmt.Sprintf(" (or leave blank to use %s)", utils.Aqua(branchId))
 		}
+		title += ": "
 		if name, err := console.PromptText(ctx, title); err != nil {
 			return err
 		} else if len(name) > 0 {
-			gitBranch = name
+			branchId = name
 		}
-		if len(gitBranch) == 0 {
-			return errors.New("git branch cannot be empty")
+		if len(branchId) == 0 {
+			return errors.New("branch name cannot be empty")
 		}
-		for _, branch := range *resp.JSON200 {
-			if branch.Name == gitBranch {
-				branchId = branch.Id
-				return nil
-			}
-		}
-		return errors.Errorf("Branch not found: %s", gitBranch)
+		filter = append(filter, list.FilterByName(branchId))
+	}
+	branches, err := list.ListBranch(ctx, flags.ProjectRef, filter...)
+	if err != nil {
+		return err
+	} else if len(branches) == 0 {
+		return errors.Errorf("branch not found: %s", branchId)
+	} else if len(branches) == 1 {
+		branchId = branches[0].Id
+		return nil
 	}
-	items := make([]utils.PromptItem, len(*resp.JSON200))
-	for i, branch := range *resp.JSON200 {
+	// Let user choose from a list of branches
+	items := make([]utils.PromptItem, len(branches))
+	for i, branch := range branches {
 		items[i] = utils.PromptItem{
 			Summary: branch.Name,
 			Details: branch.Id,

cmd/gen.go

@@ -21,16 +21,7 @@ var (
 		Short:   "Run code generation tools",
 	}
 
-	keyNames  keys.CustomName
-	keyOutput = utils.EnumFlag{
-		Allowed: []string{
-			utils.OutputEnv,
-			utils.OutputJson,
-			utils.OutputToml,
-			utils.OutputYaml,
-		},
-		Value: utils.OutputEnv,
-	}
+	keyNames keys.CustomName
 
 	genKeysCmd = &cobra.Command{
 		Use:   "keys",
@@ -47,7 +38,11 @@ var (
 			return cmd.Root().PersistentPreRunE(cmd, args)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return keys.Run(cmd.Context(), flags.ProjectRef, keyOutput.Value, keyNames, afero.NewOsFs())
+			format := utils.OutputFormat.Value
+			if format == utils.OutputPretty {
+				format = utils.OutputEnv
+			}
+			return keys.Run(cmd.Context(), flags.ProjectRef, format, keyNames, afero.NewOsFs())
 		},
 	}
 
@@ -114,7 +109,6 @@ func init() {
 	genCmd.AddCommand(genTypesCmd)
 	keyFlags := genKeysCmd.Flags()
 	keyFlags.StringVar(&flags.ProjectRef, "project-ref", "", "Project ref of the Supabase project.")
-	keyFlags.VarP(&keyOutput, "output", "o", "Output format of key variables.")
 	keyFlags.StringSliceVar(&override, "override-name", []string{}, "Override specific variable names.")
 	genCmd.AddCommand(genKeysCmd)
 	rootCmd.AddCommand(genCmd)

cmd/status.go

@@ -14,10 +14,6 @@ import (
 var (
 	override []string
 	names    status.CustomName
-	output   = utils.EnumFlag{
-		Allowed: append([]string{utils.OutputEnv}, utils.OutputDefaultAllowed...),
-		Value:   utils.OutputPretty,
-	}
 
 	statusCmd = &cobra.Command{
 		GroupID: groupLocalDev,
@@ -32,7 +28,7 @@ var (
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, _ := signal.NotifyContext(cmd.Context(), os.Interrupt)
-			return status.Run(ctx, names, output.Value, afero.NewOsFs())
+			return status.Run(ctx, names, utils.OutputFormat.Value, afero.NewOsFs())
 		},
 		Example: `  supabase status -o env --override-name api.url=NEXT_PUBLIC_SUPABASE_URL
   supabase status -o json`,
@@ -41,7 +37,6 @@ var (
 
 func init() {
 	flags := statusCmd.Flags()
-	flags.VarP(&output, "output", "o", "Output format of status variables.")
 	flags.StringSliceVar(&override, "override-name", []string{}, "Override specific variable names.")
 	rootCmd.AddCommand(statusCmd)
 }

examples/functions-deploy/main.go

@@ -19,17 +19,15 @@ func main() {
 	}
 }
 
-// Requires edge runtime binary to be added to PATH
 func deploy(ctx context.Context, fsys fs.FS) error {
 	project := os.Getenv("SUPABASE_PROJECT_ID")
 	apiClient := newAPIClient(os.Getenv("SUPABASE_ACCESS_TOKEN"))
-	eszipBundler := function.NewNativeBundler(".", fsys)
-	functionClient := function.NewEdgeRuntimeAPI(project, apiClient, eszipBundler)
+	functionClient := function.NewEdgeRuntimeAPI(project, apiClient)
 	fc := config.FunctionConfig{"my-slug": {
 		Entrypoint: "supabase/functions/my-slug/index.ts",
 		ImportMap:  "supabase/functions/import_map.json",
 	}}
-	return functionClient.UpsertFunctions(ctx, fc)
+	return functionClient.Deploy(ctx, fc, fsys)
 }
 
 func newAPIClient(token string) api.ClientWithResponses {