Merge branch 'develop' into patch9

Author: 7ttp

.github/workflows/automerge.yml

@@ -24,15 +24,15 @@ jobs:
 
       # Here the PR gets approved.
       - name: Approve a PR
-        if: ${{ steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
+        if: ${{ steps.meta.outputs.update-type == null || steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
         run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # Finally, this sets the PR to allow auto-merging for patch and minor
       # updates if all checks pass
       - name: Enable auto-merge for Dependabot PRs
-        if: ${{ steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
+        if: ${{ steps.meta.outputs.update-type == null || steps.meta.outputs.update-type == 'version-update:semver-patch' || (!startsWith(steps.meta.outputs.previous-version, '0.') && steps.meta.outputs.update-type == 'version-update:semver-minor') }}
         run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cmd/link.go

@@ -1,13 +1,15 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"os/signal"
 
 	"github.com/spf13/afero"
 	"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"
 )
@@ -39,6 +41,9 @@ var (
 			cobra.CheckErr(viper.BindPFlag("DB_PASSWORD", cmd.Flags().Lookup("password")))
 			return link.Run(ctx, flags.ProjectRef, skipPooler, fsys)
 		},
+		PostRun: func(cmd *cobra.Command, args []string) {
+			fmt.Fprintln(os.Stdout, "Finished "+utils.Aqua("supabase link")+".")
+		},
 	}
 )
 

docs/supabase/db/pull.md

@@ -4,6 +4,8 @@ Pulls schema changes from a remote database. A new migration file will be create
 
 Requires your local project to be linked to a remote database by running `supabase link`. For self-hosted databases, you can pass in the connection parameters using `--db-url` flag.
 
+> Note this command requires Docker Desktop (or a running Docker daemon), as it starts a local Postgres container to diff your remote schema.
+
 Optionally, a new row can be inserted into the migration history table to reflect the current state of the remote database.
 
 If no entries exist in the migration history table, `pg_dump` will be used to capture all contents of the remote schemas you have created. Otherwise, this command will only diff schema changes against the remote database, similar to running `db diff --linked`.

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/mithrandie/csvq-driver v1.7.0
 	github.com/muesli/reflow v0.3.0
 	github.com/oapi-codegen/nullable v1.1.0
-	github.com/olekukonko/tablewriter v1.1.1
+	github.com/olekukonko/tablewriter v1.1.2
 	github.com/slack-go/slack v0.17.3
 	github.com/spf13/afero v1.15.0
 	github.com/spf13/cobra v1.10.1
@@ -127,9 +127,9 @@ require (
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/ckaznocha/intrange v0.3.1 // indirect
-	github.com/clipperhouse/displaywidth v0.3.1 // indirect
+	github.com/clipperhouse/displaywidth v0.6.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/containerd/console v1.0.5 // indirect
 	github.com/containerd/containerd/api v1.9.0 // indirect
@@ -321,7 +321,7 @@ require (
 	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
 	github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
 	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/olekukonko/ll v0.1.2 // indirect
+	github.com/olekukonko/ll v0.1.3 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect

go.sum

@@ -190,12 +190,12 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs=
 github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk=
-github.com/clipperhouse/displaywidth v0.3.1 h1:k07iN9gD32177o1y4O1jQMzbLdCrsGJh+blirVYybsk=
-github.com/clipperhouse/displaywidth v0.3.1/go.mod h1:tgLJKKyaDOCadywag3agw4snxS5kYEuYR6Y9+qWDDYM=
+github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
+github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
 github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
 github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
-github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
-github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
+github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e85keuznYcH5rqI438v41pKcBl4ZxQ=
 github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
 github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
@@ -838,10 +838,10 @@ github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 h1:zrbMGy9YXpIeTnGj
 github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
 github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
 github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
-github.com/olekukonko/ll v0.1.2 h1:lkg/k/9mlsy0SxO5aC+WEpbdT5K83ddnNhAepz7TQc0=
-github.com/olekukonko/ll v0.1.2/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
-github.com/olekukonko/tablewriter v1.1.1 h1:b3reP6GCfrHwmKkYwNRFh2rxidGHcT6cgxj/sHiDDx0=
-github.com/olekukonko/tablewriter v1.1.1/go.mod h1:De/bIcTF+gpBDB3Alv3fEsZA+9unTsSzAg/ZGADCtn4=
+github.com/olekukonko/ll v0.1.3 h1:sV2jrhQGq5B3W0nENUISCR6azIPf7UBUpVq0x/y70Fg=
+github.com/olekukonko/ll v0.1.3/go.mod h1:b52bVQRRPObe+yyBl0TxNfhesL0nedD4Cht0/zx55Ew=
+github.com/olekukonko/tablewriter v1.1.2 h1:L2kI1Y5tZBct/O/TyZK1zIE9GlBj/TVs+AY5tZDCDSc=
+github.com/olekukonko/tablewriter v1.1.2/go.mod h1:z7SYPugVqGVavWoA2sGsFIoOVNmEHxUAAMrhXONtfkg=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=

internal/link/link.go

@@ -13,7 +13,6 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
 	"github.com/supabase/cli/internal/utils"
-	"github.com/supabase/cli/internal/utils/flags"
 	"github.com/supabase/cli/internal/utils/tenant"
 	"github.com/supabase/cli/pkg/api"
 	"github.com/supabase/cli/pkg/cast"
@@ -22,40 +21,18 @@ import (
 )
 
 func Run(ctx context.Context, projectRef string, skipPooler bool, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
-	majorVersion := utils.Config.Db.MajorVersion
+	// 1. Link postgres version
 	if err := checkRemoteProjectStatus(ctx, projectRef, fsys); err != nil {
 		return err
 	}
-
-	// 1. Check service config
+	// 2. Check service config
 	keys, err := tenant.GetApiKeys(ctx, projectRef)
 	if err != nil {
 		return err
 	}
 	LinkServices(ctx, projectRef, keys.ServiceRole, skipPooler, fsys)
-
-	// 2. Check database connection
-	if config, err := flags.NewDbConfigWithPassword(ctx, projectRef); err != nil {
-		fmt.Fprintln(os.Stderr, utils.Yellow("WARN:"), err)
-	} else if err := linkDatabase(ctx, config, fsys, options...); err != nil {
-		return err
-	}
-
 	// 3. Save project ref
-	if err := utils.WriteFile(utils.ProjectRefPath, []byte(projectRef), fsys); err != nil {
-		return err
-	}
-	fmt.Fprintln(os.Stdout, "Finished "+utils.Aqua("supabase link")+".")
-
-	// 4. Suggest config update
-	if utils.Config.Db.MajorVersion != majorVersion {
-		fmt.Fprintln(os.Stderr, utils.Yellow("WARNING:"), "Local database version differs from the linked project.")
-		fmt.Fprintf(os.Stderr, `Update your %s to fix it:
-[db]
-major_version = %d
-`, utils.Bold(utils.ConfigPath), utils.Config.Db.MajorVersion)
-	}
-	return nil
+	return utils.WriteFile(utils.ProjectRefPath, []byte(projectRef), fsys)
 }
 
 func LinkServices(ctx context.Context, projectRef, serviceKey string, skipPooler bool, fsys afero.Fs) {
@@ -66,7 +43,7 @@ func LinkServices(ctx context.Context, projectRef, serviceKey string, skipPooler
 		func() error { return linkNetworkRestrictions(ctx, projectRef) },
 		func() error { return linkPostgrest(ctx, projectRef) },
 		func() error { return linkGotrue(ctx, projectRef) },
-		func() error { return linkStorage(ctx, projectRef) },
+		func() error { return linkStorage(ctx, projectRef, fsys) },
 		func() error {
 			if skipPooler {
 				utils.Config.Db.Pooler.ConnectionString = ""
@@ -128,15 +105,15 @@ func linkGotrueVersion(ctx context.Context, api tenant.TenantAPI, fsys afero.Fs)
 	return utils.WriteFile(utils.GotrueVersionPath, []byte(version), fsys)
 }
 
-func linkStorage(ctx context.Context, projectRef string) error {
+func linkStorage(ctx context.Context, projectRef string, fsys afero.Fs) error {
 	resp, err := utils.GetSupabase().V1GetStorageConfigWithResponse(ctx, projectRef)
 	if err != nil {
 		return errors.Errorf("failed to read Storage config: %w", err)
 	} else if resp.JSON200 == nil {
 		return errors.Errorf("unexpected Storage config status %d: %s", resp.StatusCode(), string(resp.Body))
 	}
 	utils.Config.Storage.FromRemoteStorageConfig(*resp.JSON200)
-	return nil
+	return utils.WriteFile(utils.StorageMigrationPath, []byte(utils.Config.Storage.TargetMigration), fsys)
 }
 
 func linkStorageVersion(ctx context.Context, api tenant.TenantAPI, fsys afero.Fs) error {
@@ -253,8 +230,24 @@ func checkRemoteProjectStatus(ctx context.Context, projectRef string, fsys afero
 	}
 
 	// Update postgres image version to match the remote project
-	if version := resp.JSON200.Database.Version; len(version) > 0 {
-		return utils.WriteFile(utils.PostgresVersionPath, []byte(version), fsys)
+	return linkPostgresVersion(resp.JSON200.Database.Version, fsys)
+}
+
+func linkPostgresVersion(version string, fsys afero.Fs) error {
+	if len(version) == 0 {
+		return nil
 	}
-	return nil
+	majorVersion, err := strconv.ParseUint(strings.Split(version, ".")[0], 10, 7)
+	if err != nil {
+		return errors.Errorf("invalid major version: %w", err)
+	}
+	if uint64(utils.Config.Db.MajorVersion) != majorVersion {
+		fmt.Fprintln(os.Stderr, utils.Yellow("WARNING:"), "Local database version differs from the linked project.")
+		fmt.Fprintf(os.Stderr, `Update your %s to fix it:
+[db]
+major_version = %d
+`, utils.Bold(utils.ConfigPath), majorVersion)
+	}
+	utils.Config.Db.MajorVersion = uint(majorVersion)
+	return utils.WriteFile(utils.PostgresVersionPath, []byte(version), fsys)
 }

internal/start/start.go

@@ -244,9 +244,10 @@ func run(ctx context.Context, fsys afero.Fs, excludedContainers []string, dbConf
 	}
 
 	var started []string
-	var isStorageEnabled = utils.Config.Storage.Enabled && !isContainerExcluded(utils.Config.Storage.Image, excluded)
-	var isImgProxyEnabled = utils.Config.Storage.ImageTransformation != nil &&
+	isStorageEnabled := utils.Config.Storage.Enabled && !isContainerExcluded(utils.Config.Storage.Image, excluded)
+	isImgProxyEnabled := utils.Config.Storage.ImageTransformation != nil &&
 		utils.Config.Storage.ImageTransformation.Enabled && !isContainerExcluded(utils.Config.Storage.ImgProxyImage, excluded)
+	isS3ProtocolEnabled := utils.Config.Storage.S3Protocol != nil && utils.Config.Storage.S3Protocol.Enabled
 	fmt.Fprintln(os.Stderr, "Starting containers...")
 
 	// Start Logflare
@@ -793,7 +794,10 @@ EOF
 				env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_%s_URL=%s", strings.ToUpper(name), config.Url))
 			}
 		}
-		env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))
+		env = append(env,
+			fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled),
+			fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_ETHEREUM_ENABLED=%v", utils.Config.Auth.Web3.Ethereum.Enabled),
+		)
 
 		// OAuth server configuration
 		if utils.Config.Auth.OAuthServer.Enabled {
@@ -994,6 +998,7 @@ EOF
 					fmt.Sprintf("ENABLE_IMAGE_TRANSFORMATION=%t", isImgProxyEnabled),
 					fmt.Sprintf("IMGPROXY_URL=http://%s:5001", utils.ImgProxyId),
 					"TUS_URL_PATH=/storage/v1/upload/resumable",
+					fmt.Sprintf("S3_PROTOCOL_ENABLED=%t", isS3ProtocolEnabled),
 					"S3_PROTOCOL_ACCESS_KEY_ID=" + utils.Config.Storage.S3Credentials.AccessKeyId,
 					"S3_PROTOCOL_ACCESS_KEY_SECRET=" + utils.Config.Storage.S3Credentials.SecretAccessKey,
 					"S3_PROTOCOL_PREFIX=/storage/v1",

internal/status/status.go

@@ -84,7 +84,7 @@ func (c *CustomName) toValues(exclude ...string) map[string]string {
 		values[c.MailpitURL] = fmt.Sprintf("http://%s:%d", utils.Config.Hostname, utils.Config.Inbucket.Port)
 		values[c.InbucketURL] = fmt.Sprintf("http://%s:%d", utils.Config.Hostname, utils.Config.Inbucket.Port)
 	}
-	if storageEnabled {
+	if storageEnabled && utils.Config.Storage.S3Protocol != nil && utils.Config.Storage.S3Protocol.Enabled {
 		values[c.StorageS3URL] = utils.GetApiUrl("/storage/v1/s3")
 		values[c.StorageS3AccessKeyId] = utils.Config.Storage.S3Credentials.AccessKeyId
 		values[c.StorageS3SecretAccessKey] = utils.Config.Storage.S3Credentials.SecretAccessKey

pkg/config/config.go

@@ -295,6 +295,10 @@ func (s *storage) Clone() storage {
 		img := *s.ImageTransformation
 		copy.ImageTransformation = &img
 	}
+	if s.S3Protocol != nil {
+		s3 := *s.S3Protocol
+		copy.S3Protocol = &s3
+	}
 	return copy
 }
 

pkg/config/storage.go

@@ -14,6 +14,7 @@ type (
 		ImgProxyImage       string               `toml:"-"`
 		FileSizeLimit       sizeInBytes          `toml:"file_size_limit"`
 		ImageTransformation *imageTransformation `toml:"image_transformation"`
+		S3Protocol          *s3Protocol          `toml:"s3_protocol"`
 		S3Credentials       storageS3Credentials `toml:"-"`
 		Buckets             BucketConfig         `toml:"buckets"`
 	}
@@ -22,6 +23,10 @@ type (
 		Enabled bool `toml:"enabled"`
 	}
 
+	s3Protocol struct {
+		Enabled bool `toml:"enabled"`
+	}
+
 	storageS3Credentials struct {
 		AccessKeyId     string `toml:"-"`
 		SecretAccessKey string `toml:"-"`
@@ -41,10 +46,7 @@ type (
 func (s *storage) ToUpdateStorageConfigBody() v1API.UpdateStorageConfigBody {
 	body := v1API.UpdateStorageConfigBody{
 		FileSizeLimit: cast.Ptr(int64(s.FileSizeLimit)),
-	}
-	// When local config is not set, we assume platform defaults should not change
-	if s.ImageTransformation != nil {
-		body.Features = &struct {
+		Features: &struct {
 			IcebergCatalog *struct {
 				Enabled       bool `json:"enabled"`
 				MaxCatalogs   int  `json:"maxCatalogs"`
@@ -62,26 +64,32 @@ func (s *storage) ToUpdateStorageConfigBody() v1API.UpdateStorageConfigBody {
 				MaxBuckets int  `json:"maxBuckets"`
 				MaxIndexes int  `json:"maxIndexes"`
 			} `json:"vectorBuckets,omitempty"`
-		}{}
+		}{},
+	}
+	// When local config is not set, we assume platform defaults should not change
+	if s.ImageTransformation != nil {
 		body.Features.ImageTransformation.Enabled = s.ImageTransformation.Enabled
 	}
+	if s.S3Protocol != nil {
+		body.Features.S3Protocol.Enabled = s.S3Protocol.Enabled
+	}
 	return body
 }
 
 func (s *storage) FromRemoteStorageConfig(remoteConfig v1API.StorageConfigResponse) {
 	s.FileSizeLimit = sizeInBytes(remoteConfig.FileSizeLimit)
+	s.TargetMigration = remoteConfig.MigrationVersion
 	// When local config is not set, we assume platform defaults should not change
 	if s.ImageTransformation != nil {
 		s.ImageTransformation.Enabled = remoteConfig.Features.ImageTransformation.Enabled
 	}
+	if s.S3Protocol != nil {
+		s.S3Protocol.Enabled = remoteConfig.Features.S3Protocol.Enabled
+	}
 }
 
 func (s *storage) DiffWithRemote(remoteConfig v1API.StorageConfigResponse) ([]byte, error) {
 	copy := s.Clone()
-	if s.ImageTransformation != nil {
-		img := *s.ImageTransformation
-		copy.ImageTransformation = &img
-	}
 	// Convert the config values into easily comparable remoteConfig values
 	currentValue, err := ToTomlBytes(copy)
 	if err != nil {