Skip to content

Commit cadd643

Browse files
committed
(fix) exec markdown spacing and flowfile defaults
1 parent c1c50d6 commit cadd643

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

internal/filesystem/executables.go

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ func LoadWorkspaceFlowFiles(
9292
logger.Errorx("unable to load executable config file", "configFile", cfgFile, "err", err)
9393
continue
9494
}
95+
cfg.SetDefaults()
9596
cfg.SetContext(workspaceCfg.AssignedName(), workspaceCfg.Location(), cfgFile)
9697
cfgs = append(cfgs, cfg)
9798
}

tools/builder/flowfile.go

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func ExamplesMultiExecFlowFile(opts ...Option) *executable.FlowFile {
4242
}
4343
if len(opts) > 0 {
4444
vals := NewOptionValues(opts...)
45+
d.SetDefaults()
4546
d.SetContext(vals.WorkspaceName, vals.WorkspacePath, vals.FlowFilePath)
4647
}
4748
return d
@@ -62,6 +63,7 @@ func ExamplesRequestExecFlowFile(opts ...Option) *executable.FlowFile {
6263
}
6364
if len(opts) > 0 {
6465
vals := NewOptionValues(opts...)
66+
d.SetDefaults()
6567
d.SetContext(vals.WorkspaceName, vals.WorkspacePath, vals.FlowFilePath)
6668
}
6769
return d

types/executable/executable_md.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,21 @@ func execMarkdown(e *Executable) string {
3737
}
3838

3939
func execDescriptionMarkdown(e *Executable) string {
40+
if e.Description == "" && e.inheritedDescription == "" {
41+
return ""
42+
}
4043
var mkdwn string
4144
const descSpacer = "| \n"
42-
if e.Description != "" {
45+
if d := strings.TrimSpace(e.Description); d != "" {
4346
mkdwn += descSpacer
44-
lines := strings.Split(e.Description, "\n")
47+
lines := strings.Split(d, "\n")
4548
for _, line := range lines {
4649
mkdwn += fmt.Sprintf("| %s\n", line)
4750
}
4851
mkdwn += descSpacer
4952
}
50-
if e.inheritedDescription != "" {
51-
for _, line := range strings.Split(e.inheritedDescription, "\n") {
53+
if d := strings.TrimSpace(e.inheritedDescription); d != "" {
54+
for _, line := range strings.Split(d, "\n") {
5255
mkdwn += fmt.Sprintf("| %s\n", line)
5356
}
5457
mkdwn += descSpacer

0 commit comments

Comments
 (0)