🧹 chore: Refactor configuration management for favicon and envvar middlewares (#3898)

Author: gaby

middleware/envvar/config.go

@@ -0,0 +1,26 @@
+package envvar
+
+// Config defines the config for middleware.
+type Config struct {
+	// ExportVars specifies the environment variables that should export
+	ExportVars map[string]string
+}
+
+// ConfigDefault is the default config.
+var ConfigDefault = Config{
+	ExportVars: map[string]string{},
+}
+
+func configDefault(config ...Config) Config {
+	if len(config) == 0 {
+		return ConfigDefault
+	}
+
+	cfg := config[0]
+
+	if cfg.ExportVars == nil {
+		cfg.ExportVars = ConfigDefault.ExportVars
+	}
+
+	return cfg
+}

middleware/envvar/envvar.go

@@ -8,12 +8,6 @@ import (
 
 const hAllow = fiber.MethodGet + ", " + fiber.MethodHead
 
-// Config defines the config for middleware.
-type Config struct {
-	// ExportVars specifies the environment variables that should export
-	ExportVars map[string]string
-}
-
 // EnvVar captures environment variables that are exposed through the
 // middleware response.
 type EnvVar struct {
@@ -27,10 +21,7 @@ func (envVar *EnvVar) set(key, val string) {
 // New creates a handler that returns configured environment variables as a
 // JSON response.
 func New(config ...Config) fiber.Handler {
-	var cfg Config
-	if len(config) > 0 {
-		cfg = config[0]
-	}
+	cfg := configDefault(config...)
 
 	return func(c fiber.Ctx) error {
 		method := c.Method()

middleware/favicon/config.go

@@ -0,0 +1,72 @@
+package favicon
+
+import (
+	"io/fs"
+
+	"github.com/gofiber/fiber/v3"
+)
+
+// Config defines the config for middleware.
+type Config struct {
+	// FileSystem is an optional alternate filesystem to search for the favicon in.
+	// An example of this could be an embedded or network filesystem
+	//
+	// Optional. Default: nil
+	FileSystem fs.FS `json:"-"`
+
+	// Next defines a function to skip this middleware when returned true.
+	//
+	// Optional. Default: nil
+	Next func(c fiber.Ctx) bool
+
+	// File holds the path to an actual favicon that will be cached
+	//
+	// Optional. Default: ""
+	File string `json:"file"`
+
+	// URL for favicon handler
+	//
+	// Optional. Default: "/favicon.ico"
+	URL string `json:"url"`
+
+	// CacheControl defines how the Cache-Control header in the response should be set
+	//
+	// Optional. Default: "public, max-age=31536000"
+	CacheControl string `json:"cache_control"`
+
+	// Raw data of the favicon file
+	//
+	// Optional. Default: nil
+	Data []byte `json:"-"`
+}
+
+// ConfigDefault is the default config
+var ConfigDefault = Config{
+	Next:         nil,
+	File:         "",
+	URL:          fPath,
+	CacheControl: "public, max-age=31536000",
+}
+
+func configDefault(config ...Config) Config {
+	if len(config) == 0 {
+		return ConfigDefault
+	}
+
+	cfg := config[0]
+
+	if cfg.Next == nil {
+		cfg.Next = ConfigDefault.Next
+	}
+	if cfg.URL == "" {
+		cfg.URL = ConfigDefault.URL
+	}
+	if cfg.File == "" {
+		cfg.File = ConfigDefault.File
+	}
+	if cfg.CacheControl == "" {
+		cfg.CacheControl = ConfigDefault.CacheControl
+	}
+
+	return cfg
+}

middleware/favicon/favicon.go

@@ -9,48 +9,6 @@ import (
 	"github.com/gofiber/fiber/v3"
 )
 
-// Config defines the config for middleware.
-type Config struct {
-	// FileSystem is an optional alternate filesystem to search for the favicon in.
-	// An example of this could be an embedded or network filesystem
-	//
-	// Optional. Default: nil
-	FileSystem fs.FS `json:"-"`
-
-	// Next defines a function to skip this middleware when returned true.
-	//
-	// Optional. Default: nil
-	Next func(c fiber.Ctx) bool
-
-	// File holds the path to an actual favicon that will be cached
-	//
-	// Optional. Default: ""
-	File string `json:"file"`
-
-	// URL for favicon handler
-	//
-	// Optional. Default: "/favicon.ico"
-	URL string `json:"url"`
-
-	// CacheControl defines how the Cache-Control header in the response should be set
-	//
-	// Optional. Default: "public, max-age=31536000"
-	CacheControl string `json:"cache_control"`
-
-	// Raw data of the favicon file
-	//
-	// Optional. Default: nil
-	Data []byte `json:"-"`
-}
-
-// ConfigDefault is the default config
-var ConfigDefault = Config{
-	Next:         nil,
-	File:         "",
-	URL:          fPath,
-	CacheControl: "public, max-age=31536000",
-}
-
 const (
 	fPath  = "/favicon.ico"
 	hType  = "image/x-icon"
@@ -60,27 +18,7 @@ const (
 
 // New creates a new middleware handler
 func New(config ...Config) fiber.Handler {
-	// Set default config
-	cfg := ConfigDefault
-
-	// Override config if provided
-	if len(config) > 0 {
-		cfg = config[0]
-
-		// Set default values
-		if cfg.Next == nil {
-			cfg.Next = ConfigDefault.Next
-		}
-		if cfg.URL == "" {
-			cfg.URL = ConfigDefault.URL
-		}
-		if cfg.File == "" {
-			cfg.File = ConfigDefault.File
-		}
-		if cfg.CacheControl == "" {
-			cfg.CacheControl = ConfigDefault.CacheControl
-		}
-	}
+	cfg := configDefault(config...)
 
 	// Load iconData if provided
 	var (