From 4b2522de6ddd8678d8b02c17ff3f0a19409576d4 Mon Sep 17 00:00:00 2001 From: Robert Brennan Date: Fri, 2 Oct 2020 15:22:53 +0000 Subject: [PATCH] change flag --- cmd/helm-docs/command_line.go | 5 ----- pkg/document/model.go | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd/helm-docs/command_line.go b/cmd/helm-docs/command_line.go index f3a55db..7c9ed8a 100644 --- a/cmd/helm-docs/command_line.go +++ b/cmd/helm-docs/command_line.go @@ -49,13 +49,8 @@ func newHelmDocsCommand(run func(cmd *cobra.Command, args []string)) (*cobra.Com command.PersistentFlags().StringP("ignore-file", "i", ".helmdocsignore", "The filename to use as an ignore file to exclude chart directories") command.PersistentFlags().StringP("log-level", "l", "info", logLevelUsage) command.PersistentFlags().StringP("output-file", "o", "README.md", "markdown file path relative to each chart directory to which rendered documentation will be written") -<<<<<<< HEAD command.PersistentFlags().StringP("sort-values-order", "s", document.AlphaNumSortOrder, fmt.Sprintf("order in which to sort the values table (\"%s\" or \"%s\")", document.AlphaNumSortOrder, document.FileSortOrder)) command.PersistentFlags().StringSliceP("template-files", "t", []string{"README.md.gotmpl"}, "gotemplate file paths relative to each chart directory from which documentation will be generated") -======= - command.PersistentFlags().StringP("template-file", "t", "README.md.gotmpl", "gotemplate file path relative to each chart directory from which documentation will be generated") - command.PersistentFlags().StringP("sort-values-order", "s", "alpha", "order in which to print the values (alpha or file)") ->>>>>>> 18b313e... change flag viper.AutomaticEnv() viper.SetEnvPrefix("HELM_DOCS") diff --git a/pkg/document/model.go b/pkg/document/model.go index e96e5f9..30663ee 100644 --- a/pkg/document/model.go +++ b/pkg/document/model.go @@ -55,7 +55,7 @@ func getChartTemplateData(chartDocumentationInfo helm.ChartDocumentationInfo, he sortOrder := viper.GetString("sort-values-order") if sortOrder == FileSortOrder { - sort.Slice(valuesTableRows[:], func(i, j int) bool { + sort.Slice(valuesTableRows, func(i, j int) bool { if valuesTableRows[i].LineNumber < valuesTableRows[j].LineNumber { return true } else if valuesTableRows[i].Column < valuesTableRows[j].Column { @@ -65,12 +65,12 @@ func getChartTemplateData(chartDocumentationInfo helm.ChartDocumentationInfo, he return false }) } else if sortOrder == AlphaNumSortOrder { - sort.Slice(valuesTableRows[:], func(i, j int) bool { + sort.Slice(valuesTableRows, func(i, j int) bool { return valuesTableRows[i].Key < valuesTableRows[j].Key }) } else { log.Warnf("Invalid sort order provided %s, defaulting to %s", sortOrder, AlphaNumSortOrder) - sort.Slice(valuesTableRows[:], func(i, j int) bool { + sort.Slice(valuesTableRows, func(i, j int) bool { return valuesTableRows[i].Key < valuesTableRows[j].Key }) }