chore: bump gofmt and go version to 1.20 (supabase#972)

new version of gofmt was released on 14th which seems to enforce
lexicographic import are formatte and so it seems like running gofmt
will now enforce lexicographic ordering on imports

Co-authored-by: [email protected] <[email protected]>

.github/workflows/release.yml

@@ -8,7 +8,6 @@ on:
     types: [completed]
     branches:
       - master
-      - mfa
       - zerosessionidfix
       - lastsigninatfix
 
@@ -40,7 +39,7 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "^1.19.0" # The Go version to download (if necessary) and use.
+          go-version: "^1.20.0" # The Go version to download (if necessary) and use.
 
       - run: make deps
       - run: make all

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x]
+        go-version: [1.20.x]
     runs-on: ubuntu-20.04
     services:
       postgres:

cmd/admin_cmd.go

@@ -2,11 +2,11 @@ package cmd
 
 import (
 	"github.com/gofrs/uuid"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 )
 
 var autoconfirm, isAdmin bool

cmd/root_cmd.go

@@ -3,10 +3,10 @@ package cmd
 import (
 	"context"
 
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/observability"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/observability"
 )
 
 var configFile = ""

cmd/serve_cmd.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"net"
 
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
 	"github.com/supabase/gotrue/internal/api"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/storage"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 )
 
 var serveCmd = cobra.Command{

cmd/version_cmd.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/supabase/gotrue/internal/utilities"
 	"github.com/spf13/cobra"
+	"github.com/supabase/gotrue/internal/utilities"
 )
 
 var versionCmd = cobra.Command{

internal/api/admin.go

@@ -11,11 +11,11 @@ import (
 	"github.com/fatih/structs"
 	"github.com/go-chi/chi"
 	"github.com/gofrs/uuid"
+	"github.com/sethvargo/go-password/password"
 	"github.com/supabase/gotrue/internal/api/provider"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/observability"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/sethvargo/go-password/password"
 )
 
 type AdminUserParams struct {

internal/api/admin_test.go

@@ -11,11 +11,11 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type AdminTestSuite struct {

internal/api/api.go

@@ -9,13 +9,13 @@ import (
 	"github.com/didip/tollbooth/v5"
 	"github.com/didip/tollbooth/v5/limiter"
 	"github.com/go-chi/chi"
+	"github.com/rs/cors"
+	"github.com/sebest/xff"
+	"github.com/sirupsen/logrus"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/mailer"
 	"github.com/supabase/gotrue/internal/observability"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/rs/cors"
-	"github.com/sebest/xff"
-	"github.com/sirupsen/logrus"
 )
 
 const (

internal/api/api_test.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/crypto"
 	"github.com/supabase/gotrue/internal/storage"
 	"github.com/supabase/gotrue/internal/storage/test"
-	"github.com/stretchr/testify/require"
 )
 
 const (

internal/api/audit_test.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type AuditTestSuite struct {

internal/api/auth_test.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/gofrs/uuid"
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type AuthTestSuite struct {

internal/api/errors.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"runtime/debug"
 
+	"github.com/pkg/errors"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/observability"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/pkg/errors"
 )
 
 // Common error messages during signup flow

internal/api/external.go

@@ -12,12 +12,12 @@ import (
 	"github.com/fatih/structs"
 	"github.com/gofrs/uuid"
 	jwt "github.com/golang-jwt/jwt"
+	"github.com/sirupsen/logrus"
 	"github.com/supabase/gotrue/internal/api/provider"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/observability"
 	"github.com/supabase/gotrue/internal/storage"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/oauth2"
 )
 

internal/api/external_github_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/require"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 func (ts *ExternalTestSuite) TestSignupExternalGithub() {

internal/api/external_oauth.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 
 	"github.com/mrjones/oauth"
+	"github.com/sirupsen/logrus"
 	"github.com/supabase/gotrue/internal/api/provider"
 	"github.com/supabase/gotrue/internal/observability"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/sirupsen/logrus"
 )
 
 // OAuthProviderData contains the userData and token returned by the oauth provider

internal/api/external_test.go

@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type ExternalTestSuite struct {

internal/api/helpers.go

@@ -10,11 +10,11 @@ import (
 	"net/url"
 
 	"github.com/gofrs/uuid"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 )
 
 func addRequestID(globalConfig *conf.GlobalConfiguration) middlewareHandler {

internal/api/hook_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage/test"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 // withFunctionHooks adds the provided function hooks to the context.

internal/api/invite_test.go

@@ -12,11 +12,11 @@ import (
 	"time"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type InviteTestSuite struct {

internal/api/logout_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type LogoutTestSuite struct {

internal/api/magic_link.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/sethvargo/go-password/password"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/sethvargo/go-password/password"
 )
 
 // MagicLinkParams holds the parameters for a magic link request

internal/api/mail.go

@@ -10,14 +10,14 @@ import (
 
 	"github.com/badoux/checkmail"
 	"github.com/fatih/structs"
+	"github.com/pkg/errors"
+	"github.com/sethvargo/go-password/password"
 	"github.com/supabase/gotrue/internal/api/provider"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/crypto"
 	"github.com/supabase/gotrue/internal/mailer"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/pkg/errors"
-	"github.com/sethvargo/go-password/password"
 )
 
 var (

internal/api/mail_test.go

@@ -10,10 +10,10 @@ import (
 	"testing"
 
 	"github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/models"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/models"
 )
 
 type MailTestSuite struct {

internal/api/mfa.go

@@ -12,11 +12,11 @@ import (
 	svg "github.com/ajstarks/svgo"
 	"github.com/boombuler/barcode/qr"
 	"github.com/gofrs/uuid"
+	"github.com/pquerna/otp/totp"
 	"github.com/supabase/gotrue/internal/metering"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/pquerna/otp/totp"
 )
 
 const DefaultQRSize = 3

internal/api/mfa_test.go

@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pquerna/otp"
 	"github.com/supabase/gotrue/internal/conf"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/utilities"
-	"github.com/pquerna/otp"
 
 	"github.com/jackc/pgx/v4"
 

internal/api/middleware_test.go

@@ -10,10 +10,10 @@ import (
 	"testing"
 
 	jwt "github.com/golang-jwt/jwt"
-	"github.com/supabase/gotrue/internal/conf"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
 )
 
 const (

internal/api/opentelemetry-tracer_test.go

@@ -5,11 +5,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/storage"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"

internal/api/opentracer_test.go

@@ -5,13 +5,13 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/supabase/gotrue/internal/conf"
-	"github.com/supabase/gotrue/internal/storage"
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/mocktracer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"github.com/supabase/gotrue/internal/conf"
+	"github.com/supabase/gotrue/internal/storage"
 )
 
 type OpenTracerTestSuite struct {

internal/api/otp.go

@@ -6,10 +6,10 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/sethvargo/go-password/password"
 	"github.com/supabase/gotrue/internal/api/sms_provider"
 	"github.com/supabase/gotrue/internal/models"
 	"github.com/supabase/gotrue/internal/storage"
-	"github.com/sethvargo/go-password/password"
 )
 
 // OtpParams contains the request body params for the otp endpoint