fix slack URL and tests

containrrr · Aug 16, 2021 · ff30b37 · ff30b37
1 parent 140186c
commit ff30b37
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/pkg/notifications/notifier.go b/pkg/notifications/notifier.go
@@ -66,7 +66,7 @@ func AppendLegacyUrls(urls []string, cmd *cobra.Command) []string {
 
 		shoutrrrURL, err := legacyNotifier.GetURL(cmd)
 		if err != nil {
-			log.Fatal("failed to create notification config:", err)
+			log.Fatal("failed to create notification config: ", err)
 		}
 		urls = append(urls, shoutrrrURL)
 

diff --git a/pkg/notifications/notifier_test.go b/pkg/notifications/notifier_test.go
@@ -66,14 +66,14 @@ var _ = Describe("notifications", func() {
 				flags.RegisterNotificationFlags(command)
 
 				username := "containrrrbot"
-				tokenA := "aaa"
-				tokenB := "bbb"
-				tokenC := "ccc"
+				tokenA := "AAAAAAAAA"
+				tokenB := "BBBBBBBBB"
+				tokenC := "123456789123456789123456"
 				color := url.QueryEscape(notifications.ColorHex)
 				title := url.QueryEscape(notifications.GetTitle(command))
 
 				hookURL := fmt.Sprintf("https://hooks.slack.com/services/%s/%s/%s", tokenA, tokenB, tokenC)
-				expectedOutput := fmt.Sprintf("slack://%s@%s/%s/%s?color=%s&title=%s", username, tokenA, tokenB, tokenC, color, title)
+				expectedOutput := fmt.Sprintf("slack://hook:%s-%s-%s@webhook?botname=%s&color=%s&title=%s", tokenA, tokenB, tokenC, username, color, title)
 
 				args := []string{
 					"--notifications",
@@ -208,6 +208,7 @@ func buildExpectedURL(username string, password string, host string, port int, f
 }
 
 func testURL(args []string, expectedURL string) {
+	defer GinkgoRecover()
 
 	command := cmd.NewRootCommand()
 	flags.RegisterNotificationFlags(command)

diff --git a/pkg/notifications/slack.go b/pkg/notifications/slack.go
@@ -64,9 +64,16 @@ func (s *slackTypeNotifier) GetURL(c *cobra.Command) (string, error) {
 	conf := &shoutrrrSlack.Config{
 		BotName: s.Username,
 		Color:   ColorHex,
+		Channel: "webhook",
 		Title:   GetTitle(c),
 	}
 
+	if s.IconURL != "" {
+		conf.Icon = s.IconURL
+	} else if s.IconEmoji != "" {
+		conf.Icon = s.IconEmoji
+	}
+
 	if err := conf.Token.SetFromProp(webhookToken); err != nil {
 		return "", err
 	}