(fix) exec markdown spacing and flowfile defaults

jahvon · Jul 17, 2024 · cadd643 · cadd643
1 parent c1c50d6
commit cadd643
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/internal/filesystem/executables.go b/internal/filesystem/executables.go
@@ -92,6 +92,7 @@ func LoadWorkspaceFlowFiles(
 			logger.Errorx("unable to load executable config file", "configFile", cfgFile, "err", err)
 			continue
 		}
+		cfg.SetDefaults()
 		cfg.SetContext(workspaceCfg.AssignedName(), workspaceCfg.Location(), cfgFile)
 		cfgs = append(cfgs, cfg)
 	}

diff --git a/tools/builder/flowfile.go b/tools/builder/flowfile.go
@@ -42,6 +42,7 @@ func ExamplesMultiExecFlowFile(opts ...Option) *executable.FlowFile {
 	}
 	if len(opts) > 0 {
 		vals := NewOptionValues(opts...)
+		d.SetDefaults()
 		d.SetContext(vals.WorkspaceName, vals.WorkspacePath, vals.FlowFilePath)
 	}
 	return d
@@ -62,6 +63,7 @@ func ExamplesRequestExecFlowFile(opts ...Option) *executable.FlowFile {
 	}
 	if len(opts) > 0 {
 		vals := NewOptionValues(opts...)
+		d.SetDefaults()
 		d.SetContext(vals.WorkspaceName, vals.WorkspacePath, vals.FlowFilePath)
 	}
 	return d

diff --git a/types/executable/executable_md.go b/types/executable/executable_md.go
@@ -37,18 +37,21 @@ func execMarkdown(e *Executable) string {
 }
 
 func execDescriptionMarkdown(e *Executable) string {
+	if e.Description == "" && e.inheritedDescription == "" {
+		return ""
+	}
 	var mkdwn string
 	const descSpacer = "| \n"
-	if e.Description != "" {
+	if d := strings.TrimSpace(e.Description); d != "" {
 		mkdwn += descSpacer
-		lines := strings.Split(e.Description, "\n")
+		lines := strings.Split(d, "\n")
 		for _, line := range lines {
 			mkdwn += fmt.Sprintf("| %s\n", line)
 		}
 		mkdwn += descSpacer
 	}
-	if e.inheritedDescription != "" {
-		for _, line := range strings.Split(e.inheritedDescription, "\n") {
+	if d := strings.TrimSpace(e.inheritedDescription); d != "" {
+		for _, line := range strings.Split(d, "\n") {
 			mkdwn += fmt.Sprintf("| %s\n", line)
 		}
 		mkdwn += descSpacer