api/slack: fix error string that end with "\n"

2 files changed, 12 insertions, 7 deletions

diff --git a/api/slack/slack.go b/api/slack/slack.go
index 1087463a..1847f46e 100644
--- a/api/slack/slack.go
+++ b/api/slack/slack.go
@@ -16,28 +16,30 @@ import (
 
 // PostWebhook send a message using "Incoming Webhook".
 func PostWebhook(webhookUrl string, msg *Message) (err error) {
+	var logp = `PostWebhook`
+
 	payload, err := json.Marshal(&msg)
 	if err != nil {
-		return fmt.Errorf("PostWebhook: %w", err)
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	res, err := http.DefaultClient.Post(webhookUrl, "application/json",
 		bytes.NewReader(payload))
 	if err != nil {
-		return fmt.Errorf("PostWebhook: %w", err)
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	if res.StatusCode != http.StatusOK {
 		resBody, err := io.ReadAll(res.Body)
 		if err != nil {
-			return fmt.Errorf("PostWebhook: %w", err)
+			return fmt.Errorf(`%s: %w`, logp, err)
 		}
-		return fmt.Errorf("PostWebhook: %s: %s\n", res.Status, resBody)
+		return fmt.Errorf(`%s: %s: %s`, logp, res.Status, resBody)
 	}
 
 	err = res.Body.Close()
 	if err != nil {
-		return fmt.Errorf("PostWebhook: %w", err)
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	return nil
diff --git a/api/slack/webhook_client.go b/api/slack/webhook_client.go
index abff49bd..d28dac18 100644
--- a/api/slack/webhook_client.go
+++ b/api/slack/webhook_client.go
@@ -51,12 +51,15 @@ func (wcl *WebhookClient) Post(msg *Message) (err error) {
 	if wcl.Client == nil {
 		return nil
 	}
+
+	var logp = `Post`
+
 	httpRes, resBody, err := wcl.Client.PostJSON(wcl.webhookPath, nil, msg)
 	if err != nil {
-		return fmt.Errorf("WebhookClient.Post: %w", err)
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 	if httpRes.StatusCode != http.StatusOK {
-		return fmt.Errorf("Post: %s: %s\n", httpRes.Status, resBody)
+		return fmt.Errorf(`%s: %s: %s`, logp, httpRes.Status, resBody)
 	}
 	return nil
 }