🧹 chore: config reorg and exported vs private

backend/config/auth.go

@@ -1,6 +1,10 @@
 package config
 
-import m "github.com/garrettladley/mattress"
+import (
+	"fmt"
+
+	m "github.com/garrettladley/mattress"
+)
 
 type AuthSettings struct {
 	AccessKey  *m.Secret[string]
@@ -15,12 +19,12 @@ type intermediateAuthSettings struct {
 func (i *intermediateAuthSettings) into() (*AuthSettings, error) {
 	accessKey, err := m.NewSecret(i.AccessKey)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from access key: %s", err.Error())
 	}
 
 	refreshKey, err := m.NewSecret(i.RefreshKey)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from refresh key: %s", err.Error())
 	}
 
 	return &AuthSettings{

backend/config/aws.go

@@ -1,6 +1,10 @@
 package config
 
-import m "github.com/garrettladley/mattress"
+import (
+	"fmt"
+
+	m "github.com/garrettladley/mattress"
+)
 
 type AWSSettings struct {
 	BucketName *m.Secret[string]
@@ -19,22 +23,22 @@ type intermediateAWSSettings struct {
 func (i *intermediateAWSSettings) into() (*AWSSettings, error) {
 	bucketName, err := m.NewSecret(i.BucketName)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from bucket name: %s", err.Error())
 	}
 
 	id, err := m.NewSecret(i.Id)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from ID: %s", err.Error())
 	}
 
 	secret, err := m.NewSecret(i.Secret)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from secret: %s", err.Error())
 	}
 
 	region, err := m.NewSecret(i.Region)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from region: %s", err.Error())
 	}
 
 	return &AWSSettings{

backend/config/calendar.go

@@ -1,6 +1,9 @@
 package config
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
 type CalendarSettings struct {
 	MaxTerminationDate time.Time
@@ -11,12 +14,12 @@ type intermediateCalendarSettings struct {
 }
 
 func (i *intermediateCalendarSettings) into() (*CalendarSettings, error) {
-	t, err := time.Parse("01-02-2006", i.MaxTerminationDate)
+	maxTerminationDate, err := time.Parse("01-02-2006", i.MaxTerminationDate)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to parse max termination date: %s", err.Error())
 	}
 
 	return &CalendarSettings{
-		MaxTerminationDate: t,
+		MaxTerminationDate: maxTerminationDate,
 	}, nil
 }

backend/config/config.go

@@ -1,19 +1,21 @@
 package config
 
 import (
+	"fmt"
+
 	"github.com/caarlos0/env/v11"
 	"github.com/joho/godotenv"
 )
 
 func GetConfiguration(path string) (*Settings, error) {
 	err := godotenv.Load(path)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load environment variables: %s", err.Error())
 	}
 
 	var intermediateSettings intermediateSettings
 	if err := env.Parse(&intermediateSettings); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to parse environment variables: %s", err.Error())
 	}
 
 	settings, err := intermediateSettings.into()

backend/config/database.go

@@ -54,7 +54,7 @@ type intermediateDatabaseSettings struct {
 func (i *intermediateDatabaseSettings) into() (*DatabaseSettings, error) {
 	password, err := m.NewSecret(i.Password)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create secret from password: %s", err.Error())
 	}
 
 	return &DatabaseSettings{

backend/config/oauth.go

@@ -1,8 +1,6 @@
 package config
 
 import (
-	"errors"
-
 	m "github.com/garrettladley/mattress"
 )
 
@@ -20,66 +18,7 @@ type OAuthSettings struct {
 	Prompt               string
 }
 
-type OAuthResources struct {
+type OauthProviderSettings struct {
 	GoogleOAuthSettings  *OAuthSettings
 	OutlookOAuthSettings *OAuthSettings
 }
-
-type GoogleOAuthSettings struct {
-	ClientId     string `env:"GOOGLE_OAUTH_CLIENT_ID"`
-	ClientSecret string `env:"GOOGLE_OAUTH_CLIENT_SECRET"`
-}
-
-func (i *GoogleOAuthSettings) into() (*OAuthSettings, error) {
-	secretClientID, err := m.NewSecret(i.ClientId)
-	if err != nil {
-		return nil, errors.New("failed to create secret from client ID")
-	}
-
-	secretClientSecret, err := m.NewSecret(i.ClientSecret)
-	if err != nil {
-		return nil, errors.New("failed to create secret from client secret")
-	}
-
-	return &OAuthSettings{
-		BaseURL:              "https://accounts.google.com/o/oauth2/v2",
-		TokenURL:             "https://oauth2.googleapis.com",
-		ClientID:             secretClientID,
-		ClientSecret:         secretClientSecret,
-		Scopes:               "https://www.googleapis.com/auth/calendar.events https://www.googleapis.com/auth/calendar.readonly",
-		ResponseType:         "code",
-		RedirectURI:          "http://localhost:3000",
-		IncludeGrantedScopes: "true",
-		AccessType:           "offline",
-		Prompt:               "consent",
-	}, nil
-}
-
-type OutlookOAuthSettings struct {
-	ClientId     string `env:"OUTLOOK_OAUTH_CLIENT_ID"`
-	ClientSecret string `env:"OUTLOOK_OAUTH_CLIENT_SECRET"`
-}
-
-func (i *OutlookOAuthSettings) into() (*OAuthSettings, error) {
-	secretClientID, err := m.NewSecret(i.ClientId)
-	if err != nil {
-		return nil, errors.New("failed to create secret from client ID")
-	}
-
-	secretClientSecret, err := m.NewSecret(i.ClientSecret)
-	if err != nil {
-		return nil, errors.New("failed to create secret from client secret")
-	}
-
-	return &OAuthSettings{
-		BaseURL:      "https://login.microsoftonline.com/common/oauth2/v2.0",
-		TokenURL:     "https://login.microsoftonline.com/common/oauth2/v2.0",
-		ClientID:     secretClientID,
-		ClientSecret: secretClientSecret,
-		Scopes:       "offline_access user.read calendars.readwrite",
-		ResponseType: "code",
-		RedirectURI:  "http://localhost:3000",
-		ResponseMode: "query",
-		Prompt:       "consent",
-	}, nil
-}

backend/config/oauth_google.go

@@ -0,0 +1,37 @@
+package config
+
+import (
+	"fmt"
+
+	m "github.com/garrettladley/mattress"
+)
+
+type GoogleOAuthSettings struct {
+	ClientId     string `env:"GOOGLE_OAUTH_CLIENT_ID"`
+	ClientSecret string `env:"GOOGLE_OAUTH_CLIENT_SECRET"`
+}
+
+func (i *GoogleOAuthSettings) into() (*OAuthSettings, error) {
+	secretClientID, err := m.NewSecret(i.ClientId)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create secret from client ID: %s", err.Error())
+	}
+
+	secretClientSecret, err := m.NewSecret(i.ClientSecret)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create secret from client secret: %s", err.Error())
+	}
+
+	return &OAuthSettings{
+		BaseURL:              "https://accounts.google.com/o/oauth2/v2",
+		TokenURL:             "https://oauth2.googleapis.com",
+		ClientID:             secretClientID,
+		ClientSecret:         secretClientSecret,
+		Scopes:               "https://www.googleapis.com/auth/calendar.events https://www.googleapis.com/auth/calendar.readonly",
+		ResponseType:         "code",
+		RedirectURI:          "http://localhost:3000",
+		IncludeGrantedScopes: "true",
+		AccessType:           "offline",
+		Prompt:               "consent",
+	}, nil
+}

backend/config/oauth_outlook.go

@@ -0,0 +1,36 @@
+package config
+
+import (
+	"fmt"
+
+	m "github.com/garrettladley/mattress"
+)
+
+type OutlookOAuthSettings struct {
+	ClientId     string `env:"OUTLOOK_OAUTH_CLIENT_ID"`
+	ClientSecret string `env:"OUTLOOK_OAUTH_CLIENT_SECRET"`
+}
+
+func (i *OutlookOAuthSettings) into() (*OAuthSettings, error) {
+	secretClientID, err := m.NewSecret(i.ClientId)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create secret from client ID: %s", err.Error())
+	}
+
+	secretClientSecret, err := m.NewSecret(i.ClientSecret)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create secret from client secret: %s", err.Error())
+	}
+
+	return &OAuthSettings{
+		BaseURL:      "https://login.microsoftonline.com/common/oauth2/v2.0",
+		TokenURL:     "https://login.microsoftonline.com/common/oauth2/v2.0",
+		ClientID:     secretClientID,
+		ClientSecret: secretClientSecret,
+		Scopes:       "offline_access user.read calendars.readwrite",
+		ResponseType: "code",
+		RedirectURI:  "http://localhost:3000",
+		ResponseMode: "query",
+		Prompt:       "consent",
+	}, nil
+}

