feat(conf): add JSON config file support (#2540)

Adds two new replace directives to `go.mod` which point to the newly
created `internal/forks` directory:
* `github.com/joho/godotenv` => `./internal/forks/godotenv`
* `github.com/kelseyhightower/envconfig` => `./internal/forks/envconfig`

Each one is clone of the version we use from the public repos with no
additional changes made. This may be a repeatable pattern we could use
to work around some limitations of older packages and allow reaching
into internals to ease migrating away from them.

---------

Co-authored-by: Chris Stockton <chris.stockton@supabase.io>

Author: cstockton

.gitignore

@@ -20,3 +20,4 @@ www/.DS_Store
 www/node_modules
 npm-debug.log
 .data
+tmp

cmd/root_cmd.go

@@ -6,6 +6,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/observability"
 )
 
@@ -35,7 +36,9 @@ func loadGlobalConfig(ctx context.Context) *conf.GlobalConfiguration {
 		panic("context must not be nil")
 	}
 
-	config, err := conf.LoadGlobal(configFile)
+	configLoader := confload.NewLoader()
+
+	config, err := configLoader.Startup(configFile, watchDir)
 	if err != nil {
 		logrus.Fatalf("Failed to load configuration: %+v", err)
 	}

cmd/serve_cmd.go

@@ -17,6 +17,7 @@ import (
 	"github.com/supabase/auth/internal/api/apilimiter"
 	"github.com/supabase/auth/internal/api/apiworker"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/mailer/templatemailer"
 	"github.com/supabase/auth/internal/reloader"
 	"github.com/supabase/auth/internal/storage"
@@ -32,15 +33,9 @@ var serveCmd = cobra.Command{
 }
 
 func serve(ctx context.Context) {
-	if err := conf.LoadFile(configFile); err != nil {
-		logrus.WithError(err).Fatal("unable to load config")
-	}
+	configLoader := confload.NewLoader()
 
-	if err := conf.LoadDirectory(watchDir); err != nil {
-		logrus.WithError(err).Error("unable to load config from watch dir")
-	}
-
-	config, err := conf.LoadGlobalFromEnv()
+	config, err := configLoader.Startup(configFile, watchDir)
 	if err != nil {
 		logrus.WithError(err).Fatal("unable to load config")
 	}
@@ -161,7 +156,10 @@ func serve(ctx context.Context) {
 				previousLim = latestLim
 			}
 
-			rl := reloader.NewReloader(rc, watchDir)
+			rlFunc := func(dir string) (*conf.GlobalConfiguration, error) {
+				return configLoader.Reload(dir)
+			}
+			rl := reloader.NewReloaderFunc(rc, watchDir, rlFunc)
 			err = rl.Watch(ctx, fn)
 		}()
 	}

go.mod

@@ -172,3 +172,7 @@ require (
 )
 
 go 1.25.11
+
+replace (
+	github.com/joho/godotenv => ./internal/forks/godotenv
+)

internal/api/api_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/supabase/auth/internal/api/apilimiter"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/crypto"
 	"github.com/supabase/auth/internal/storage"
 	"github.com/supabase/auth/internal/storage/test"
