cherrypick notification changes from #450 (#745)

pkg/notifications/gotify.go

@@ -1,16 +1,13 @@
 package notifications
 
 import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"net/http"
 	"strings"
 
+	shoutrrrGotify "github.com/containrrr/shoutrrr/pkg/services/gotify"
 	t "github.com/containrrr/watchtower/pkg/types"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 const (
@@ -24,10 +21,40 @@ type gotifyTypeNotifier struct {
 	logLevels                []log.Level
 }
 
-func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier {
+// NewGotifyNotifier is a factory method creating a new gotify notifier instance
+func NewGotifyNotifier(c *cobra.Command, levels []log.Level) t.ConvertableNotifier {
+	return newGotifyNotifier(c, levels)
+}
+
+func newGotifyNotifier(c *cobra.Command, levels []log.Level) t.ConvertableNotifier {
 	flags := c.PersistentFlags()
 
+	url := getGotifyURL(flags)
+	token := getGotifyToken(flags)
+
+	skipVerify, _ := flags.GetBool("notification-gotify-tls-skip-verify")
+
+	n := &gotifyTypeNotifier{
+		gotifyURL:                url,
+		gotifyAppToken:           token,
+		gotifyInsecureSkipVerify: skipVerify,
+		logLevels:                levels,
+	}
+
+	return n
+}
+
+func getGotifyToken(flags *pflag.FlagSet) string {
+	gotifyToken, _ := flags.GetString("notification-gotify-token")
+	if len(gotifyToken) < 1 {
+		log.Fatal("Required argument --notification-gotify-token(cli) or WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN(env) is empty.")
+	}
+	return gotifyToken
+}
+
+func getGotifyURL(flags *pflag.FlagSet) string {
 	gotifyURL, _ := flags.GetString("notification-gotify-url")
+
 	if len(gotifyURL) < 1 {
 		log.Fatal("Required argument --notification-gotify-url(cli) or WATCHTOWER_NOTIFICATION_GOTIFY_URL(env) is empty.")
 	} else if !(strings.HasPrefix(gotifyURL, "http://") || strings.HasPrefix(gotifyURL, "https://")) {
@@ -36,82 +63,29 @@ func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifi
 		log.Warn("Using an HTTP url for Gotify is insecure")
 	}
 
-	gotifyToken, _ := flags.GetString("notification-gotify-token")
-	if len(gotifyToken) < 1 {
-		log.Fatal("Required argument --notification-gotify-token(cli) or WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN(env) is empty.")
-	}
-
-	gotifyInsecureSkipVerify, _ := flags.GetBool("notification-gotify-tls-skip-verify")
-
-	n := &gotifyTypeNotifier{
-		gotifyURL:                gotifyURL,
-		gotifyAppToken:           gotifyToken,
-		gotifyInsecureSkipVerify: gotifyInsecureSkipVerify,
-		logLevels:                acceptedLogLevels,
-	}
-
-	log.AddHook(n)
-
-	return n
+	return gotifyURL
 }
 
-func (n *gotifyTypeNotifier) StartNotification() {}
-
-func (n *gotifyTypeNotifier) SendNotification() {}
-
-func (n *gotifyTypeNotifier) Close() {}
-
-func (n *gotifyTypeNotifier) Levels() []log.Level {
-	return n.logLevels
-}
-
-func (n *gotifyTypeNotifier) getURL() string {
+func (n *gotifyTypeNotifier) GetURL() string {
 	url := n.gotifyURL
-	if !strings.HasSuffix(url, "/") {
-		url += "/"
+
+	if strings.HasPrefix(url, "https://") {
+		url = strings.TrimPrefix(url, "https://")
+	} else {
+		url = strings.TrimPrefix(url, "http://")
 	}
-	return url + "message?token=" + n.gotifyAppToken
+
+	url = strings.TrimSuffix(url, "/")
+
+	config := &shoutrrrGotify.Config{
+		Host:  url,
+		Token: n.gotifyAppToken,
+	}
+
+	return config.GetURL().String()
 }
 
-func (n *gotifyTypeNotifier) Fire(entry *log.Entry) error {
-
-	go func() {
-		jsonBody, err := json.Marshal(gotifyMessage{
-			Message:  "(" + entry.Level.String() + "): " + entry.Message,
-			Title:    "Watchtower",
-			Priority: 0,
-		})
-		if err != nil {
-			fmt.Println("Failed to create JSON body for Gotify notification: ", err)
-			return
-		}
-
-		// Explicitly define the client so we can set InsecureSkipVerify to the desired value.
-		client := &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: n.gotifyInsecureSkipVerify,
-				},
-			},
-		}
-		jsonBodyBuffer := bytes.NewBuffer([]byte(jsonBody))
-		resp, err := client.Post(n.getURL(), "application/json", jsonBodyBuffer)
-		if err != nil {
-			fmt.Println("Failed to send Gotify notification: ", err)
-			return
-		}
-		defer resp.Body.Close()
-
-		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			fmt.Printf("Gotify notification returned %d HTTP status code", resp.StatusCode)
-		}
-
-	}()
-	return nil
-}
-
-type gotifyMessage struct {
-	Message  string `json:"message"`
-	Title    string `json:"title"`
-	Priority int    `json:"priority"`
-}
+func (n *gotifyTypeNotifier) StartNotification()  {}
+func (n *gotifyTypeNotifier) SendNotification()   {}
+func (n *gotifyTypeNotifier) Close()              {}
+func (n *gotifyTypeNotifier) Levels() []log.Level { return nil }