backend/config/redis.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"errors"
+	"fmt"
 
 	m "github.com/garrettladley/mattress"
 )
@@ -15,22 +15,6 @@ type RedisSettings struct {
 	// TLSConfig *TLSConfig
 }
 
-func (int *intermediateRedisSettings) into() (*RedisSettings, error) {
-	password, err := m.NewSecret(int.Password)
-	if err != nil {
-		return nil, errors.New("failed to create secret from password")
-	}
-
-	return &RedisSettings{
-		Username: int.Username,
-		Password: password,
-		Host:     int.Host,
-		Port:     int.Port,
-		DB:       int.DB,
-		// TLSConfig: int.TLSConfig.into(),
-	}, nil
-}
-
 type intermediateRedisSettings struct {
 	Username string `env:"USERNAME"`
 	Password string `env:"PASSWORD"`
@@ -39,3 +23,19 @@ type intermediateRedisSettings struct {
 	DB       int    `env:"DB"`
 	// TLSConfig *intermediateTLSConfig `env:"TLS_CONFIG"`
 }
+
+func (i *intermediateRedisSettings) into() (*RedisSettings, error) {
+	password, err := m.NewSecret(i.Password)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create secret from password: %s", err.Error())
+	}
+
+	return &RedisSettings{
+		Username: i.Username,
+		Password: password,
+		Host:     i.Host,
+		Port:     i.Port,
+		DB:       i.DB,
+		// TLSConfig: i.TLSConfig.into(),
+	}, nil
+}

backend/integrations/expose.go

@@ -9,5 +9,5 @@ import (
 type Integrations struct {
 	Email email.EmailClientInterface
 	File  file.FileClientInterface
-	OAuth oauth.OAuthResources
+	OAuth oauth.OauthProviderSettings
 }

backend/integrations/oauth/oauth.go

@@ -12,7 +12,7 @@ type OAuthClient struct {
 	ResourceClient OAuthResourceClientInterface
 }
 
-type OAuthResources struct {
+type OauthProviderSettings struct {
 	Outlook OutlookOAuthClient
 	Google  GoogleOAuthClient
 }

backend/main.go

@@ -102,7 +102,7 @@ func configureIntegrations(config *config.Settings) integrations.Integrations {
 		OAuthConfig: config.Outlook,
 	}
 
-	oauthResources := oauth.OAuthResources{
+	oauthResources := oauth.OauthProviderSettings{
 		Google:  googleClient,
 		Outlook: outlookClient,
 	}