From 2178224c3160e853e1e597f1ae991069cb8e4f14 Mon Sep 17 00:00:00 2001 From: Andre Moeller Date: Thu, 30 Jun 2022 16:10:50 +0200 Subject: [PATCH] fix(template functions): Use function Title instead of ToTitle to get Capitalize strings instead of upper strings using cases.Title because the strings.Title function is deprecated and refs to cases.Title --- go.mod | 2 +- go.sum | 4 ---- internal/provider/template.go | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ea695132..5b8fc031 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/mitchellh/cli v1.1.4 github.com/russross/blackfriday v1.6.0 github.com/zclconf/go-cty v1.10.0 + golang.org/x/text v0.3.7 ) require ( @@ -37,5 +38,4 @@ require ( github.com/spf13/cast v1.5.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect - golang.org/x/text v0.3.7 // indirect ) diff --git a/go.sum b/go.sum index 56675790..9ffac83d 100644 --- a/go.sum +++ b/go.sum @@ -167,8 +167,6 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -196,8 +194,6 @@ golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/internal/provider/template.go b/internal/provider/template.go index 0aa777a6..683c0b7f 100644 --- a/internal/provider/template.go +++ b/internal/provider/template.go @@ -7,6 +7,8 @@ import ( "strings" "text/template" + "golang.org/x/text/cases" + tfjson "github.com/hashicorp/terraform-json" "github.com/hashicorp/terraform-plugin-docs/internal/mdplain" @@ -39,7 +41,7 @@ func newTemplate(name, text string) (*template.Template, error) { "prefixlines": tmplfuncs.PrefixLines, "split": strings.Split, "tffile": terraformCodeFile, - "title": strings.ToTitle, + "title": cases.Title, "trimspace": strings.TrimSpace, "upper": strings.ToUpper, })