From b06167a3fa6863fb111fbee79f0c55afd0c161ca Mon Sep 17 00:00:00 2001 From: AlteredCoder <64792091+AlteredCoder@users.noreply.github.com> Date: Thu, 8 Sep 2022 11:41:28 +0200 Subject: [PATCH] Allow plugins to load environment variable (#1727) * Allow plugins to load environment variable --- pkg/csplugin/broker.go | 2 +- plugins/notifications/email/main.go | 1 + plugins/notifications/http/main.go | 1 + plugins/notifications/slack/main.go | 1 + plugins/notifications/splunk/main.go | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/csplugin/broker.go b/pkg/csplugin/broker.go index 59cedf3a8..90afa5ffb 100644 --- a/pkg/csplugin/broker.go +++ b/pkg/csplugin/broker.go @@ -254,7 +254,7 @@ func (pb *PluginBroker) loadPlugins(path string) error { if err != nil { return err } - + data = []byte(os.ExpandEnv(string(data))) _, err = pluginClient.Configure(context.Background(), &protobufs.Config{Config: data}) if err != nil { return errors.Wrapf(err, "while configuring %s", pc.Name) diff --git a/plugins/notifications/email/main.go b/plugins/notifications/email/main.go index 31ceba5bc..5b139282b 100644 --- a/plugins/notifications/email/main.go +++ b/plugins/notifications/email/main.go @@ -79,6 +79,7 @@ func (n *EmailPlugin) Configure(ctx context.Context, config *protobufs.Config) ( } n.ConfigByName[d.Name] = d + baseLogger.Debug(fmt.Sprintf("Email plugin '%s' use SMTP host '%s:%d'", d.Name, d.SMTPHost, d.SMTPPort)) return &protobufs.Empty{}, nil } diff --git a/plugins/notifications/http/main.go b/plugins/notifications/http/main.go index 4f7ffe5d7..7e15fccae 100644 --- a/plugins/notifications/http/main.go +++ b/plugins/notifications/http/main.go @@ -90,6 +90,7 @@ func (s *HTTPPlugin) Configure(ctx context.Context, config *protobufs.Config) (* d := PluginConfig{} err := yaml.Unmarshal(config.Config, &d) s.PluginConfigByName[d.Name] = d + logger.Debug(fmt.Sprintf("HTTP plugin '%s' use URL '%s'", d.Name, d.URL)) return &protobufs.Empty{}, err } diff --git a/plugins/notifications/slack/main.go b/plugins/notifications/slack/main.go index 8cef9ca61..901832381 100644 --- a/plugins/notifications/slack/main.go +++ b/plugins/notifications/slack/main.go @@ -57,6 +57,7 @@ func (n *Notify) Configure(ctx context.Context, config *protobufs.Config) (*prot return nil, err } n.ConfigByName[d.Name] = d + logger.Debug(fmt.Sprintf("Slack plugin '%s' use URL '%s'", d.Name, d.Webhook)) return &protobufs.Empty{}, nil } diff --git a/plugins/notifications/splunk/main.go b/plugins/notifications/splunk/main.go index e3e20edf8..a9b4be50a 100644 --- a/plugins/notifications/splunk/main.go +++ b/plugins/notifications/splunk/main.go @@ -89,6 +89,7 @@ func (s *Splunk) Configure(ctx context.Context, config *protobufs.Config) (*prot d := PluginConfig{} err := yaml.Unmarshal(config.Config, &d) s.PluginConfigByName[d.Name] = d + logger.Debug(fmt.Sprintf("Splunk plugin '%s' use URL '%s'", d.Name, d.URL)) return &protobufs.Empty{}, err }