Prod deploy

.github/workflows/automerge.yml

@@ -17,24 +17,22 @@ jobs:
       # This first step will fail if there's no metadata and so the approval
       # will not occur.
       - name: Dependabot metadata
-        id: dependabot-metadata
+        id: meta
         uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       # Here the PR gets approved.
       - name: Approve a PR
-        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
-        run: gh pr review --approve "$PR_URL"
+        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') }}
+        run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
         env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
           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.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
-        run: gh pr merge --auto --squash "$PR_URL"
+        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') }}
+        run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
         env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cmd/link.go

@@ -36,9 +36,6 @@ var (
 			}
 			return link.Run(ctx, flags.ProjectRef, fsys)
 		},
-		PostRunE: func(cmd *cobra.Command, args []string) error {
-			return link.PostRun(flags.ProjectRef, os.Stdout, afero.NewOsFs())
-		},
 	}
 )
 

examples/README.md

@@ -0,0 +1,34 @@
+## Code examples using CLI library
+
+The examples in this directory demonstrate the minimal code to get started with building your own tools for managing Supabase projects. If you are a 3rd party service provider looking for ways to integrate with Supabase user projects, you may want to use the building blocks provided by this library.
+
+All examples come with an entrypoint that you can build and run locally.
+
+### Deploy functions
+
+```bash
+# Place your functions under supabase/functions
+export SUPABASE_PROJECT_ID="zeoxvqpvpyrxygmmatng"
+export SUPABASE_ACCESS_TOKEN="sbp_..."
+go run examples/deploy-functions/main.go
+```
+
+### Migrate database
+
+```bash
+# Place your schemas under supabase/migrations
+export PGHOST="db.zeoxvqpvpyrxygmmatng.supabase.co"
+export PGPORT="5432"
+export PGUSER="postgres"
+export PGPASS="<your-password>"
+export PGDATABASE="postgres"
+go run examples/migrate-database/main.go
+```
+
+### Seed storage buckets
+
+```bash
+export SUPABASE_PROJECT_ID="zeoxvqpvpyrxygmmatng"
+export SUPABASE_SERVICE_ROLE_KEY="eyJh..."
+go run examples/migrate-database/main.go
+```

examples/functions-deploy/main.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+	"context"
+	"io/fs"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/supabase/cli/pkg/api"
+	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/pkg/function"
+)
+
+func main() {
+	if err := deploy(context.Background(), os.DirFS(".")); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+// 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)
+	fc := config.FunctionConfig{"my-slug": {
+		Entrypoint: "supabase/functions/my-slug/index.ts",
+		ImportMap:  "supabase/functions/import_map.json",
+	}}
+	return functionClient.UpsertFunctions(ctx, fc)
+}
+
+func newAPIClient(token string) api.ClientWithResponses {
+	header := func(ctx context.Context, req *http.Request) error {
+		req.Header.Set("Authorization", "Bearer "+token)
+		return nil
+	}
+	client := api.ClientWithResponses{ClientInterface: &api.Client{
+		// Ensure the server URL always has a trailing slash
+		Server: "https://api.supabase.com/",
+		Client: &http.Client{
+			Timeout: 10 * time.Second,
+		},
+		RequestEditors: []api.RequestEditorFn{header},
+	}}
+	return client
+}

examples/migrations-up/main.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"context"
+	"io/fs"
+	"log"
+	"os"
+
+	"github.com/supabase/cli/pkg/migration"
+	"github.com/supabase/cli/pkg/pgxv5"
+)
+
+func main() {
+	if err := migrate(context.Background(), os.DirFS(".")); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+// Applies local migrations to a remote database, and tracks the history of executed statements.
+func migrate(ctx context.Context, fsys fs.FS) error {
+	conn, err := pgxv5.Connect(ctx, os.Getenv("SUPABASE_POSTGRES_URL"))
+	if err != nil {
+		return err
+	}
+	defer conn.Close(ctx)
+	files, err := migration.ListLocalMigrations("supabase/migrations", fsys)
+	if err != nil {
+		return err
+	}
+	return migration.ApplyMigrations(ctx, files, conn, fsys)
+}

examples/seed-buckets/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/supabase/cli/pkg/config"
+	"github.com/supabase/cli/pkg/fetcher"
+	"github.com/supabase/cli/pkg/storage"
+)
+
+func main() {
+	if err := seed(context.Background()); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+func seed(ctx context.Context) error {
+	project := os.Getenv("SUPABASE_PROJECT_ID")
+	serviceRoleKey := os.Getenv("SUPABASE_SERVICE_ROLE_KEY")
+	storageClient := newStorageClient(project, serviceRoleKey)
+	public := false
+	sc := config.BucketConfig{"my-bucket": {
+		Public: &public,
+	}}
+	return storageClient.UpsertBuckets(ctx, sc)
+}
+
+func newStorageClient(project, serviceRoleKey string) storage.StorageAPI {
+	return storage.StorageAPI{Fetcher: fetcher.NewFetcher(
+		fmt.Sprintf("https://db.%s.supabase.co", project),
+		fetcher.WithBearerToken(serviceRoleKey),
+		fetcher.WithHTTPClient(&http.Client{
+			Timeout: time.Second * 10,
+		}),
+		fetcher.WithExpectedStatus(http.StatusOK),
+	)}
+}

go.mod

@@ -1,14 +1,14 @@
 module github.com/supabase/cli
 
-go 1.22.3
+go 1.22.4
 
 require (
 	github.com/BurntSushi/toml v1.4.0
 	github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d
 	github.com/andybalholm/brotli v1.1.0
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/charmbracelet/bubbles v0.18.0
-	github.com/charmbracelet/bubbletea v0.26.6
+	github.com/charmbracelet/bubbletea v0.25.0
 	github.com/charmbracelet/glamour v0.7.0
 	github.com/charmbracelet/lipgloss v0.12.1
 	github.com/containers/common v0.59.2
@@ -102,14 +102,12 @@ require (
 	github.com/charithe/durationcheck v0.0.10 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
 	github.com/charmbracelet/x/ansi v0.1.4 // indirect
-	github.com/charmbracelet/x/input v0.1.0 // indirect
-	github.com/charmbracelet/x/term v0.1.1 // indirect
-	github.com/charmbracelet/x/windows v0.1.0 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/ckaznocha/intrange v0.1.2 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containers/storage v1.54.0 // indirect
 	github.com/curioswitch/go-reassign v0.2.0 // indirect
@@ -126,7 +124,6 @@ require (
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
 	github.com/fatih/color v1.17.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
@@ -142,7 +139,7 @@ require (
 	github.com/go-critic/go-critic v0.11.4 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
@@ -230,19 +227,19 @@ require (
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mgechev/revive v1.3.7 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.26 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/moricho/tparallel v0.3.1 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
@@ -311,7 +308,6 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xen0n/gosmopolitan v1.2.2 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
 	github.com/yeya24/promlinter v0.3.0 // indirect
 	github.com/ykadowak/zerologlint v0.1.5 // indirect
@@ -321,16 +317,16 @@ require (
 	go-simpler.org/musttag v0.12.2 // indirect
 	go-simpler.org/sloglint v0.7.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
-	go.opentelemetry.io/otel/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.27.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
-	go.opentelemetry.io/otel/trace v1.27.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
@@ -344,9 +340,9 @@ require (
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect