Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 11 additions & 21 deletions internal/notifiers/github_slack.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,26 @@ func (s *SlackNotifier) NotifyPRBypass(ctx context.Context, result *github.PRCom
mergedBy = *result.PR.MergedBy.Login
}

// build merged by line with optional bypass reason
mergedByText := fmt.Sprintf("Merged by %s", mergedBy)
if result.UserHasBypass {
mergedByText = fmt.Sprintf("Merged by %s (%s)", mergedBy, result.UserBypassReason)
}

blocks := []slack.Block{
slack.NewHeaderBlock(
slack.NewTextBlockObject("plain_text", "🚨 Branch Protection Bypassed", false, false),
),
slack.NewSectionBlock(
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*PR #%d*: %s", prNumber, prTitle), false, false),
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("<%s|%s#%d> — %s", prURL, repoFullName, prNumber, prTitle), false, false),
nil, nil,
),
slack.NewSectionBlock(
slack.NewTextBlockObject("mrkdwn", mergedByText, false, false),
nil, nil,
),
}

detailsFields := []*slack.TextBlockObject{
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*Repository*\n%s", repoFullName), false, false),
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*Branch*\n%s", result.BaseBranch), false, false),
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*Merged by*\n%s", mergedBy), false, false),
}

if result.UserHasBypass {
detailsFields = append(detailsFields,
slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*User Permission*\n%s", result.UserBypassReason), false, false),
)
}

blocks = append(blocks, slack.NewSectionBlock(nil, detailsFields, nil))

if len(result.Violations) > 0 {
violationText := "*Violations:*\n"
for _, v := range result.Violations {
Expand All @@ -72,12 +68,6 @@ func (s *SlackNotifier) NotifyPRBypass(ctx context.Context, result *github.PRCom
))
}

buttons := slack.NewActionBlock(
"actions",
slack.NewButtonBlockElement("view_pr", "view", slack.NewTextBlockObject("plain_text", "View PR", false, false)).WithStyle(slack.StylePrimary).WithURL(prURL),
)
blocks = append(blocks, buttons)

_, _, err := s.client.PostMessageContext(
ctx,
s.channel,
Expand Down