From 7c9e2742c1b9a7c3c2c561dd9a7ebc85050909af Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Thu, 2 Sep 2021 22:59:17 -0400 Subject: [PATCH] Remove deprecated parameters from alerting providers --- alerting/provider/custom/custom.go | 7 ------- alerting/provider/mattermost/mattermost.go | 7 ------- 2 files changed, 14 deletions(-) diff --git a/alerting/provider/custom/custom.go b/alerting/provider/custom/custom.go index 39fa44a6..e757f80a 100644 --- a/alerting/provider/custom/custom.go +++ b/alerting/provider/custom/custom.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io/ioutil" - "log" "net/http" "os" "strings" @@ -20,7 +19,6 @@ import ( type AlertProvider struct { URL string `yaml:"url"` Method string `yaml:"method,omitempty"` - Insecure bool `yaml:"insecure,omitempty"` // deprecated Body string `yaml:"body,omitempty"` Headers map[string]string `yaml:"headers,omitempty"` Placeholders map[string]map[string]string `yaml:"placeholders,omitempty"` @@ -36,11 +34,6 @@ type AlertProvider struct { func (provider *AlertProvider) IsValid() bool { if provider.ClientConfig == nil { provider.ClientConfig = client.GetDefaultConfig() - // XXX: remove the next 4 lines in v3.0.0 - if provider.Insecure { - log.Println("WARNING: alerting.*.insecure has been deprecated and will be removed in v3.0.0 in favor of alerting.*.client.insecure") - provider.ClientConfig.Insecure = true - } } return len(provider.URL) > 0 && provider.ClientConfig != nil } diff --git a/alerting/provider/mattermost/mattermost.go b/alerting/provider/mattermost/mattermost.go index c61c2272..326dd379 100644 --- a/alerting/provider/mattermost/mattermost.go +++ b/alerting/provider/mattermost/mattermost.go @@ -2,7 +2,6 @@ package mattermost import ( "fmt" - "log" "net/http" "github.com/TwinProduction/gatus/alerting/alert" @@ -14,7 +13,6 @@ import ( // AlertProvider is the configuration necessary for sending an alert using Mattermost type AlertProvider struct { WebhookURL string `yaml:"webhook-url"` - Insecure bool `yaml:"insecure,omitempty"` // deprecated // ClientConfig is the configuration of the client used to communicate with the provider's target ClientConfig *client.Config `yaml:"client"` @@ -27,11 +25,6 @@ type AlertProvider struct { func (provider *AlertProvider) IsValid() bool { if provider.ClientConfig == nil { provider.ClientConfig = client.GetDefaultConfig() - // XXX: remove the next 3 lines in v3.0.0 - if provider.Insecure { - log.Println("WARNING: alerting.mattermost.insecure has been deprecated and will be removed in v3.0.0 in favor of alerting.mattermost.client.insecure") - provider.ClientConfig.Insecure = true - } } return len(provider.WebhookURL) > 0 }