From 84a93d24a909aa96fe16b9bb8a0080c7776a401b Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Fri, 6 May 2022 11:10:47 +0200 Subject: [PATCH] escape adoc pipe & remove linewrap in output Signed-off-by: Christian Richter --- docs/helpers/adoc-generator.go.tmpl | 2 ++ docs/templates/ADOC.tmpl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/helpers/adoc-generator.go.tmpl b/docs/helpers/adoc-generator.go.tmpl index 0e656d0d71..e4cb929ad4 100644 --- a/docs/helpers/adoc-generator.go.tmpl +++ b/docs/helpers/adoc-generator.go.tmpl @@ -91,6 +91,8 @@ func GetAnnotatedVariables(s interface{}) []ConfigField { td := strings.Split(env, ";") re := regexp.MustCompile(`^(https?:\/\/)`) v = re.ReplaceAllString(v,"\\$1") + re = regexp.MustCompile(`(\|)`) + v = re.ReplaceAllString(v, "\\$1") fields = append(fields, ConfigField{EnvVars: td, DefaultValue: v, Description: desc, Type: value.Type().Name()}) case reflect.Ptr: // PolicySelectors in the Proxy are being skipped atm diff --git a/docs/templates/ADOC.tmpl b/docs/templates/ADOC.tmpl index 03633fa07c..36179380b7 100644 --- a/docs/templates/ADOC.tmpl +++ b/docs/templates/ADOC.tmpl @@ -9,7 +9,8 @@ {{- range .Fields}} {{ $numVars := len .EnvVars }} -| {{- range $i, $value := .EnvVars }}{{- if $i }} +{{ end }} +| {{- range $i, $value := .EnvVars }}{{- if $i }} + +{{ end -}} `{{- $value }}` {{- end }} | {{.Type}}