From 512338665ada16bdd4dde5239b30d216167f75e1 Mon Sep 17 00:00:00 2001
From: Nicolas Bigler <nicolas.bigler@vshn.ch>
Date: Fri, 16 Aug 2024 00:48:30 +0200
Subject: [PATCH] Add additional error messages for better debugging

Signed-off-by: Nicolas Bigler <nicolas.bigler@vshn.ch>
---
 pkg/config/config.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 16c7281..2be8f7c 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -116,47 +116,47 @@ func ReadConfig(getEnv GetEnv) (*Config, error) {
 
 	ids, err := getServiceIDs(getEnv)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get service ids env variable: %w", err)
 	}
 	cfg.ServiceIDs = ids
 
 	rt, err := getTimeout(getEnv, EnvHTTPReadTimeout)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get read timeouts env variable:  %w", err)
 	}
 	cfg.ReadTimeout = rt
 
 	wt, err := getTimeout(getEnv, EnvHTTPWriteTimeout)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get write timeouts env variable: %w", err)
 	}
 	cfg.WriteTimeout = wt
 
 	bytes, err := getHTTPMaxHeaderBytes(getEnv)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get max header bytes env variable: %w", err)
 	}
 	cfg.MaxHeaderBytes = bytes
 
 	err = loadJWTSigningKeys(getEnv, cfg.JWKeyRegister)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to load JWT signing keys: %w", err)
 	}
 
 	err = ensureRequiredSettings(cfg)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to ensure required settings: %w", err)
 	}
 
 	enableMetrics, err := getEnableMetrics(getEnv)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get metrics enabled env variable: %w", err)
 	}
 	cfg.EnableMetrics = enableMetrics
 
 	metricsDomain, err := getMetricsDomain(getEnv, cfg.EnableMetrics)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to get enable metrics domain env variable: %w", err)
 	}
 	cfg.MetricsDomain = metricsDomain
 
@@ -259,10 +259,10 @@ func getMetricsDomain(GetEnv GetEnv, enableMetrics bool) (string, error) {
 func loadJWTSigningKeys(getEnv GetEnv, keys *jwt.KeyRegister) error {
 	err := loadKeysFromPath(getEnv, keys, EnvJWTKeyJWKURL, loadJWK)
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to load keys from '%s': %w", EnvJWTKeyJWKURL, err)
 	}
 	err = loadKeysFromPath(getEnv, keys, EnvJWTKeyPEMURL, loadPEM)
-	return err
+	return fmt.Errorf("unable to load keys from '%s': %w", EnvJWTKeyPEMURL, err)
 }
 
 func loadKeysFromPath(getEnv GetEnv, keys *jwt.KeyRegister, envVarName string, loadFunc keyLoadingFun) error {
@@ -278,7 +278,7 @@ func loadKeysFromPath(getEnv GetEnv, keys *jwt.KeyRegister, envVarName string, l
 
 	_, err = loadFunc(keys, content)
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to load func with content: %s: %w", string(content[:]), err)
 	}
 	return nil
 }