@@ -29,7 +30,7 @@ func init() {
 // Using this function allows us to keep track of the database connection
 // and cleaning up data between tests.
 func setupAPIForTest(opts ...Option) (*API, *conf.GlobalConfiguration, error) {
-	config, err := conf.LoadGlobal(apiTestConfig)
+	config, err := confload.LoadGlobal(apiTestConfig)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -43,7 +44,7 @@ func setupAPIForTest(opts ...Option) (*API, *conf.GlobalConfiguration, error) {
 }
 
 func setupAPIForTestWithCallback(cb func(*conf.GlobalConfiguration, *storage.Connection)) (*API, *conf.GlobalConfiguration, error) {
-	config, err := conf.LoadGlobal(apiTestConfig)
+	config, err := confload.LoadGlobal(apiTestConfig)
 	if err != nil {
 		return nil, nil, err
 	}

internal/api/errors_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	"github.com/supabase/auth/internal/api/apierrors"
-	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/observability"
 )
 
@@ -71,7 +71,7 @@ func TestHandleResponseErrorWithHTTPError(t *testing.T) {
 
 func TestRecoverer(t *testing.T) {
 	var logBuffer bytes.Buffer
-	config, err := conf.LoadGlobal(apiTestConfig)
+	config, err := confload.LoadGlobal(apiTestConfig)
 	require.NoError(t, err)
 	require.NoError(t, observability.ConfigureLogging(&config.Logging))
 

internal/api/oauthserver/authorize_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/supabase/auth/internal/api/apierrors"
 	"github.com/supabase/auth/internal/api/shared"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/hooks/v0hooks"
 	"github.com/supabase/auth/internal/models"
 	"github.com/supabase/auth/internal/storage"
@@ -28,7 +29,7 @@ import (
 
 func TestValidateRequestOrigin(t *testing.T) {
 	// Setup test configuration
-	globalConfig, err := conf.LoadGlobal(oauthServerTestConfig)
+	globalConfig, err := confload.LoadGlobal(oauthServerTestConfig)
 	require.NoError(t, err)
 
 	// Set up test site URL for validation
@@ -135,7 +136,7 @@ func TestValidateRequestOrigin(t *testing.T) {
 }
 
 func TestValidateRequestOriginEdgeCases(t *testing.T) {
-	globalConfig, err := conf.LoadGlobal(oauthServerTestConfig)
+	globalConfig, err := confload.LoadGlobal(oauthServerTestConfig)
 	require.NoError(t, err)
 
 	globalConfig.SiteURL = "https://example.com"
@@ -208,7 +209,7 @@ type OAuthAuthorizeTestSuite struct {
 }
 
 func TestOAuthAuthorize(t *testing.T) {
-	globalConfig, err := conf.LoadGlobal(oauthServerTestConfig)
+	globalConfig, err := confload.LoadGlobal(oauthServerTestConfig)
 	require.NoError(t, err)
 
 	conn, err := test.SetupDBConnection(globalConfig)

internal/api/oauthserver/handlers_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/supabase/auth/internal/api/shared"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/hooks/v0hooks"
 	"github.com/supabase/auth/internal/models"
 	"github.com/supabase/auth/internal/storage"
@@ -31,7 +32,7 @@ type OAuthClientTestSuite struct {
 }
 
 func TestOAuthClientHandler(t *testing.T) {
-	globalConfig, err := conf.LoadGlobal(oauthServerTestConfig)
+	globalConfig, err := confload.LoadGlobal(oauthServerTestConfig)
 	require.NoError(t, err)
 
 	conn, err := test.SetupDBConnection(globalConfig)

internal/api/oauthserver/service_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 	"github.com/supabase/auth/internal/hooks/v0hooks"
 	"github.com/supabase/auth/internal/models"
 	"github.com/supabase/auth/internal/storage"
@@ -26,7 +27,7 @@ type OAuthServiceTestSuite struct {
 }
 
 func TestOAuthService(t *testing.T) {
-	globalConfig, err := conf.LoadGlobal(serviceTestConfig)
+	globalConfig, err := confload.LoadGlobal(serviceTestConfig)
 	require.NoError(t, err)
 
 	conn, err := test.SetupDBConnection(globalConfig)

internal/api/saml_test.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/crewjam/saml"
 	"github.com/stretchr/testify/require"
-	"github.com/supabase/auth/internal/conf"
+	"github.com/supabase/auth/internal/conf/confload"
 )
 
 func TestSAMLMetadataWithAPI(t *tst.T) {
-	config, err := conf.LoadGlobal(apiTestConfig)
+	config, err := confload.LoadGlobal(apiTestConfig)
 	require.NoError(t, err)
 	config.API.ExternalURL = "https://projectref.supabase.co/auth/v1/"
 	config.SAML.Enabled = true