diff --git a/cmd/release-notes/main.go b/cmd/release-notes/main.go index eb64cf6b3a1a..f0643b23f075 100644 --- a/cmd/release-notes/main.go +++ b/cmd/release-notes/main.go @@ -351,7 +351,11 @@ func WriteReleaseNotes(releaseNotes *notes.ReleaseNotes) (err error) { } if releaseNotesOpts.tableOfContents { - toc, err := mdtoc.GenerateTOC([]byte(markdown)) + toc, err := mdtoc.GenerateTOC([]byte(markdown), mdtoc.Options{ + Dryrun: false, + SkipPrefix: false, + MaxDepth: mdtoc.MaxHeaderDepth, + }) if err != nil { return errors.Wrap(err, "generating table of contents") } diff --git a/go.mod b/go.mod index 0ae56c9edcee..5f0aa0083409 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( google.golang.org/api v0.56.0 google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 gopkg.in/yaml.v2 v2.4.0 - sigs.k8s.io/mdtoc v1.0.1 + sigs.k8s.io/mdtoc v1.1.0 sigs.k8s.io/promo-tools/v3 v3.2.1 sigs.k8s.io/release-sdk v0.2.0 sigs.k8s.io/release-utils v0.3.0 @@ -71,7 +71,7 @@ require ( github.com/go-ole/go-ole v1.2.5 // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/snappy v0.0.3 // indirect - github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 // indirect + github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 // indirect github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-github/v33 v33.0.0 // indirect github.com/google/go-querystring v1.0.0 // indirect diff --git a/go.sum b/go.sum index 08010ade51a2..a30fa2423bd1 100644 --- a/go.sum +++ b/go.sum @@ -462,8 +462,8 @@ github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlS github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 h1:LP/6EfrZ/LyCc+SXvANDrIJ4sP9u2NAtqyv6QknetNQ= -github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= +github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7 h1:oKYOfNR7Hp6XpZ4JqolL5u642Js5Z0n7psPVl+S5heo= +github.com/gomarkdown/markdown v0.0.0-20210514010506-3b9f47219fe7/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -1585,8 +1585,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/mdtoc v1.0.1 h1:6ECKhQnbetwZBR6R2IeT2LH+1w+2Zsip0iXjikgaXIk= -sigs.k8s.io/mdtoc v1.0.1/go.mod h1:COYBtOjsaCg7o7SC4eaLwEXPuVRSuiVuLLRrHd7kShw= +sigs.k8s.io/mdtoc v1.1.0 h1:q3YtqYzmC2e0hgLXRIOm7/QLuPux1CX3ZHCwlbABxZo= +sigs.k8s.io/mdtoc v1.1.0/go.mod h1:QZLVEdHH2iNIR4uHAZyvFRtjloHgVItk8lo/mzCtq3w= sigs.k8s.io/promo-tools/v3 v3.2.1 h1:iDUOYttTBpVvm7bUuE2nv/KDlZQ3dk12XlW83TS76wg= sigs.k8s.io/promo-tools/v3 v3.2.1/go.mod h1:MQj3epgssCPeMJvB8Xqt4c2rBxVTUgPFE4ZYLkRwmUs= sigs.k8s.io/release-sdk v0.2.0 h1:DVTHyvEoim//zhckxQJBwofDcyHJIsxeo/WdPMm48Ow= diff --git a/pkg/changelog/impl.go b/pkg/changelog/impl.go index 10eb05c0ad67..5fbd11eaa88f 100644 --- a/pkg/changelog/impl.go +++ b/pkg/changelog/impl.go @@ -128,7 +128,11 @@ func (*defaultImpl) LatestGitHubTagsPerBranch() (github.TagsPerBranch, error) { } func (*defaultImpl) GenerateTOC(markdown string) (string, error) { - return mdtoc.GenerateTOC([]byte(markdown)) + return mdtoc.GenerateTOC([]byte(markdown), mdtoc.Options{ + Dryrun: false, + SkipPrefix: false, + MaxDepth: mdtoc.MaxHeaderDepth, + }) } func (*defaultImpl) DependencyChanges(from, to string) (string, error) {