diff --git a/bot/approvals.go b/bot/approvals.go index 663e2a97..0533ef8b 100644 --- a/bot/approvals.go +++ b/bot/approvals.go @@ -44,7 +44,7 @@ func (b *Bot) requestApproval(req *types.Approval) error { []slack.AttachmentField{ slack.AttachmentField{ Title: "Approval required!", - Value: req.Message + "\n" + fmt.Sprintf("To vote for change type '%s lgtm ' to reject it: '%s reject .", b.name, b.name), + Value: req.Message + "\n" + fmt.Sprintf("To vote for change type '%s approve %s' to reject it: '%s reject %s'.", b.name, req.Identifier, b.name, req.Identifier), Short: false, }, slack.AttachmentField{ @@ -62,6 +62,11 @@ func (b *Bot) requestApproval(req *types.Approval) error { Value: req.Identifier, Short: true, }, + slack.AttachmentField{ + Title: "Provider", + Value: req.Provider.String(), + Short: true, + }, }) } @@ -105,8 +110,6 @@ func (b *Bot) processApprovedResponse(approvalResponse *approvalResponse) error if identifier == "" { continue } - fmt.Println("approving: ", identifier) - fmt.Println("user: ", approvalResponse.User) approval, err := b.approvalsManager.Approve(identifier, approvalResponse.User) if err != nil { log.WithFields(log.Fields{ @@ -116,8 +119,6 @@ func (b *Bot) processApprovedResponse(approvalResponse *approvalResponse) error continue } - fmt.Println("approved: ", identifier) - err = b.replyToApproval(approval) if err != nil { log.WithFields(log.Fields{ @@ -275,3 +276,11 @@ func (b *Bot) approvalsResponse() string { return buf.String() } + +func (b *Bot) removeApprovalHandler(identifier string) string { + err := b.approvalsManager.Delete(identifier) + if err != nil { + return fmt.Sprintf("failed to remove '%s' approval: %s.", identifier, err) + } + return fmt.Sprintf("approval '%s' removed.", identifier) +} diff --git a/main.go b/main.go index debf3e59..cf89196e 100644 --- a/main.go +++ b/main.go @@ -64,7 +64,7 @@ func main() { "version": ver.Version, "go_version": ver.GoVersion, "arch": ver.Arch, - }).Info("keel starting..") + }).Info("keel starting...") if os.Getenv(EnvDebug) != "" { log.SetLevel(log.DebugLevel)