From 58c2208e2af2a91a49cfd13679df8675fdef975c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 15:32:09 +0800 Subject: [PATCH] add sorting for properties, outputs, writeSecretRefParameters in vela def doc-gen (#3604) Signed-off-by: Nicola115 <2225992901@qq.com> (cherry picked from commit f1f5fa563d7af3505c56f664a888dde78b9cde45) Co-authored-by: Nicola115 <2225992901@qq.com> --- references/plugins/references.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/references/plugins/references.go b/references/plugins/references.go index 2c328b8e1..1d9f6d0ed 100644 --- a/references/plugins/references.go +++ b/references/plugins/references.go @@ -23,6 +23,7 @@ import ( "io/ioutil" "os" "path/filepath" + "sort" "strconv" "strings" @@ -1114,6 +1115,9 @@ func (ref *ParseReference) parseTerraformCapabilityParameters(capability types.C refParameterList = append(refParameterList, refParam) } refParameterList = append(refParameterList, writeConnectionSecretToRefReferenceParameter) + sort.SliceStable(refParameterList, func(i, j int) bool { + return refParameterList[i].Name < refParameterList[j].Name + }) propertiesTableName := fmt.Sprintf("%s %s", strings.Repeat("#", 3), propertiesTitle) tables = append(tables, ReferenceParameterTable{ @@ -1140,6 +1144,9 @@ func (ref *ParseReference) parseTerraformCapabilityParameters(capability types.C writeSecretRefParameterList := []ReferenceParameter{writeSecretRefNameParam, writeSecretRefNameSpaceParam} writeSecretTableName := fmt.Sprintf("%s %s", strings.Repeat("#", 4), terraform.TerraformWriteConnectionSecretToRefName) + sort.SliceStable(writeSecretRefParameterList, func(i, j int) bool { + return writeSecretRefParameterList[i].Name < writeSecretRefParameterList[j].Name + }) tables = append(tables, ReferenceParameterTable{ Name: writeSecretTableName, Parameters: writeSecretRefParameterList, @@ -1153,11 +1160,13 @@ func (ref *ParseReference) parseTerraformCapabilityParameters(capability types.C outputsList = append(outputsList, refParam) } + sort.SliceStable(outputsList, func(i, j int) bool { + return outputsList[i].Name < outputsList[j].Name + }) outputsTables = append(outputsTables, ReferenceParameterTable{ Name: outputsTableName, Parameters: outputsList, }) - return tables, outputsTables, nil }