This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 376d088255d181e25a4f2e23b5df9316db45cf25 Author: Antonin Stefanutti <[email protected]> AuthorDate: Thu Jan 5 14:24:33 2023 +0100 Fix lint errors --- cmd/util/doc-gen/generators/traitdocgen.go | 8 +++++--- pkg/cmd/describe.go | 7 +++++-- pkg/cmd/version.go | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go index 337617a30..2ac26acf0 100644 --- a/cmd/util/doc-gen/generators/traitdocgen.go +++ b/cmd/util/doc-gen/generators/traitdocgen.go @@ -27,7 +27,8 @@ import ( "sort" "strings" - "github.com/apache/camel-k/pkg/util" + "golang.org/x/text/cases" + "golang.org/x/text/language" "k8s.io/gengo/args" "k8s.io/gengo/generator" @@ -35,6 +36,7 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" "github.com/apache/camel-k/pkg/trait" + "github.com/apache/camel-k/pkg/util" ) const ( @@ -147,7 +149,7 @@ func traitNameFromFile(file string) string { name = strings.ReplaceAll(name, "trait", "") name = strings.ReplaceAll(name, "-", " ") name = strings.Trim(name, " ") - name = strings.Title(name) + name = cases.Title(language.English).String(name) return name } @@ -159,7 +161,7 @@ func writeTitle(traitID string, content *[]string) { return } } - res = append([]string{"= " + strings.Title(strings.ReplaceAll(traitID, "-", " ")) + " Trait"}, res...) + res = append([]string{"= " + cases.Title(language.English).String(strings.ReplaceAll(traitID, "-", " ")) + " Trait"}, res...) *content = res } diff --git a/pkg/cmd/describe.go b/pkg/cmd/describe.go index 5252f753a..ab77c4234 100644 --- a/pkg/cmd/describe.go +++ b/pkg/cmd/describe.go @@ -21,6 +21,9 @@ import ( "strings" "time" + "golang.org/x/text/cases" + "golang.org/x/text/language" + "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -60,10 +63,10 @@ func describeTraits(w *indentedwriter.Writer, traits interface{}) error { w.Writef(0, "Traits:\n") for id, trait := range traitMap { - w.Writef(1, "%s:\n", strings.Title(id)) + w.Writef(1, "%s:\n", cases.Title(language.English).String(id)) // TODO: print the whole TraitSpec as Yaml for k, v := range trait { - w.Writef(2, "%s:\t%v\n", strings.Title(k), v) + w.Writef(2, "%s:\t%v\n", cases.Title(language.English).String(k), v) } } } diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go index e789fb9b7..d0ba44dc9 100644 --- a/pkg/cmd/version.go +++ b/pkg/cmd/version.go @@ -22,6 +22,9 @@ import ( "fmt" "strings" + "golang.org/x/text/cases" + "golang.org/x/text/language" + k8serrors "k8s.io/apimachinery/pkg/api/errors" "github.com/Masterminds/semver" @@ -164,7 +167,7 @@ func operatorInfo(ctx context.Context, c client.Client, namespace string) (map[s func fromCamelCase(infos map[string]string) map[string]string { textKeys := make(map[string]string) for k, v := range infos { - key := strings.Title(strings.Join(camelcase.Split(k), " ")) + key := cases.Title(language.English).String(strings.Join(camelcase.Split(k), " ")) textKeys[key] = v }
