diff --git a/Dockerfile b/Dockerfile index 10e6fe00..80b77985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.4 as builder +FROM golang:1.20.5 as builder ENV GOPATH="/go" WORKDIR /go/src/github.com/kovetskiy/mark COPY / . diff --git a/go.mod b/go.mod index 32bafa1d..2fd4948c 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,16 @@ module github.com/kovetskiy/mark go 1.19 require ( - github.com/dreampuf/mermaid.go v0.0.11-0.20230526022300-b9f3c833f943 + github.com/dreampuf/mermaid.go v0.0.11 github.com/kovetskiy/gopencils v0.0.0-20230119081704-a73db75b2f69 github.com/kovetskiy/lorg v1.2.0 github.com/reconquest/karma-go v1.2.0 github.com/reconquest/pkg v1.3.0 github.com/reconquest/regexputil-go v0.0.0-20160905154124-38573e70c1f4 - github.com/stretchr/testify v1.8.3 - github.com/urfave/cli/v2 v2.25.3 + github.com/stretchr/testify v1.8.4 + github.com/urfave/cli/v2 v2.25.5 github.com/yuin/goldmark v1.5.4 - golang.org/x/tools v0.9.1 + golang.org/x/tools v0.9.3 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index e0c8c7fc..c6a317b8 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 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= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dreampuf/mermaid.go v0.0.11-0.20230526022300-b9f3c833f943 h1:9VMWawjkcL1+ItxBKDVcRiJUfAaJNyXD88zfZbyP4Go= -github.com/dreampuf/mermaid.go v0.0.11-0.20230526022300-b9f3c833f943/go.mod h1:u9T+LhbKn5d/jC7KzMhncsG/zOfK/14CRFSPbpaGbeI= +github.com/dreampuf/mermaid.go v0.0.11 h1:XwxrW1TA48qc7Cg1ySvnrMPmap9U2uuvWvc4KuVKVR4= +github.com/dreampuf/mermaid.go v0.0.11/go.mod h1:u9T+LhbKn5d/jC7KzMhncsG/zOfK/14CRFSPbpaGbeI= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= @@ -57,10 +57,10 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/urfave/cli/v2 v2.25.3 h1:VJkt6wvEBOoSjPFQvOkv6iWIrsJyCrKGtCtxXWwmGeY= -github.com/urfave/cli/v2 v2.25.3/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/urfave/cli/v2 v2.25.5 h1:d0NIAyhh5shGscroL7ek/Ya9QYQE0KNabJgiUinIQkc= +github.com/urfave/cli/v2 v2.25.5/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU= @@ -71,8 +71,8 @@ golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/confluence/api.go b/pkg/confluence/api.go index 11723efb..954c43f5 100644 --- a/pkg/confluence/api.go +++ b/pkg/confluence/api.go @@ -17,8 +17,8 @@ import ( ) type User struct { - AccountID string `json:"accountId"` - UserKey string `json:"userKey"` + AccountID string `json:"accountId,omitempty"` + UserKey string `json:"userKey,omitempty"` } type API struct { diff --git a/pkg/mark/mermaid_test.go b/pkg/mark/mermaid_test.go index 96fc9c04..46426779 100644 --- a/pkg/mark/mermaid_test.go +++ b/pkg/mark/mermaid_test.go @@ -15,7 +15,7 @@ func TestExtractMermaidImage(t *testing.T) { wantErr assert.ErrorAssertionFunc }{ {"example", []byte("graph TD;\n A-->B;"), Attachment{ - FileBytes: []byte{0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x84, 0x8, 0x6, 0x0, 0x0, 0x0, 0xe6, 0xd5, 0xb9, 0xc5, 0x0, 0x0, 0x0, 0x1, 0x73, 0x52, 0x47, 0x42, 0x0, 0xae, 0xce, 0x1c, 0xe9, 0x0, 0x0, 0x4, 0xa2, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9b, 0x4d, 0x4c, 0x1c, 0x65, 0x18, 0x80, 0x1f, 0xca, 0x32, 0xec, 0x8a, 0x53, 0x91, 0x2a, 0x42, 0x11, 0xf9, 0x2b, 0xa4, 0xda, 0x74, 0x41, 0x58, 0x31, 0x2d, 0x69, 0xa1, 0x42, 0x25, 0x74, 0xa5, 0x51, 0x91, 0x6a, 0x36, 0x9b, 0x78, 0x20, 0x21, 0x4d, 0x13, 0x1a, 0xd3, 0x3, 0x49, 0x3d, 0x78, 0x32, 0xed, 0xb5, 0x7, 0x4f, 0x1c, 0xe4, 0xd2, 0xa4, 0xbd, 0xf5, 0x0, 0xa6, 0xd2, 0xc5, 0xb6, 0x54, 0xda, 0x1a, 0x7e, 0x12, 0xaa, 0x86, 0x12, 0xa0, 0x2, 0x56, 0xa4, 0x1, 0x57, 0x49, 0xca, 0xcf, 0xa6, 0xbb, 0x32, 0x1e, 0xc, 0x8, 0xa, 0xbb, 0xc8, 0xf7, 0x52, 0xb2, 0xe1, 0x7b, 0x92, 0x4d, 0xe6, 0xe7, 0x9b, 0xf7, 0x7d, 0xf2, 0xce, 0x37, 0xbb, 0x93, 0xd9, 0x79, 0x63, 0x2c, 0xcb, 0xb2, 0x88, 0x2, 0x76, 0x6c, 0xb5, 0xc0, 0x7a, 0xd1, 0xa2, 0xd2, 0x68, 0x51, 0x69, 0xa2, 0x46, 0xd4, 0x16, 0x6e, 0xe7, 0xa3, 0xd1, 0x0, 0x3f, 0xf, 0xcc, 0x3d, 0x15, 0x91, 0x57, 0xf6, 0x3e, 0x43, 0x4a, 0xa6, 0x7d, 0xcd, 0xfd, 0x11, 0x45, 0x1f, 0xfc, 0x30, 0x4b, 0x6a, 0x4e, 0x82, 0xb8, 0xd8, 0x72, 0x26, 0x1e, 0xcc, 0x62, 0x38, 0x76, 0x6c, 0x5c, 0x14, 0x60, 0x57, 0x9a, 0x9d, 0xfd, 0xa5, 0x49, 0xa2, 0x62, 0xff, 0xe6, 0x49, 0xe0, 0xcf, 0x88, 0x63, 0xa2, 0x66, 0x8e, 0x6a, 0x51, 0x69, 0xb4, 0xa8, 0x34, 0x5a, 0x54, 0x9a, 0xed, 0x29, 0x3a, 0x31, 0x31, 0x4e, 0x65, 0xa5, 0x8b, 0xda, 0xda, 0x72, 0x82, 0xc1, 0xa0, 0x64, 0x68, 0x59, 0x51, 0x9f, 0xaf, 0x85, 0xf4, 0xf4, 0x4c, 0xe6, 0xe6, 0x66, 0xe9, 0xea, 0xea, 0x94, 0xc, 0x2d, 0x27, 0x6a, 0x59, 0x16, 0x3e, 0x5f, 0x2b, 0xe5, 0xe5, 0xc7, 0x28, 0x2c, 0x7c, 0x13, 0x9f, 0xaf, 0x55, 0x2a, 0x34, 0x20, 0x28, 0xda, 0xd7, 0xd7, 0xcd, 0xe4, 0xe4, 0x23, 0xca, 0xca, 0x2a, 0xa9, 0xa8, 0x78, 0x87, 0xee, 0xee, 0xdb, 0x4c, 0x4f, 0xff, 0x21, 0x15, 0x5e, 0x4e, 0xf4, 0xda, 0xb5, 0x16, 0x9c, 0xce, 0x42, 0x52, 0x53, 0xd3, 0x38, 0x70, 0xa0, 0x14, 0xbb, 0xdd, 0xc1, 0xcd, 0x9b, 0x6d, 0x52, 0xe1, 0x65, 0x44, 0x67, 0x67, 0x67, 0xb8, 0x73, 0xe7, 0x6, 0x47, 0x8f, 0x56, 0x3, 0x60, 0x18, 0x6, 0xa5, 0xa5, 0x6f, 0xd3, 0xde, 0x2e, 0x77, 0xfa, 0x45, 0x44, 0x3b, 0x3a, 0x7c, 0x0, 0x1c, 0x3c, 0x58, 0x46, 0x28, 0x14, 0x22, 0x14, 0xa, 0x51, 0x5e, 0x7e, 0x8c, 0xa1, 0xa1, 0x1, 0x46, 0x46, 0x86, 0x25, 0x52, 0x44, 0xbe, 0x1f, 0x5d, 0xf, 0x3e, 0x5f, 0xb, 0x81, 0x40, 0x80, 0x9a, 0x9a, 0x23, 0xab, 0xec, 0x6b, 0xa5, 0xbe, 0xfe, 0x13, 0xe5, 0x1c, 0xca, 0xa2, 0xf, 0x1f, 0x8e, 0xd1, 0xdf, 0xff, 0x3d, 0x67, 0xce, 0x7c, 0x46, 0x56, 0xd6, 0x9e, 0x15, 0xfb, 0xae, 0x5f, 0xbf, 0xca, 0x8d, 0x1b, 0x57, 0xa9, 0xab, 0x6b, 0x20, 0x36, 0x36, 0x56, 0x29, 0x8f, 0xb2, 0xa8, 0xcf, 0xd7, 0x42, 0x62, 0xe2, 0xf3, 0x54, 0x54, 0xb8, 0xff, 0x23, 0xe3, 0x70, 0x24, 0x70, 0xe5, 0xca, 0x25, 0x7a, 0x7b, 0xbf, 0xa3, 0xb8, 0xb8, 0x44, 0x29, 0x8f, 0xd2, 0x1c, 0xb5, 0x2c, 0x8b, 0xf6, 0xf6, 0xaf, 0x28, 0x29, 0x79, 0x6b, 0xd5, 0x8a, 0xa5, 0xa7, 0x67, 0x90, 0x9d, 0x9d, 0x2b, 0x72, 0x51, 0x29, 0x89, 0xfa, 0xfd, 0x53, 0xf8, 0xfd, 0x53, 0x1c, 0x3e, 0x5c, 0xb1, 0xe6, 0x98, 0x43, 0x87, 0x2a, 0xb8, 0x7b, 0xb7, 0x83, 0xf9, 0xf9, 0x79, 0x95, 0x54, 0xc4, 0x84, 0x7b, 0x9a, 0xd7, 0x77, 0x73, 0x9a, 0xc9, 0x5f, 0x83, 0x14, 0x55, 0xbe, 0xa8, 0x94, 0x24, 0x12, 0xbd, 0x6d, 0x53, 0x24, 0xa7, 0xc5, 0x51, 0x50, 0x9a, 0xb8, 0xe6, 0x98, 0xed, 0x79, 0xf7, 0xb4, 0x99, 0x68, 0x51, 0x69, 0xb4, 0xa8, 0x34, 0x5a, 0x54, 0x9a, 0xa8, 0x11, 0x8d, 0x78, 0x53, 0xe2, 0x1f, 0xf, 0xf0, 0xe3, 0xb7, 0xbf, 0x6f, 0xaa, 0x84, 0x7f, 0x3c, 0x40, 0x72, 0x5a, 0x5c, 0xd8, 0x31, 0x61, 0x45, 0x53, 0x32, 0xed, 0x3c, 0x9, 0x2c, 0xfc, 0xaf, 0xa4, 0x4d, 0x4d, 0x4d, 0x0, 0xd4, 0xd7, 0xd7, 0xaf, 0xfb, 0x98, 0x9c, 0xfd, 0x9, 0xa4, 0x64, 0xac, 0xfd, 0x10, 0x17, 0x22, 0xfc, 0xd6, 0x6f, 0x4, 0x97, 0xcb, 0x5, 0x40, 0x4f, 0x4f, 0x8f, 0x64, 0xd8, 0xe8, 0x99, 0xa3, 0x5a, 0x54, 0x1a, 0x2d, 0x2a, 0x8d, 0x16, 0x95, 0x46, 0x8b, 0x4a, 0xa3, 0x45, 0xa5, 0xd1, 0xa2, 0xd2, 0x68, 0x51, 0x69, 0xb4, 0xa8, 0x34, 0x5a, 0x54, 0x1a, 0x2d, 0x2a, 0x8d, 0x16, 0x95, 0x46, 0x8b, 0x4a, 0xa3, 0x45, 0xa5, 0xd1, 0xa2, 0xd2, 0x68, 0x51, 0x69, 0xb4, 0xa8, 0x34, 0x5a, 0x54, 0x9a, 0xa8, 0x11, 0x55, 0xfa, 0xb3, 0xc1, 0xe5, 0x72, 0xb1, 0xde, 0xc3, 0x63, 0x62, 0x62, 0x94, 0xfe, 0x80, 0x50, 0xaa, 0xa8, 0xc3, 0xe1, 0x58, 0x92, 0x8, 0xf7, 0x59, 0x3e, 0x76, 0x4b, 0x44, 0xbd, 0x5e, 0x2f, 0xf1, 0xf1, 0xf1, 0x11, 0xc7, 0x19, 0x86, 0x81, 0xd7, 0xeb, 0x55, 0x49, 0xa5, 0x26, 0xea, 0xf1, 0x78, 0x88, 0x8d, 0x8d, 0xd, 0x7b, 0xfa, 0x2d, 0xcb, 0xc2, 0x66, 0xb3, 0xe1, 0xf1, 0x78, 0x54, 0x52, 0xa9, 0x89, 0x9a, 0xa6, 0x19, 0xb1, 0xaa, 0x8b, 0xd5, 0x34, 0x4d, 0x53, 0x25, 0x95, 0xfa, 0x55, 0x1f, 0xae, 0xaa, 0x52, 0xd5, 0x4, 0x1, 0xd1, 0x70, 0x55, 0x95, 0xaa, 0x26, 0x8, 0x7d, 0x8f, 0xae, 0x56, 0x55, 0xc9, 0x6a, 0x82, 0x90, 0xe8, 0x62, 0x55, 0xd, 0xc3, 0x58, 0xda, 0x66, 0x18, 0x6, 0x8d, 0x8d, 0x8d, 0x22, 0xd5, 0x4, 0xc1, 0x5f, 0x26, 0x8f, 0xc7, 0x83, 0x69, 0x9a, 0x58, 0x96, 0x85, 0x65, 0x59, 0x98, 0xa6, 0x49, 0x75, 0x75, 0xb5, 0x54, 0x78, 0x39, 0x51, 0xd3, 0x34, 0x69, 0x68, 0x68, 0x58, 0x5a, 0x5f, 0xbe, 0x2c, 0x81, 0x68, 0x2b, 0xdb, 0x4b, 0x71, 0x25, 0xbc, 0x9e, 0x51, 0xbb, 0xb4, 0xdc, 0xf5, 0xf5, 0xfa, 0xdf, 0x9c, 0x88, 0xd4, 0xca, 0x16, 0xf1, 0x25, 0xc2, 0xfb, 0xdd, 0x8f, 0x9f, 0x4a, 0x2b, 0xdb, 0xab, 0xc5, 0x66, 0xd8, 0x97, 0x8, 0x75, 0x2b, 0x9b, 0x34, 0x5a, 0x54, 0x1a, 0x2d, 0x2a, 0x8d, 0x16, 0x95, 0x26, 0x6a, 0x44, 0x95, 0x3b, 0x1b, 0x46, 0x46, 0x86, 0x39, 0x79, 0xf2, 0xa3, 0x15, 0xdb, 0x12, 0x12, 0x9e, 0x65, 0xf7, 0xee, 0x97, 0x71, 0xbb, 0x3f, 0xa0, 0xaa, 0xea, 0x5d, 0xd5, 0x14, 0x80, 0x50, 0x53, 0xb, 0x80, 0xd7, 0x5b, 0x8f, 0xd3, 0x59, 0x8, 0xc0, 0xcc, 0xcc, 0x63, 0x6e, 0xdd, 0xf2, 0x71, 0xe1, 0xc2, 0xe7, 0x2c, 0x2c, 0x2c, 0xe0, 0x76, 0xbf, 0xaf, 0x1c, 0x5f, 0x4c, 0x34, 0x23, 0x23, 0x9b, 0xfc, 0x7c, 0xd7, 0xd2, 0x7a, 0x49, 0xc9, 0x11, 0x6, 0x7, 0xfb, 0xe9, 0xec, 0xfc, 0x46, 0x44, 0x74, 0x53, 0xe7, 0x68, 0x5c, 0x9c, 0xc1, 0xce, 0x9d, 0xcf, 0x89, 0xc4, 0x12, 0x6d, 0xe, 0x5c, 0x6c, 0xba, 0xf2, 0xfb, 0x7f, 0xe3, 0xd2, 0xa5, 0x2f, 0x99, 0x98, 0xf8, 0x85, 0xe3, 0xc7, 0x3f, 0x14, 0x89, 0x2f, 0x76, 0xea, 0xcf, 0x9d, 0x3b, 0xbb, 0x62, 0xdd, 0x6e, 0xb7, 0x73, 0xea, 0x54, 0x23, 0xfb, 0xf6, 0xe5, 0x8b, 0xc4, 0x17, 0x13, 0xad, 0xab, 0x6b, 0xa0, 0xa0, 0xe0, 0xd, 0x0, 0x2, 0x81, 0x0, 0xc3, 0xc3, 0x3, 0x34, 0x37, 0x7f, 0xc1, 0xd0, 0xd0, 0x7d, 0x4e, 0x9f, 0x3e, 0x1b, 0xe1, 0xe8, 0xc8, 0x88, 0x89, 0xa6, 0xa4, 0xa4, 0x91, 0x97, 0xf7, 0xda, 0xd2, 0xba, 0xd3, 0x59, 0x48, 0x52, 0xd2, 0xb, 0x9c, 0x3f, 0xff, 0x29, 0x55, 0x55, 0xef, 0x91, 0x9b, 0xbb, 0x57, 0x29, 0xfe, 0xa6, 0x5e, 0x4c, 0x39, 0x39, 0x79, 0x0, 0x8c, 0x8e, 0xaa, 0x37, 0x8, 0x6e, 0xaa, 0xe8, 0xe0, 0x60, 0x3f, 0x0, 0xbb, 0x76, 0xa9, 0xf7, 0x43, 0x89, 0x9d, 0xfa, 0xb1, 0xb1, 0x9f, 0xb8, 0x77, 0xef, 0xef, 0xe7, 0x9f, 0xc1, 0x60, 0x90, 0x91, 0x91, 0x21, 0x2e, 0x5f, 0x6e, 0xc6, 0xe9, 0x2c, 0xc2, 0xe9, 0x2c, 0x52, 0x8e, 0x2f, 0x26, 0x7a, 0xf1, 0x62, 0xd3, 0x3f, 0x41, 0x6d, 0x36, 0x92, 0x93, 0x53, 0x70, 0xbb, 0x6b, 0x38, 0x71, 0xe2, 0x63, 0x6c, 0x36, 0xf5, 0x34, 0xca, 0x11, 0xb2, 0xb2, 0xf6, 0xd0, 0xd6, 0x26, 0xfb, 0x2a, 0xfb, 0x6a, 0x44, 0xcd, 0xdd, 0x93, 0x16, 0x95, 0x46, 0x8b, 0x4a, 0xa3, 0x45, 0xa5, 0xd1, 0xa2, 0xd2, 0x6c, 0xdf, 0x56, 0xb6, 0x8d, 0xb0, 0x25, 0xad, 0x6c, 0x9b, 0x45, 0xd4, 0xcc, 0x51, 0x2d, 0x2a, 0x8d, 0x16, 0x95, 0x26, 0x6a, 0x44, 0xff, 0x2, 0x9, 0xc4, 0x6c, 0x6a, 0x19, 0x3e, 0xc, 0xa, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82}, + FileBytes: []byte{0x89, 0x50, 0x4e, 0x47, 0xd, 0xa, 0x1a, 0xa, 0x0, 0x0, 0x0, 0xd, 0x49, 0x48, 0x44, 0x52, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x84, 0x8, 0x6, 0x0, 0x0, 0x0, 0xe6, 0xd5, 0xb9, 0xc5, 0x0, 0x0, 0x0, 0x1, 0x73, 0x52, 0x47, 0x42, 0x0, 0xae, 0xce, 0x1c, 0xe9, 0x0, 0x0, 0x4, 0xf8, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9b, 0x4d, 0x4c, 0x54, 0x57, 0x14, 0x80, 0xbf, 0xd1, 0xf9, 0x79, 0x6f, 0x28, 0x48, 0xb1, 0x25, 0x28, 0x45, 0x4, 0x94, 0xd8, 0x1a, 0x47, 0x82, 0xd4, 0x46, 0x89, 0xa2, 0x1d, 0x28, 0xc1, 0x29, 0xc6, 0xd6, 0x6a, 0x59, 0xa8, 0x13, 0x33, 0x66, 0x24, 0x46, 0x4d, 0xe3, 0xa2, 0x89, 0x5d, 0x74, 0xd5, 0xe8, 0xd6, 0x45, 0x57, 0x2c, 0xea, 0xc6, 0x44, 0x77, 0x2e, 0xb0, 0x58, 0x1c, 0xea, 0x5f, 0xa9, 0x36, 0xa2, 0x89, 0xb6, 0xd, 0x1a, 0xc0, 0x8e, 0xd6, 0x5a, 0x8c, 0x76, 0x5a, 0xa3, 0x22, 0xa3, 0x33, 0xe5, 0x76, 0xd1, 0x48, 0x8b, 0x85, 0x19, 0xca, 0x3d, 0x68, 0x26, 0xde, 0x2f, 0x99, 0xc5, 0xe3, 0xbe, 0x39, 0xe7, 0xcb, 0xbd, 0xf7, 0xcd, 0xbb, 0xbc, 0x77, 0x8f, 0x43, 0x29, 0xa5, 0xc8, 0x0, 0xa6, 0x3c, 0x6f, 0x81, 0xf1, 0x62, 0x44, 0xa5, 0x31, 0xa2, 0xd2, 0x64, 0x8c, 0xa8, 0x33, 0x55, 0xe3, 0xad, 0x6b, 0x71, 0x7e, 0xbe, 0xf2, 0xf0, 0x99, 0x88, 0xcc, 0x9a, 0xe7, 0xa5, 0x60, 0xb6, 0x35, 0x66, 0x7b, 0x5a, 0xd1, 0xab, 0x3f, 0xc, 0x30, 0xa3, 0x2c, 0x4b, 0x5c, 0xec, 0xdf, 0xf4, 0x5f, 0x1d, 0xc0, 0x6d, 0x4f, 0x99, 0xb8, 0x28, 0xc0, 0xf4, 0x42, 0x8b, 0x5, 0x35, 0x79, 0xa2, 0x62, 0x4f, 0xf3, 0x38, 0xfe, 0x67, 0xda, 0x73, 0x32, 0x66, 0x8e, 0x1a, 0x51, 0x69, 0x8c, 0xa8, 0x34, 0x46, 0x54, 0x9a, 0x17, 0x53, 0xb4, 0xbf, 0xff, 0x26, 0xf5, 0xf5, 0x55, 0xac, 0x5b, 0xe7, 0x27, 0x91, 0x48, 0x48, 0x86, 0x96, 0x15, 0x8d, 0x44, 0x5a, 0x29, 0x2a, 0x9a, 0xcd, 0xc3, 0x87, 0x3, 0x9c, 0x3b, 0xd7, 0x29, 0x19, 0x5a, 0x4e, 0x54, 0x29, 0x45, 0x24, 0x72, 0x4, 0xbf, 0x7f, 0x15, 0x95, 0x95, 0x6f, 0x11, 0x89, 0x1c, 0x91, 0xa, 0xd, 0x8, 0x8a, 0x5e, 0xbc, 0xd8, 0xc5, 0xed, 0xdb, 0xb7, 0x58, 0xb1, 0xa2, 0x9e, 0xda, 0xda, 0x77, 0xe9, 0xea, 0xfa, 0x96, 0xbb, 0x77, 0xff, 0x90, 0xa, 0x2f, 0x27, 0x7a, 0xec, 0x58, 0x2b, 0x3e, 0x5f, 0x25, 0x33, 0x66, 0x14, 0xb2, 0x64, 0x49, 0xd, 0x96, 0x65, 0x73, 0xf2, 0x64, 0xbb, 0x54, 0x78, 0x19, 0xd1, 0x81, 0x81, 0x7, 0x9c, 0x39, 0x73, 0x82, 0xba, 0xba, 0x46, 0x0, 0xdc, 0x6e, 0x37, 0x35, 0x35, 0xef, 0xd0, 0xd1, 0x21, 0x37, 0xfc, 0x22, 0xa2, 0xa7, 0x4e, 0x45, 0x0, 0x58, 0xba, 0x74, 0x5, 0xc9, 0x64, 0x92, 0x64, 0x32, 0x89, 0xdf, 0xbf, 0x8a, 0xde, 0xde, 0x2b, 0x44, 0xa3, 0x7d, 0x12, 0x29, 0xd2, 0xaf, 0x47, 0xc7, 0x43, 0x24, 0xd2, 0x4a, 0x3c, 0x1e, 0x67, 0xed, 0xda, 0x95, 0xa3, 0xb4, 0x1d, 0x21, 0x1c, 0xfe, 0x48, 0x3b, 0x87, 0xb6, 0xe8, 0x8d, 0x1b, 0xd7, 0xe9, 0xee, 0xfe, 0x9e, 0x5d, 0xbb, 0x3e, 0xa5, 0xa4, 0x64, 0xce, 0x88, 0xb6, 0xe3, 0xc7, 0x8f, 0x72, 0xe2, 0xc4, 0x51, 0x42, 0xa1, 0x1d, 0x4c, 0x9d, 0x3a, 0x55, 0x2b, 0x8f, 0xb6, 0x68, 0x24, 0xd2, 0x4a, 0x6e, 0xee, 0xcb, 0xd4, 0xd6, 0x6, 0xfe, 0x23, 0x63, 0xdb, 0x59, 0x1c, 0x3e, 0x7c, 0x90, 0xb, 0x17, 0xbe, 0x63, 0xf1, 0xe2, 0x6a, 0xad, 0x3c, 0x5a, 0x73, 0x54, 0x29, 0x45, 0x47, 0xc7, 0x97, 0x54, 0x57, 0xbf, 0x3d, 0x6a, 0x8f, 0x15, 0x15, 0x15, 0x53, 0x5a, 0x3a, 0x57, 0xe4, 0xa2, 0xd2, 0x12, 0x8d, 0xc5, 0xee, 0x10, 0x8b, 0xdd, 0x61, 0xf9, 0xf2, 0xda, 0x31, 0xcf, 0x59, 0xb6, 0xac, 0x96, 0xb3, 0x67, 0x4f, 0x31, 0x38, 0x38, 0xa8, 0x93, 0xa, 0x47, 0xaa, 0xa7, 0x79, 0x17, 0x4f, 0xde, 0xe5, 0xf6, 0xaf, 0x9, 0x16, 0xd5, 0xbf, 0xaa, 0x95, 0x24, 0x1d, 0x17, 0xda, 0xef, 0x90, 0x5f, 0xe8, 0xa2, 0xa2, 0x26, 0x77, 0xcc, 0x73, 0x5e, 0xcc, 0xd5, 0xd3, 0x64, 0x62, 0x44, 0xa5, 0x31, 0xa2, 0xd2, 0x18, 0x51, 0x69, 0x32, 0x46, 0x34, 0xed, 0xa2, 0x24, 0x76, 0x33, 0xce, 0x8f, 0xdf, 0xfc, 0x3e, 0xa9, 0x12, 0xb1, 0x9b, 0x71, 0xf2, 0xb, 0x5d, 0x29, 0xcf, 0x49, 0x29, 0x5a, 0x30, 0xdb, 0xe2, 0x71, 0x7c, 0xe8, 0x7f, 0x25, 0x6d, 0x69, 0x69, 0x1, 0x20, 0x1c, 0xe, 0x8f, 0xfb, 0x3b, 0x65, 0xb, 0xb2, 0x28, 0x28, 0x1e, 0xfb, 0x21, 0x2e, 0xa4, 0xb9, 0xd7, 0x4f, 0x84, 0xaa, 0xaa, 0x2a, 0x0, 0xce, 0x9f, 0x3f, 0x2f, 0x19, 0x36, 0x73, 0xe6, 0xa8, 0x11, 0x95, 0xc6, 0x88, 0x4a, 0x63, 0x44, 0xa5, 0x31, 0xa2, 0xd2, 0x18, 0x51, 0x69, 0x8c, 0xa8, 0x34, 0x46, 0x54, 0x1a, 0x23, 0x2a, 0x8d, 0x11, 0x95, 0xc6, 0x88, 0x4a, 0x63, 0x44, 0xa5, 0x31, 0xa2, 0xd2, 0x18, 0x51, 0x69, 0x8c, 0xa8, 0x34, 0x46, 0x54, 0x1a, 0x23, 0x2a, 0x8d, 0x11, 0x95, 0x26, 0x63, 0x44, 0xb5, 0x5e, 0x36, 0x3c, 0x79, 0xb1, 0x30, 0x9e, 0x10, 0xe, 0x87, 0x43, 0xeb, 0x5, 0x84, 0x56, 0x8f, 0x66, 0x67, 0x67, 0xa3, 0x94, 0xc2, 0xe1, 0x70, 0xa4, 0xfc, 0x0, 0x78, 0xbd, 0x5e, 0x9d, 0x54, 0x7a, 0xa2, 0x9b, 0x37, 0x6f, 0xc6, 0xed, 0x76, 0xa7, 0xec, 0x51, 0xa5, 0x14, 0x96, 0x65, 0xb1, 0x71, 0xe3, 0x46, 0x9d, 0x54, 0x7a, 0x43, 0x3f, 0x38, 0x38, 0x88, 0xdf, 0xef, 0xe7, 0xd1, 0xa3, 0x47, 0xc3, 0x3d, 0xf7, 0x34, 0x4a, 0x29, 0x72, 0x72, 0x72, 0x68, 0x6b, 0x6b, 0xc3, 0xb6, 0xed, 0x9, 0x8b, 0x6a, 0xf5, 0xa8, 0x6d, 0xdb, 0x6c, 0xda, 0xb4, 0x9, 0xcb, 0xb2, 0x46, 0xed, 0x55, 0xa5, 0x14, 0x2e, 0x97, 0x8b, 0xad, 0x5b, 0xb7, 0x6a, 0x49, 0x82, 0xc0, 0x55, 0x1f, 0xc, 0x6, 0x71, 0xbb, 0xdd, 0x63, 0xb6, 0x3b, 0x9d, 0x4e, 0xd6, 0xac, 0x59, 0xa3, 0x9b, 0x46, 0x5f, 0xd4, 0xb6, 0x6d, 0x9a, 0x9b, 0x9b, 0x47, 0x9d, 0xab, 0x1e, 0x8f, 0x87, 0x50, 0x28, 0x84, 0x65, 0xa5, 0x7e, 0xcf, 0x39, 0x1e, 0x44, 0xde, 0x85, 0x26, 0x93, 0x49, 0xea, 0xea, 0xea, 0xb8, 0x77, 0xef, 0xde, 0xf0, 0x5c, 0x55, 0x4a, 0x91, 0x9b, 0x9b, 0x4b, 0x5b, 0x5b, 0x1b, 0x1e, 0x8f, 0x47, 0x5b, 0x54, 0xe4, 0x7, 0xdf, 0xe9, 0x74, 0x12, 0xc, 0x6, 0xf1, 0x78, 0x3c, 0x28, 0xa5, 0x86, 0xe7, 0xe6, 0xf6, 0xed, 0xdb, 0x45, 0x24, 0x41, 0xf0, 0xce, 0xd4, 0xd4, 0xd4, 0x34, 0xe2, 0x82, 0xf1, 0x7a, 0xbd, 0x34, 0x36, 0x36, 0x4a, 0x85, 0x97, 0x13, 0xb5, 0x2c, 0x8b, 0x70, 0x38, 0x3c, 0x3c, 0xf4, 0x5b, 0xb6, 0x6c, 0xc1, 0xe9, 0x14, 0xd9, 0x9e, 0xa, 0x8, 0x97, 0xb2, 0x15, 0x65, 0xad, 0xa4, 0x62, 0x56, 0x14, 0x80, 0x92, 0x69, 0x75, 0x9c, 0xfb, 0x6a, 0xfc, 0x3b, 0x27, 0xd2, 0x95, 0xb2, 0xa5, 0xdd, 0x44, 0x78, 0xb9, 0xeb, 0xfe, 0x33, 0x29, 0x65, 0x7b, 0x7d, 0x71, 0x76, 0xca, 0x4d, 0x84, 0xa6, 0x94, 0x4d, 0x1a, 0x23, 0x2a, 0x8d, 0x11, 0x95, 0xc6, 0x88, 0x4a, 0x93, 0x31, 0xa2, 0xda, 0x37, 0xe3, 0x68, 0xb4, 0x8f, 0xe6, 0xe6, 0xa6, 0x11, 0x7f, 0xcb, 0xca, 0x7a, 0x89, 0x99, 0x33, 0x5f, 0x23, 0x10, 0xf8, 0x80, 0x86, 0x6, 0xfd, 0x45, 0x33, 0x8, 0x15, 0xb5, 0x0, 0x6c, 0xd8, 0x10, 0xc6, 0xe7, 0xab, 0x4, 0xe0, 0xc1, 0x83, 0xfb, 0x9c, 0x3e, 0x1d, 0x61, 0xdf, 0xbe, 0xcf, 0x18, 0x1a, 0x1a, 0x22, 0x10, 0x78, 0x5f, 0x3b, 0xbe, 0x98, 0x68, 0x71, 0x71, 0x29, 0xb, 0x17, 0x56, 0xd, 0x1f, 0x57, 0x57, 0xaf, 0xa4, 0xa7, 0xa7, 0x9b, 0xce, 0xce, 0xaf, 0x45, 0x44, 0x27, 0x75, 0x8e, 0xba, 0x5c, 0x6e, 0x72, 0x72, 0xa6, 0x89, 0xc4, 0x12, 0x2d, 0xe, 0x7c, 0x52, 0x74, 0x15, 0x8b, 0xfd, 0xc6, 0xc1, 0x83, 0x5f, 0xd0, 0xdf, 0xff, 0xb, 0xab, 0x57, 0x7f, 0x28, 0x12, 0x5f, 0x6c, 0xe8, 0xf7, 0xec, 0xd9, 0x3d, 0xe2, 0xd8, 0xb2, 0x2c, 0xb6, 0x6d, 0xfb, 0x98, 0xf9, 0xf3, 0x17, 0x8a, 0xc4, 0x17, 0x13, 0xd, 0x85, 0x76, 0x50, 0x51, 0xf1, 0x26, 0x0, 0xf1, 0x78, 0x9c, 0xbe, 0xbe, 0x2b, 0xec, 0xdf, 0xff, 0x39, 0xbd, 0xbd, 0x97, 0xd9, 0xb9, 0x73, 0x77, 0x9a, 0x6f, 0xa7, 0x47, 0x4c, 0xb4, 0xa0, 0xa0, 0x90, 0xf2, 0xf2, 0x37, 0x86, 0x8f, 0x7d, 0xbe, 0x4a, 0xf2, 0xf2, 0x5e, 0x61, 0xef, 0xde, 0x4f, 0x68, 0x68, 0x78, 0x8f, 0xb9, 0x73, 0xe7, 0x69, 0xc5, 0x9f, 0xd4, 0x8b, 0xa9, 0xac, 0xac, 0x1c, 0x80, 0x6b, 0xd7, 0xf4, 0xb, 0x4, 0x27, 0x55, 0xb4, 0xa7, 0xa7, 0x1b, 0x80, 0xe9, 0xd3, 0xf5, 0xeb, 0xa1, 0xc4, 0x86, 0xfe, 0xfa, 0xf5, 0x9f, 0xb8, 0x74, 0xe9, 0xef, 0xe7, 0x9f, 0x89, 0x44, 0x82, 0x68, 0xb4, 0x97, 0x43, 0x87, 0xf6, 0xe3, 0xf3, 0x2d, 0xc2, 0xe7, 0x5b, 0xa4, 0x1d, 0x5f, 0x4c, 0xf4, 0xc0, 0x81, 0x96, 0x7f, 0x82, 0x3a, 0x9d, 0xe4, 0xe7, 0x17, 0x10, 0x8, 0xac, 0x65, 0xfd, 0xfa, 0xa0, 0xc8, 0xbf, 0xcd, 0xda, 0x11, 0x4a, 0x4a, 0xe6, 0xd0, 0xde, 0x2e, 0xbb, 0x95, 0x7d, 0x34, 0x32, 0x66, 0xf5, 0x64, 0x44, 0xa5, 0x31, 0xa2, 0xd2, 0x18, 0x51, 0x69, 0x8c, 0xa8, 0x34, 0x2f, 0x6e, 0x29, 0xdb, 0x44, 0x78, 0x2e, 0xa5, 0x6c, 0x93, 0x45, 0xc6, 0xcc, 0x51, 0x23, 0x2a, 0x8d, 0x11, 0x95, 0x26, 0x63, 0x44, 0xff, 0x2, 0xf5, 0x72, 0x88, 0x74, 0x30, 0x1a, 0x12, 0x6f, 0x0, 0x0, 0x0, 0x0, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82}, Filename: "example.png", Name: "example", Replace: "example", diff --git a/pkg/mark/stdlib/stdlib.go b/pkg/mark/stdlib/stdlib.go index 4abbaf9c..da90f683 100644 --- a/pkg/mark/stdlib/stdlib.go +++ b/pkg/mark/stdlib/stdlib.go @@ -136,7 +136,7 @@ func templates(api *confluence.API) (*template.Template, error) { `ac:link:user`: text( `{{ with .Name | user }}`, /**/ ``, - /**/ `{{ with .AccountID }}`, + /**/ `{{ if .AccountID }}`, /****/ ``, /**/ `{{ else }}`, /****/ ``, @@ -338,7 +338,7 @@ func templates(api *confluence.API) (*template.Template, error) { `{{ with .Name | user }}`, ``, ``, - `{{ with .AccountID }}`, + `{{ if .AccountID }}`, /**/ ``, `{{ else }}`, /**/ ``,