chore: rename packages to remove versioning information (#2023)

This prepares packages to match with the agreed upon end state in
#2012

---------

Co-authored-by: Chris Stockton <[email protected]>
Co-authored-by: Stojan Dimitrovski <[email protected]>

Author: 3 people

.github/workflows/dogfooding.yml

@@ -5,10 +5,8 @@ on:
     types: [submitted, edited]
 
   pull_request:
-    types:
-      - opened
-    branches:
-      - '*'
+
+  push:
 
 permissions:
   contents: read

internal/hooks/hooks.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/hooks/hookshttp"
+	"github.com/supabase/auth/internal/hooks/hookspgfunc"
 	"github.com/supabase/auth/internal/hooks/v0hooks"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0http"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0pgfunc"
 	"github.com/supabase/auth/internal/storage"
 )
 
@@ -18,8 +18,8 @@ func NewManager(
 	db *storage.Connection,
 	config *conf.GlobalConfiguration,
 ) *Manager {
-	httpDr := v0http.New()
-	pgfuncDr := v0pgfunc.New(db)
+	httpDr := hookshttp.New()
+	pgfuncDr := hookspgfunc.New(db)
 	return &Manager{
 		v0mgr: v0hooks.NewManager(config, httpDr, pgfuncDr),
 	}

internal/hooks/v0hooks/v0http/v0http.go renamed to internal/hooks/hookshttp/hookshttp.go

@@ -1,4 +1,4 @@
-package v0http
+package hookshttp
 
 import (
 	"bytes"

internal/hooks/v0hooks/v0http/v0http_test.go renamed to internal/hooks/hookshttp/hookshttp_test.go

@@ -1,4 +1,4 @@
-package v0http
+package hookshttp
 
 import (
 	"bytes"

internal/hooks/v0hooks/v0pgfunc/v0pgfunc.go renamed to internal/hooks/hookspgfunc/hookspgfunc.go

@@ -1,4 +1,4 @@
-package v0pgfunc
+package hookspgfunc
 
 import (
 	"context"

internal/hooks/v0hooks/v0pgfunc/v0pgfunc_test.go renamed to internal/hooks/hookspgfunc/hookspgfunc_test.go

@@ -1,4 +1,4 @@
-package v0pgfunc
+package hookspgfunc
 
 import (
 	"context"
@@ -8,8 +8,8 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/e2e"
 	"github.com/supabase/auth/internal/storage"
-	"github.com/supabase/auth/internal/storage/test"
 )
 
 type M = map[string]any
@@ -18,8 +18,8 @@ func TestDispatch(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
-	globalCfg := helpConfig(t, apiTestConfig)
-	db := helpConn(t, globalCfg)
+	globalCfg := e2e.Must(e2e.Config())
+	db := e2e.Must(e2e.Conn(globalCfg))
 
 	type testCase struct {
 		ctx    context.Context
@@ -225,27 +225,3 @@ func TestDispatch(t *testing.T) {
 		require.Equal(t, tc.exp, res)
 	}
 }
-
-const (
-	apiTestConfig = "../../../../hack/test.env"
-)
-
-func helpConfig(t testing.TB, configPath string) *conf.GlobalConfiguration {
-	t.Helper()
-
-	config, err := conf.LoadGlobal(configPath)
-	if err != nil {
-		t.Fatalf("error loading config %q; got %v", configPath, err)
-	}
-	return config
-}
-
-func helpConn(t testing.TB, config *conf.GlobalConfiguration) *storage.Connection {
-	t.Helper()
-
-	conn, err := test.SetupDBConnection(config)
-	if err != nil {
-		t.Fatalf("error setting up db connection: %v", err)
-	}
-	return conn
-}

internal/hooks/v0hooks/manager.go

@@ -11,22 +11,22 @@ import (
 
 	"github.com/supabase/auth/internal/api/apierrors"
 	"github.com/supabase/auth/internal/conf"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0http"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0pgfunc"
+	"github.com/supabase/auth/internal/hooks/hookshttp"
+	"github.com/supabase/auth/internal/hooks/hookspgfunc"
 	"github.com/supabase/auth/internal/observability"
 	"github.com/supabase/auth/internal/storage"
 )
 
 type Manager struct {
 	config   *conf.GlobalConfiguration
-	v0http   *v0http.Dispatcher
-	v0pgfunc *v0pgfunc.Dispatcher
+	v0http   *hookshttp.Dispatcher
+	v0pgfunc *hookspgfunc.Dispatcher
 }
 
 func NewManager(
 	config *conf.GlobalConfiguration,
-	httpDr *v0http.Dispatcher,
-	pgfuncDr *v0pgfunc.Dispatcher,
+	httpDr *hookshttp.Dispatcher,
+	pgfuncDr *hookspgfunc.Dispatcher,
 ) *Manager {
 	return &Manager{
 		config:   config,

internal/hooks/v0hooks/manager_test.go

@@ -10,10 +10,9 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/stretchr/testify/require"
 	"github.com/supabase/auth/internal/conf"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0http"
-	"github.com/supabase/auth/internal/hooks/v0hooks/v0pgfunc"
-	"github.com/supabase/auth/internal/storage"
-	"github.com/supabase/auth/internal/storage/test"
+	"github.com/supabase/auth/internal/e2e"
+	"github.com/supabase/auth/internal/hooks/hookshttp"
+	"github.com/supabase/auth/internal/hooks/hookspgfunc"
 )
 
 type M = map[string]any
@@ -25,10 +24,10 @@ func TestHooks(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
-	globalCfg := helpConfig(t, apiTestConfig)
-	db := helpConn(t, globalCfg)
-	httpDr := v0http.New(v0http.WithTimeout(time.Second / 10))
-	pgfuncDr := v0pgfunc.New(db, v0pgfunc.WithTimeout(time.Second/10))
+	globalCfg := e2e.Must(e2e.Config())
+	db := e2e.Must(e2e.Conn(globalCfg))
+	httpDr := hookshttp.New(hookshttp.WithTimeout(time.Second / 10))
+	pgfuncDr := hookspgfunc.New(db, hookspgfunc.WithTimeout(time.Second/10))
 	mr := NewManager(globalCfg, httpDr, pgfuncDr)
 	now := time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC)
 
@@ -485,27 +484,3 @@ func TestHooks(t *testing.T) {
 		}
 	}
 }
-
-const (
-	apiTestConfig = "../../../hack/test.env"
-)
-
-func helpConfig(t testing.TB, configPath string) *conf.GlobalConfiguration {
-	t.Helper()
-
-	config, err := conf.LoadGlobal(configPath)
-	if err != nil {
-		t.Fatalf("error loading config %q; got %v", configPath, err)
-	}
-	return config
-}
-
-func helpConn(t testing.TB, config *conf.GlobalConfiguration) *storage.Connection {
-	t.Helper()
-
-	conn, err := test.SetupDBConnection(config)
-	if err != nil {
-		t.Fatalf("error setting up db connection: %v", err)
-	}
-	return conn
-}