restructure startup & config logic

2023-08-10 21:13:09 +03:00 · 2023-06-07 17:46:19 +02:00
parent e93b292daf
commit 3575c02c1e
21 changed files with 175 additions and 1412 deletions
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -1,123 +1,55 @@
 package config

 import (
-	"strings"
+	"github.com/joho/godotenv"
+	"github.com/kelseyhightower/envconfig"
 	"time"
-
-	"github.com/lus/pasty/internal/env"
 )

-// Config represents the general application configuration structure
+// Config represents the general application configuration
 type Config struct {
-	WebAddress                  string
-	StorageType                 string
-	HastebinSupport             bool
-	IDLength                    int
-	IDCharacters                string
-	ModificationTokens          bool
-	ModificationTokenMaster     string
-	ModificationTokenLength     int
-	ModificationTokenCharacters string
-	RateLimit                   string
-	LengthCap                   int
-	AutoDelete                  *AutoDeleteConfig
+	LogLevel                    string            `default:"info" split_words:"true"`
+	WebAddress                  string            `default:":8080" split_words:"true"`
+	StorageDriver               string            `default:"sqlite" split_words:"true"`
+	HastebinSupport             bool              `default:"false" split_words:"true"`
+	IDLength                    int               `default:"6" split_words:"true"`
+	IDCharacters                string            `default:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" split_words:"true"`
+	ModificationTokens          bool              `default:"true" split_words:"true"`
+	ModificationTokenMaster     string            `split_words:"true"`
+	ModificationTokenLength     int               `default:"12" split_words:"true"`
+	ModificationTokenCharacters string            `default:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" split_words:"true"`
+	RateLimit                   string            `default:"30-M" split_words:"true"`
+	LengthCap                   int               `default:"50000" split_words:"true"`
+	AutoDelete                  *AutoDeleteConfig `split_words:"true"`
 	Reports                     *ReportConfig
-	File                        *FileConfig
 	Postgres                    *PostgresConfig
-	MongoDB                     *MongoDBConfig
-	S3                          *S3Config
 }

 // AutoDeleteConfig represents the configuration specific for the AutoDelete behaviour
 type AutoDeleteConfig struct {
-	Enabled      bool
-	Lifetime     time.Duration
-	TaskInterval time.Duration
-}
-
-// FileConfig represents the configuration specific for the file storage driver
-type FileConfig struct {
-	Path string
-}
-
-// PostgresConfig represents the configuration specific for the Postgres storage driver
-type PostgresConfig struct {
-	DSN string
-}
-
-// MongoDBConfig represents the configuration specific for the MongoDB storage driver
-type MongoDBConfig struct {
-	DSN        string
-	Database   string
-	Collection string
-}
-
-// S3Config represents the configuration specific for the S3 storage driver
-type S3Config struct {
-	Endpoint        string
-	AccessKeyID     string
-	SecretAccessKey string
-	SecretToken     string
-	Secure          bool
-	Region          string
-	Bucket          string
+	Enabled      bool          `default:"false"`
+	Lifetime     time.Duration `default:"720h"`
+	TaskInterval time.Duration `default:"5m" split_words:"true"`
 }

 // ReportConfig represents the configuration specific for the report system
 type ReportConfig struct {
-	Reports            bool
-	ReportWebhook      string
-	ReportWebhookToken string
+	Enabled      bool   `default:"false" split_words:"true"`
+	WebhookURL   string `split_words:"true"`
+	WebhookToken string `split_words:"true"`
 }

-// Current holds the currently loaded config
-var Current *Config
+// PostgresConfig represents the configuration specific for the Postgres storage driver
+type PostgresConfig struct {
+	DSN string `default:"postgres://pasty:pasty@localhost/pasty"`
+}

 // Load loads the current config from environment variables and an optional .env file
-func Load() {
-	env.Load()
-
-	Current = &Config{
-		WebAddress:                  env.MustString("WEB_ADDRESS", ":8080"),
-		StorageType:                 strings.ToLower(env.MustString("STORAGE_TYPE", "file")),
-		HastebinSupport:             env.MustBool("HASTEBIN_SUPPORT", false),
-		IDLength:                    env.MustInt("ID_LENGTH", 6),
-		IDCharacters:                env.MustString("ID_CHARACTERS", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"),
-		ModificationTokens:          env.MustBool("MODIFICATION_TOKENS", true),
-		ModificationTokenMaster:     env.MustString("MODIFICATION_TOKEN_MASTER", ""),
-		ModificationTokenLength:     env.MustInt("MODIFICATION_TOKEN_LENGTH", 12),
-		ModificationTokenCharacters: env.MustString("MODIFICATION_TOKEN_CHARACTERS", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"),
-		RateLimit:                   env.MustString("RATE_LIMIT", "30-M"),
-		LengthCap:                   env.MustInt("LENGTH_CAP", 50000),
-		AutoDelete: &AutoDeleteConfig{
-			Enabled:      env.MustBool("AUTODELETE", false),
-			Lifetime:     env.MustDuration("AUTODELETE_LIFETIME", 720*time.Hour),
-			TaskInterval: env.MustDuration("AUTODELETE_TASK_INTERVAL", 5*time.Minute),
-		},
-		Reports: &ReportConfig{
-			Reports:            env.MustBool("REPORTS", false),
-			ReportWebhook:      env.MustString("REPORT_WEBHOOK", ""),
-			ReportWebhookToken: env.MustString("REPORT_WEBHOOK_TOKEN", ""),
-		},
-		File: &FileConfig{
-			Path: env.MustString("STORAGE_FILE_PATH", "./data"),
-		},
-		Postgres: &PostgresConfig{
-			DSN: env.MustString("STORAGE_POSTGRES_DSN", "postgres://pasty:pasty@localhost/pasty"),
-		},
-		MongoDB: &MongoDBConfig{
-			DSN:        env.MustString("STORAGE_MONGODB_CONNECTION_STRING", "mongodb://pasty:pasty@localhost/pasty"),
-			Database:   env.MustString("STORAGE_MONGODB_DATABASE", "pasty"),
-			Collection: env.MustString("STORAGE_MONGODB_COLLECTION", "pastes"),
-		},
-		S3: &S3Config{
-			Endpoint:        env.MustString("STORAGE_S3_ENDPOINT", ""),
-			AccessKeyID:     env.MustString("STORAGE_S3_ACCESS_KEY_ID", ""),
-			SecretAccessKey: env.MustString("STORAGE_S3_SECRET_ACCESS_KEY", ""),
-			SecretToken:     env.MustString("STORAGE_S3_SECRET_TOKEN", ""),
-			Secure:          env.MustBool("STORAGE_S3_SECURE", true),
-			Region:          env.MustString("STORAGE_S3_REGION", ""),
-			Bucket:          env.MustString("STORAGE_S3_BUCKET", "pasty"),
-		},
+func Load() (*Config, error) {
+	_ = godotenv.Overload()
+	cfg := new(Config)
+	if err := envconfig.Process("pasty", cfg); err != nil {
+		return nil, err
 	}
+	return cfg, nil
 }