Enhancement/rebase supabase

.drone.yml

@@ -0,0 +1,26 @@
+---
+type: docker
+kind: pipeline
+name: "Main"
+
+steps:
+  - name: Docker build Git SHA
+    image: plugins/docker:20
+    pull: if-not-exists
+    environment:
+      DOCKER_BUILDKIT: 1
+    settings:
+      username:
+        from_secret: quay_username
+      password:
+        from_secret: quay_password
+      repo: quay.io/openware/gotrue
+      registry: quay.io
+      tag: ${DRONE_COMMIT:0:7}
+      purge: false
+    when:
+      event:
+        - push
+      branch:
+        - stable/ow
+        - feature/asymmetric-auth

.github/workflows/test.yml

@@ -33,6 +33,8 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Formatting checks
+        run: if [ ! -z $(gofmt -l .) ]; then echo 'Make sure to run "gofmt -s -w ." before commit!' && exit 1; fi
       - name: Init Database
         run: psql -f hack/init_postgres.sql postgresql://postgres:root@localhost:5432/postgres
       - name: Run migrations

CODEOWNERS

@@ -0,0 +1 @@
+* @supabase/auth

CONTRIBUTING.md

@@ -7,6 +7,48 @@ Docs aren't perfect and so we're here to help. If you're stuck on setup for more
 
 Please help us keep all our projects open and inclusive. Kindly follow our [Code of Conduct](<(CODE_OF_CONDUCT.md)>) to keep the ecosystem healthy and friendly for all.
 
+## Quick Start
+
+GoTrue has a development container setup that makes it easy to get started contributing. This setup only requires that [Docker](https://www.docker.com/get-started) is setup on your system. The development container setup includes a PostgreSQL container with migrations already applied and a container running GoTrue that will perform a hot reload when changes to the source code are detected.
+
+If you would like to run GoTrue locally or learn more about what these containers are doing for you, continue reading the [Setup and Tooling](#setup-and-tooling) section below. Otherwise, you can skip ahead to the [How To Verify that GoTrue is Available](#how-to-verify-that-gotrue-is-available) section to learn about working with and developing GoTrue.
+
+Before using the containers, you will need to make sure an `.env.docker` file exists by making a copy of `example.docker.env` and configuring it for your needs. The set of env vars in `example.docker.env` only contain the necessary env vars for gotrue to start in a docker environment. For the full list of env vars, please refer to `example.env` and copy over the necessary ones into your `.env.docker` file.
+
+The following are some basic commands. A full and up to date list of commands can be found in the project's `Makefile` or by running `make help`.
+
+### Starting the containers
+
+Start the containers as described above in an attached state with log output.
+
+``` bash
+make dev
+```
+
+### Running tests in the containers
+
+Start the containers with a fresh database and run the project's tests.
+
+``` bash
+make docker-test
+```
+
+### Removing the containers
+
+Remove both containers and their volumes. This removes any data associated with the containers.
+
+``` bash
+make docker-clean
+```
+
+### Rebuild the containers
+
+Fully rebuild the containers without using any cached layers.
+
+``` bash
+make docker-build
+```
+
 ## Setup and Tooling
 
 GoTrue -- as the name implies -- is a user registration and authentication API developed in [Go](https://go.dev).

Dockerfile

@@ -3,7 +3,7 @@ ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOOS=linux
 
-RUN apk add --no-cache make git
+RUN apk add --no-cache make git  curl
 
 WORKDIR /go/src/github.com/netlify/gotrue
 
@@ -15,11 +15,16 @@ RUN make deps
 COPY . /go/src/github.com/netlify/gotrue
 RUN make build
 
+ARG KAIGARA_VERSION=v1.0.10
+RUN curl -Lo ./kaigara  https://github.com/openware/kaigara/releases/download/${KAIGARA_VERSION}/kaigara \
+  && chmod +x ./kaigara
+
 FROM alpine:3.15
 RUN adduser -D -u 1000 netlify
 
 RUN apk add --no-cache ca-certificates
 COPY --from=build /go/src/github.com/netlify/gotrue/gotrue /usr/local/bin/gotrue
+COPY --from=build /go/src/github.com/netlify/gotrue/kaigara /usr/local/bin/kaigara
 COPY --from=build /go/src/github.com/netlify/gotrue/migrations /usr/local/etc/gotrue/migrations/
 
 ENV GOTRUE_DB_MIGRATIONS_PATH /usr/local/etc/gotrue/migrations

Dockerfile.dev

@@ -0,0 +1,18 @@
+FROM golang:1.17-alpine
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
+ENV GOOS=linux
+
+RUN apk add --no-cache make git bash
+
+WORKDIR /go/src/github.com/netlify/gotrue
+
+# Pulling dependencies
+COPY ./Makefile ./go.* ./
+
+# Production dependencies
+RUN make deps
+
+# Development dependences
+RUN go get github.com/githubnemo/CompileDaemon
+RUN go install github.com/githubnemo/CompileDaemon

Makefile

@@ -1,6 +1,7 @@
 .PHONY: all build deps image lint migrate test vet
 CHECK_FILES?=$$(go list ./... | grep -v /vendor/)
 FLAGS?=-ldflags "-X github.com/netlify/gotrue/cmd.Version=`git describe --tags`"
+DEV_DOCKER_COMPOSE:=docker-compose-dev.yml
 
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
@@ -12,13 +13,10 @@ build: ## Build the binary.
 	GOOS=linux GOARCH=arm64 go build $(FLAGS) -o gotrue-arm64
 
 deps: ## Install dependencies.
-	@go install github.com/gobuffalo/pop/soda@latest	
+	@go install github.com/gobuffalo/pop/soda@latest
 	@go install golang.org/x/lint/golint@latest
 	@go mod download
 
-image: ## Build the Docker image.
-	docker build .
-
 lint: ## Lint the code.
 	golint $(CHECK_FILES)
 
@@ -33,3 +31,28 @@ test: ## Run tests.
 
 vet: # Vet the code
 	go vet $(CHECK_FILES)
+
+dev: ## Run the development containers
+	docker-compose -f $(DEV_DOCKER_COMPOSE) up
+
+down: ## Shutdown the development containers
+	# Start postgres first and apply migrations
+	docker-compose -f $(DEV_DOCKER_COMPOSE) down
+
+docker-test: ## Run the tests using the development containers
+	docker-compose -f $(DEV_DOCKER_COMPOSE) up -d postgres
+	docker-compose -f $(DEV_DOCKER_COMPOSE) run gotrue sh -c "make migrate_test"
+	docker-compose -f $(DEV_DOCKER_COMPOSE) run gotrue sh -c "make test"
+	docker-compose -f $(DEV_DOCKER_COMPOSE) down -v
+
+docker-build: ## Force a full rebuild of the development containers
+	docker-compose -f $(DEV_DOCKER_COMPOSE) build --no-cache
+	docker-compose -f $(DEV_DOCKER_COMPOSE) up -d postgres
+	docker-compose -f $(DEV_DOCKER_COMPOSE) run gotrue sh -c "make migrate_dev"
+	docker-compose -f $(DEV_DOCKER_COMPOSE) down
+
+docker-clean: ## Remove the development containers and volumes
+	docker-compose -f $(DEV_DOCKER_COMPOSE) rm -fsv
+
+format:
+	gofmt -s -w .