From 4a354327591be0c38b6a532ff213b7c1c2898a79 Mon Sep 17 00:00:00 2001 From: tutunak Date: Mon, 5 Jan 2026 15:32:08 +0100 Subject: [PATCH] fix configuration when webhook set in the URL --- config/config.go | 3 +++ config/config_test.go | 43 ++++++++++++++----------------------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/config/config.go b/config/config.go index 47d3ad20..147e9aed 100755 --- a/config/config.go +++ b/config/config.go @@ -308,6 +308,9 @@ func (c *Config) CheckMissingResourceEnvvars() { if (c.Handler.SlackWebhook.Slackwebhookurl == "") && (os.Getenv("KW_SLACK_WEBHOOK_URL") != "") { c.Handler.SlackWebhook.Slackwebhookurl = os.Getenv("KW_SLACK_WEBHOOK_URL") } + if (c.Handler.Webhook.Url == "") && (os.Getenv("KW_WEBHOOK_URL") != "") { + c.Handler.Webhook.Url = os.Getenv("KW_WEBHOOK_URL") + } } func (c *Config) Write() error { diff --git a/config/config_test.go b/config/config_test.go index f18bae3c..0ccec8cd 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -18,8 +18,8 @@ package config import ( //"io/ioutil" -//"os" -//"testing" +"os" +"testing" ) var configStr = ` @@ -48,30 +48,15 @@ var configStr = ` } ` -//func TestLoadOK(t *testing.T) { -// content := []byte(configStr) -// tmpConfigFile, err := ioutil.TempFile(homeDir(), "kubewatch") -// if err != nil { -// t.Fatalf("TestLoad(): %+v", err) -// } -// -// defer func() { -// _ = os.Remove(tmpConfigFile.Name()) -// }() -// -// if _, err := tmpConfigFile.Write(content); err != nil { -// t.Fatalf("TestLoad(): %+v", err) -// } -// if err := tmpConfigFile.Close(); err != nil { -// t.Fatalf("TestLoad(): %+v", err) -// } -// -// ConfigFileName = "kubewatch" -// -// c, err := New() -// -// err = c.Load() -// if err != nil { -// t.Fatalf("TestLoad(): %+v", err) -// } -//} +func TestCheckMissingResourceEnvvars_Webhook(t *testing.T) { + expectedURL := "http://example.com/webhook" + os.Setenv("KW_WEBHOOK_URL", expectedURL) + defer os.Unsetenv("KW_WEBHOOK_URL") + + c := &Config{} + c.CheckMissingResourceEnvvars() + + if c.Handler.Webhook.Url != expectedURL { + t.Errorf("Expected Webhook URL to be %q, but got %q", expectedURL, c.Handler.Webhook.Url) + } +}