fix

Author: ndakkoune

aws/logs_monitoring_go/internal/config/apikey.go

@@ -13,6 +13,7 @@ import (
 	"log/slog"
 	"net/http"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -70,7 +71,8 @@ func (c *Config) resolveAPIKey(ctx context.Context) error {
 			if err != nil {
 				return fmt.Errorf("resolving API key from %s: %w", resolver.envVar, err)
 			}
-			c.APIKey = key
+			c.APIKey = strings.TrimSpace(key)
+			slog.Debug("API key resolved", "source", resolver.envVar)
 			return nil
 		}
 	}
@@ -116,6 +118,7 @@ func (c *Config) validateAPIKey() error {
 		resp.Body.Close()
 
 		if resp.StatusCode >= 200 && resp.StatusCode < 300 {
+			slog.Debug("API key validated successfully")
 			return nil
 		}
 

aws/logs_monitoring_go/internal/config/config.go

@@ -50,6 +50,7 @@ func Load(ctx context.Context) (*Config, error) {
 	}
 
 	cfg.deriveURLs()
+	slog.Debug("config loaded", "site", cfg.Site, "intakeURL", cfg.IntakeURL, "apiURL", cfg.APIURL, "port", cfg.Port, "noSSL", cfg.NoSSL, "useFIPS", cfg.UseFIPS)
 
 	logDroppedEnvVars()
 
@@ -69,7 +70,7 @@ func (c *Config) deriveURLs() {
 	if c.NoSSL {
 		scheme = "http"
 	}
-	c.IntakeURL = envOrDefault("DD_URL", "http-intake.logs."+c.Site)
+	c.IntakeURL = envOrDefault("DD_URL", fmt.Sprintf("%s://http-intake.logs.%s", scheme, c.Site))
 	c.APIURL = envOrDefault("DD_API_URL", fmt.Sprintf("%s://api.%s", scheme, c.Site))
 }
 

aws/logs_monitoring_go/internal/config/config_test.go

@@ -11,20 +11,21 @@ func TestDeriveURLs(t *testing.T) {
 	t.Run("defaults", func(t *testing.T) {
 		cfg := &Config{Site: "datadoghq.com", NoSSL: false}
 		cfg.deriveURLs()
-		assert.Equal(t, "http-intake.logs.datadoghq.com", cfg.IntakeURL)
+		assert.Equal(t, "https://http-intake.logs.datadoghq.com", cfg.IntakeURL)
 		assert.Equal(t, "https://api.datadoghq.com", cfg.APIURL)
 	})
 
 	t.Run("NoSSL switches scheme to http", func(t *testing.T) {
 		cfg := &Config{Site: "datadoghq.com", NoSSL: true}
 		cfg.deriveURLs()
+		assert.Equal(t, "http://http-intake.logs.datadoghq.com", cfg.IntakeURL)
 		assert.Equal(t, "http://api.datadoghq.com", cfg.APIURL)
 	})
 
 	t.Run("custom site", func(t *testing.T) {
 		cfg := &Config{Site: "datadoghq.eu", NoSSL: false}
 		cfg.deriveURLs()
-		assert.Equal(t, "http-intake.logs.datadoghq.eu", cfg.IntakeURL)
+		assert.Equal(t, "https://http-intake.logs.datadoghq.eu", cfg.IntakeURL)
 		assert.Equal(t, "https://api.datadoghq.eu", cfg.APIURL)
 	})
 
@@ -57,7 +58,7 @@ func TestLoad(t *testing.T) {
 		assert.Equal(t, false, cfg.SkipSSLValidation)
 		assert.Equal(t, "INFO", cfg.LogLevel)
 		assert.Equal(t, false, cfg.UseFIPS)
-		assert.Equal(t, "http-intake.logs.datadoghq.com", cfg.IntakeURL)
+		assert.Equal(t, "https://http-intake.logs.datadoghq.com", cfg.IntakeURL)
 		assert.Equal(t, "abcdef1234567890abcdef1234567890", cfg.APIKey)
 	})