Update to github.com/russross/blackfriday/v2

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Author: mtrmac

go.mod

@@ -7,7 +7,7 @@ go 1.21
 
 require (
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/russross/blackfriday v1.6.0
+	github.com/russross/blackfriday/v2 v2.1.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
 )
 

go.sum

@@ -2,8 +2,8 @@ github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxK
 github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
-github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw=
 github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=

schema/spec_test.go

@@ -27,7 +27,7 @@ import (
 	"testing"
 
 	"github.com/opencontainers/image-spec/schema"
-	"github.com/russross/blackfriday"
+	"github.com/russross/blackfriday/v2"
 )
 
 var (
@@ -120,9 +120,12 @@ type renderer struct {
 	fn func(text []byte, lang string)
 }
 
-func (r *renderer) BlockCode(out *bytes.Buffer, text []byte, lang string) {
-	r.fn(text, lang)
-	r.Renderer.BlockCode(out, text, lang)
+func (r *renderer) RenderNode(w io.Writer, node *blackfriday.Node, entering bool) blackfriday.WalkStatus {
+	if node.Type == blackfriday.CodeBlock {
+		lang := bytes.TrimRight(node.Info, "\t ")
+		r.fn(node.Literal, string(lang))
+	}
+	return r.Renderer.RenderNode(w, node, entering)
 }
 
 type example struct {
@@ -174,7 +177,7 @@ func extractExamples(rd io.Reader) ([]example, error) {
 
 	var examples []example
 	renderer := &renderer{
-		Renderer: blackfriday.HtmlRenderer(0, "test test", ""),
+		Renderer: blackfriday.NewHTMLRenderer(blackfriday.HTMLRendererParameters{}),
 		fn: func(text []byte, lang string) {
 			examples = append(examples, parseExample(lang, string(text)))
 		},
@@ -184,9 +187,9 @@ func extractExamples(rd io.Reader) ([]example, error) {
 	// the side-effect of calling back for each code block.
 	// TODO(stevvooe): Consider just parsing these with a scanner. It will be
 	// faster and we can retain file, line no.
-	blackfriday.MarkdownOptions(p, renderer, blackfriday.Options{
-		Extensions: blackfriday.EXTENSION_FENCED_CODE,
-	})
+	_ = blackfriday.Run(p,
+		blackfriday.WithRenderer(renderer),
+		blackfriday.WithExtensions(blackfriday.FencedCode))
 
 	return examples, nil
 }