Skip to content

Commit 922d58d

Browse files
committed
refactor: Rename Header to Heading in MarkdownOptions
1 parent 50ea91b commit 922d58d

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎cmd/fleet-plan/cmd_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func TestRootFlagsIncludeAllFlags(t *testing.T) {
117117
}
118118

119119
output := buf.String()
120-
for _, flag := range []string{"--team", "--default", "--verbose", "--ci-header", "--ci-marker", "--detailed-exitcode"} {
120+
for _, flag := range []string{"--team", "--default", "--verbose", "--ci-heading", "--ci-marker", "--detailed-exitcode"} {
121121
if !strings.Contains(output, flag) {
122122
t.Errorf("help should mention %s, got:\n%s", flag, output)
123123
}

‎cmd/fleet-plan/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
flagVerbose bool
3737
flagTeams []string
3838
flagDefault string
39-
flagCIHeader string
39+
flagCIHeading string
4040
flagCIMarker string
4141
flagDetailedExitCode bool
4242
flagChangedFiles []string
@@ -64,7 +64,7 @@ Strictly read-only -- GET requests only.`,
6464
pf.BoolVarP(&flagVerbose, "verbose", "v", false, "show full old/new values for modified fields")
6565
pf.StringSliceVar(&flagTeams, "team", nil, "diff only these teams (repeatable, default: all)")
6666
pf.StringVar(&flagDefault, "default", "", "path to default.yml (overrides auto-detection)")
67-
pf.StringVar(&flagCIHeader, "ci-header", "", "blockquote header prepended to markdown output (CI use)")
67+
pf.StringVar(&flagCIHeading, "ci-heading", "", "## heading for markdown output (CI use)")
6868
pf.StringVar(&flagCIMarker, "ci-marker", "", "HTML comment marker appended to markdown output for idempotent MR note updates")
6969
pf.BoolVar(&flagDetailedExitCode, "detailed-exitcode", false, "exit 2 when changes detected (0=no changes, 1=error, 2=changes)")
7070
pf.StringSliceVar(&flagChangedFiles, "changed-file", nil, "only show diffs for resources from these source files (repeatable, CI use)")
@@ -131,8 +131,8 @@ func runDiff(cmd *cobra.Command, _ []string) error {
131131
fmt.Println(out)
132132
case "markdown":
133133
opts := output.MarkdownOptions{
134-
Header: flagCIHeader,
135-
Marker: flagCIMarker,
134+
Heading: flagCIHeading,
135+
Marker: flagCIMarker,
136136
}
137137
fmt.Println(output.RenderDiffMarkdown(results, opts))
138138
default:

‎internal/output/markdown.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
// MarkdownOptions controls optional CI-oriented additions to markdown output.
1212
type MarkdownOptions struct {
13-
Header string // blockquote line prepended after the heading (e.g. "> Comparing against **prod**")
13+
Heading string // ## heading text (e.g. "Planned changes for fleet.example.com")
1414
Marker string // HTML comment appended for idempotent MR note updates
1515
}
1616

@@ -53,11 +53,11 @@ var permissionErrors = map[string]string{
5353
func RenderDiffMarkdown(results []diff.DiffResult, opts MarkdownOptions) string {
5454
var sb strings.Builder
5555

56-
sb.WriteString("## fleet-plan\n\n")
57-
58-
if opts.Header != "" {
59-
sb.WriteString(opts.Header + "\n\n")
56+
heading := "fleet-plan"
57+
if opts.Heading != "" {
58+
heading = opts.Heading
6059
}
60+
sb.WriteString("## " + heading + "\n\n")
6161

6262
if !HasChanges(results) {
6363
sb.WriteString("No changes detected. Your branch matches the current Fleet state.\n")

‎internal/output/markdown_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ func TestRenderDiffMarkdown(t *testing.T) {
234234
},
235235
},
236236
{
237-
name: "ci-header prepended",
237+
name: "ci-heading as heading",
238238
results: []diff.DiffResult{{
239239
Team: "T",
240240
Policies: diff.ResourceDiff{Added: []diff.ResourceChange{{Name: "P"}}},
241241
}},
242-
opts: MarkdownOptions{Header: "> Comparing against **production**"},
243-
wantAll: []string{"## fleet-plan", "> Comparing against **production**", "**1 added**"},
242+
opts: MarkdownOptions{Heading: "Planned changes for fleet.example.com"},
243+
wantAll: []string{"## Planned changes for fleet.example.com", "**1 added**"},
244244
},
245245
{
246246
name: "ci-marker appended",
@@ -258,10 +258,10 @@ func TestRenderDiffMarkdown(t *testing.T) {
258258
wantAll: []string{"No changes detected", "<!-- fleet-plan-marker -->"},
259259
},
260260
{
261-
name: "ci-header on no changes",
261+
name: "ci-heading on no changes",
262262
results: nil,
263-
opts: MarkdownOptions{Header: "> env info"},
264-
wantAll: []string{"> env info", "No changes detected"},
263+
opts: MarkdownOptions{Heading: "Planned changes for fleet.example.com"},
264+
wantAll: []string{"## Planned changes for fleet.example.com", "No changes detected"},
265265
},
266266
{
267267
name: "host count formatting with commas",

0 commit comments

Comments
 (0)