Skip to content

Commit 1976208

Browse files
committed
Improve comment for githubpullrequestcomment
Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
1 parent f7fd45e commit 1976208

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

docs/spec/v1beta3/providers.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,21 +2125,23 @@ The provider posts comments in the following format:
21252125
```markdown
21262126
## Flux Status
21272127
2128-
ℹ️ Info: `Kustomization/flux-system.flux-system`
2128+
ℹ️ Kustomization/flux-system/flux-system
21292129
2130-
`Applied revision: main@sha1:abc1234`
2130+
Applied revision: main@sha1:abc1234
21312131
2132-
* `revision`: `main@sha1:abc1234`
2132+
Metadata:
2133+
* `revision`: main@sha1:abc1234
21332134
```
21342135

21352136
For error events, the comment will show:
21362137

21372138
```markdown
21382139
## Flux Status
21392140

2140-
⚠️ Error: `Kustomization/flux-system.flux-system`
2141+
⚠️ Kustomization/flux-system/flux-system
21412142

2142-
`Reconciliation failed: validation error`
2143+
Reconciliation failed: validation error
21432144

2144-
* `revision`: `main@sha1:abc1234`
2145+
Metadata:
2146+
* `revision`: main@sha1:abc1234
21452147
```

internal/notifier/github_pull_request_comment.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ func (g *GitHubPullRequestComment) formatCommentKeyMarker(event *eventv1.Event)
163163
func (g *GitHubPullRequestComment) formatCommentBody(event *eventv1.Event) string {
164164
marker := g.formatCommentKeyMarker(event)
165165

166-
// Format severity with emoji
167-
var severityText string
166+
// Get emoji based on severity
167+
var severityEmoji string
168168
if event.Severity == eventv1.EventSeverityError {
169-
severityText = "⚠️ Error"
169+
severityEmoji = "⚠️"
170170
} else {
171-
severityText = "ℹ️ Info"
171+
severityEmoji = "ℹ️"
172172
}
173173

174174
// Format object identifier
@@ -187,10 +187,10 @@ func (g *GitHubPullRequestComment) formatCommentBody(event *eventv1.Event) strin
187187
slices.Sort(keys)
188188
var metadataLines strings.Builder
189189
for _, key := range keys {
190-
fmt.Fprintf(&metadataLines, "* `%s`: `%s`\n", key, event.Metadata[key])
190+
fmt.Fprintf(&metadataLines, "* `%s`: %s\n", key, event.Metadata[key])
191191
}
192192

193193
// Format the comment body
194-
return fmt.Sprintf("%s\n\n## Flux Status\n\n%s: `%s`\n\n`%s`\n\n%s",
195-
marker, severityText, objectID, event.Message, metadataLines.String())
194+
return fmt.Sprintf("%s\n\n## Flux Status\n\n%s %s\n\n%s\n\nMetadata:\n%s",
195+
marker, severityEmoji, objectID, event.Message, metadataLines.String())
196196
}

0 commit comments

Comments
 (0)