From f4e1c7cde1adf4433932daff79990a27dfb90631 Mon Sep 17 00:00:00 2001 From: favonia Date: Sun, 5 Nov 2023 05:37:43 -0600 Subject: [PATCH] fix: fix an incorrect printf and add a missing error check (#408) * fix(verify): printf is used incorrectly * fix(slack): did not check JSON marshaling errors --- pkg/services/slack/slack.go | 7 ++++--- shoutrrr/cmd/verify/verify.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/services/slack/slack.go b/pkg/services/slack/slack.go index e0bf3832..301c7c38 100644 --- a/pkg/services/slack/slack.go +++ b/pkg/services/slack/slack.go @@ -84,9 +84,10 @@ func (service *Service) sendAPI(config *Config, payload interface{}) error { func (service *Service) sendWebhook(config *Config, payload interface{}) error { payloadBytes, err := json.Marshal(payload) - var res *http.Response - res, err = http.Post(config.Token.WebhookURL(), jsonclient.ContentType, bytes.NewBuffer(payloadBytes)) - + if err != nil { + return fmt.Errorf("failed to marshal payload: %w", err) + } + res, err := http.Post(config.Token.WebhookURL(), jsonclient.ContentType, bytes.NewBuffer(payloadBytes)) if err != nil { return fmt.Errorf("failed to invoke webhook: %w", err) } diff --git a/shoutrrr/cmd/verify/verify.go b/shoutrrr/cmd/verify/verify.go index 915dbbc5..52e5c28d 100644 --- a/shoutrrr/cmd/verify/verify.go +++ b/shoutrrr/cmd/verify/verify.go @@ -42,5 +42,5 @@ func Run(cmd *cobra.Command, _ []string) { config := format.GetServiceConfig(service) configNode := format.GetConfigFormat(config) - _, _ = fmt.Fprintf(color.Output, format.ColorFormatTree(configNode, true)) + _, _ = fmt.Fprint(color.Output, format.ColorFormatTree(configNode, true)) }