Merge pull request #5 from sakajunquality/feature/fix-notification

fix notification
ubie-oss · Jan 17, 2019 · 3778540 · 3778540
2 parents 8d4a9ab + 5c0c052
commit 3778540
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/flow/event.go b/flow/event.go
@@ -32,8 +32,9 @@ type EventSource struct {
 }
 
 type EventRepo struct {
-	RepoName string `json:"repoName"`
-	TagName  string `json:"tagName"`
+	RepoName   string  `json:"repoName"`
+	TagName    *string `json:"tagName"`
+	BranchName *string `json:"branchName"`
 }
 
 type Artifacts struct {

diff --git a/flow/process.go b/flow/process.go
@@ -130,6 +130,8 @@ func (f *Flow) notifyRelasePR(e Event, prs PullRequests, app *Application) error
 		LogURL:     e.LogURL,
 		AppName:    app.Name,
 		Images:     e.Images,
+		TagName:    e.TagName,
+		BranchName: e.BranchName,
 		PrURL:      prURL,
 	}
 
@@ -142,6 +144,8 @@ func (f *Flow) notifyDeploy(e Event) error {
 		IsPrNotify: false,
 		LogURL:     e.LogURL,
 		AppName:    e.RepoName,
+		TagName:    e.TagName,
+		BranchName: e.BranchName,
 	}
 
 	return slackbot.NewSlackMessage(f.slackBotToken, cfg.SlackNotifiyChannel, d).Post()
@@ -153,6 +157,8 @@ func (f *Flow) notifyFalure(e Event, errorMessage string, app *Application) erro
 		LogURL:       e.LogURL,
 		Images:       e.Images,
 		ErrorMessage: errorMessage,
+		TagName:      e.TagName,
+		BranchName:   e.BranchName,
 	}
 
 	if app != nil {

diff --git a/slackbot/slack.go b/slackbot/slack.go
@@ -21,6 +21,8 @@ type MessageDetail struct {
 	Images       []string
 	LogURL       string
 	PrURL        string
+	BranchName   *string
+	TagName      *string
 	Time         time.Duration
 	ErrorMessage string
 }
@@ -53,9 +55,25 @@ func (s *slackMessage) Post() error {
 	fields = append(fields, slack.AttachmentField{
 		Title: "App",
 		Value: s.AppName,
-		Short: false,
+		Short: true,
 	})
 
+	if s.BranchName != nil {
+		fields = append(fields, slack.AttachmentField{
+			Title: "Branch",
+			Value: *s.BranchName,
+			Short: true,
+		})
+	}
+
+	if s.TagName != nil {
+		fields = append(fields, slack.AttachmentField{
+			Title: "Tag",
+			Value: *s.TagName,
+			Short: true,
+		})
+	}
+
 	if len(s.Images) > 0 {
 		fields = append(fields, slack.AttachmentField{
 			Title: "Images",