From d630680a518876c5112b9acbc1f347edd483fd56 Mon Sep 17 00:00:00 2001
From: Kota Kanbe <kotakanbe@gmail.com>
Date: Mon, 18 Mar 2019 13:56:49 +0900
Subject: [PATCH] feat(slack): enable -format-one-line-text with -to-slack
 (#792)

---
 report/slack.go   | 33 ++++++++++++++++++++-------------
 scan/serverapi.go |  1 -
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/report/slack.go b/report/slack.go
index 2f498fe1..a1f20a16 100644
--- a/report/slack.go
+++ b/report/slack.go
@@ -59,19 +59,6 @@ func (w SlackWriter) Write(rs ...models.ScanResult) (err error) {
 			channel = fmt.Sprintf("#%s", r.ServerName)
 		}
 
-		if 0 < len(r.Errors) {
-			msg := message{
-				Text:      msgText(r),
-				Username:  conf.AuthUser,
-				IconEmoji: conf.IconEmoji,
-				Channel:   channel,
-			}
-			if err = send(msg); err != nil {
-				return err
-			}
-			continue
-		}
-
 		// A maximum of 100 attachments are allowed on a message.
 		// Split into chunks with 100 elements
 		// https://api.slack.com/methods/chat.postMessage
@@ -95,6 +82,13 @@ func (w SlackWriter) Write(rs ...models.ScanResult) (err error) {
 				IconEmoji: conf.IconEmoji,
 			}
 
+			if config.Conf.FormatOneLineText {
+				if _, _, err = api.PostMessage(channel, formatOneLineSummary(r), ParentMsg); err != nil {
+					return err
+				}
+				continue
+			}
+
 			var ts string
 			if _, ts, err = api.PostMessage(channel, msgText(r), ParentMsg); err != nil {
 				return err
@@ -113,6 +107,19 @@ func (w SlackWriter) Write(rs ...models.ScanResult) (err error) {
 				}
 			}
 		} else {
+			if config.Conf.FormatOneLineText {
+				msg := message{
+					Text:      formatOneLineSummary(r),
+					Username:  conf.AuthUser,
+					IconEmoji: conf.IconEmoji,
+					Channel:   channel,
+				}
+				if err := send(msg); err != nil {
+					return err
+				}
+				continue
+			}
+
 			for i, k := range chunkKeys {
 				txt := ""
 				if i == 0 {
diff --git a/scan/serverapi.go b/scan/serverapi.go
index 105eb7e4..119bc362 100644
--- a/scan/serverapi.go
+++ b/scan/serverapi.go
@@ -304,7 +304,6 @@ func detectContainerOSes(timeoutSec int) (actives, inactives []osTypeInterface)
 					})
 					inactives = append(inactives)
 					util.Log.Errorf("Timed out: %s", servername)
-
 				}
 			}
 		}