diff --git a/test/tools/go.mod b/test/tools/go.mod index c0625b7078..8b1ca43120 100644 --- a/test/tools/go.mod +++ b/test/tools/go.mod @@ -6,7 +6,7 @@ module github.com/containers/podman/test/tools go 1.22.0 require ( - github.com/cpuguy83/go-md2man/v2 v2.0.6 + github.com/cpuguy83/go-md2man/v2 v2.0.7 github.com/go-swagger/go-swagger v0.30.5 github.com/vbatts/git-validation v1.2.2 ) diff --git a/test/tools/go.sum b/test/tools/go.sum index b6517c5132..3e93454a83 100644 --- a/test/tools/go.sum +++ b/test/tools/go.sum @@ -57,8 +57,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= -github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo= +github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/.golangci.yml b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/.golangci.yml index 71f073f3c6..c1e7d7e61b 100644 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/.golangci.yml +++ b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/.golangci.yml @@ -1,6 +1,20 @@ # For documentation, see https://golangci-lint.run/usage/configuration/ -linters: +version: "2" + +formatters: enable: - gofumpt +linters: + enable: + - errorlint + - nolintlint + - unconvert + - unparam + settings: + staticcheck: + checks: + - all + - -QF1008 # https://staticcheck.dev/docs/checks/#QF1008 Omit embedded fields from selector expression. + diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/README.md b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/README.md index dedc16d0c6..55d89f5068 100644 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/README.md +++ b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/README.md @@ -8,7 +8,16 @@ Uses [blackfriday](https://github.com/russross/blackfriday) to process markdown ### Usage ```bash -go install github.com/cpuguy83/go-md2man@latest +go install github.com/cpuguy83/go-md2man/v2@latest go-md2man -in /path/to/markdownfile.md -out /manfile/output/path ``` + +For go 1.24 and above, you can run it with `go tool`: + +```bash +go get -tool github.com/cpuguy83/go-md2man/v2@latest +# it will be appended to `tool` directive in go.mod file + +go tool go-md2man -in /path/to/markdownfile.md -out /manfile/output/path +``` diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go index 4ff873b8e7..6248294b6a 100644 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go +++ b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man.go @@ -26,7 +26,7 @@ func main() { os.Exit(1) } } - defer inFile.Close() // nolint: errcheck + defer inFile.Close() //nolint:errcheck doc, err := ioutil.ReadAll(inFile) if err != nil { @@ -43,7 +43,7 @@ func main() { fmt.Println(err) os.Exit(1) } - defer outFile.Close() // nolint: errcheck + defer outFile.Close() //nolint:errcheck } _, err = outFile.Write(out) if err != nil { diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go index 62d91b77d5..5673f5c0bc 100644 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go +++ b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go @@ -1,3 +1,4 @@ +// Package md2man aims in converting markdown into roff (man pages). package md2man import ( diff --git a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go index 96a80c99b8..4f1070fc5b 100644 --- a/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go +++ b/test/tools/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go @@ -47,13 +47,13 @@ const ( tableStart = "\n.TS\nallbox;\n" tableEnd = ".TE\n" tableCellStart = "T{\n" - tableCellEnd = "\nT}\n" + tableCellEnd = "\nT}" tablePreprocessor = `'\" t` ) // NewRoffRenderer creates a new blackfriday Renderer for generating roff documents // from markdown -func NewRoffRenderer() *roffRenderer { // nolint: golint +func NewRoffRenderer() *roffRenderer { return &roffRenderer{} } @@ -316,9 +316,8 @@ func (r *roffRenderer) handleTableCell(w io.Writer, node *blackfriday.Node, ente } else if nodeLiteralSize(node) > 30 { end = tableCellEnd } - if node.Next == nil && end != tableCellEnd { - // Last cell: need to carriage return if we are at the end of the - // header row and content isn't wrapped in a "tablecell" + if node.Next == nil { + // Last cell: need to carriage return if we are at the end of the header row. end += crTag } out(w, end) @@ -356,7 +355,7 @@ func countColumns(node *blackfriday.Node) int { } func out(w io.Writer, output string) { - io.WriteString(w, output) // nolint: errcheck + io.WriteString(w, output) //nolint:errcheck } func escapeSpecialChars(w io.Writer, text []byte) { @@ -395,7 +394,7 @@ func escapeSpecialCharsLine(w io.Writer, text []byte) { i++ } if i > org { - w.Write(text[org:i]) // nolint: errcheck + w.Write(text[org:i]) //nolint:errcheck } // escape a character @@ -403,7 +402,7 @@ func escapeSpecialCharsLine(w io.Writer, text []byte) { break } - w.Write([]byte{'\\', text[i]}) // nolint: errcheck + w.Write([]byte{'\\', text[i]}) //nolint:errcheck } } diff --git a/test/tools/vendor/modules.txt b/test/tools/vendor/modules.txt index 7605cf38ea..fcf4d7fe75 100644 --- a/test/tools/vendor/modules.txt +++ b/test/tools/vendor/modules.txt @@ -10,7 +10,7 @@ github.com/Masterminds/sprig/v3 # github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 ## explicit; go 1.13 github.com/asaskevich/govalidator -# github.com/cpuguy83/go-md2man/v2 v2.0.6 +# github.com/cpuguy83/go-md2man/v2 v2.0.7 ## explicit; go 1.12 github.com/cpuguy83/go-md2man/v2 github.com/cpuguy83/go-md2man/v2/md2man