From d789261c9af25d4a3c5fb8dac145525ffdad9e3c Mon Sep 17 00:00:00 2001 From: iyz Date: Fri, 4 Apr 2025 14:17:59 -0400 Subject: [PATCH] feat: use gopencils retrial option, upgrade version --- confluence/api.go | 7 ++----- go.mod | 6 ++++-- go.sum | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/confluence/api.go b/confluence/api.go index 3b1369b..e6fb992 100644 --- a/confluence/api.go +++ b/confluence/api.go @@ -105,7 +105,7 @@ func NewAPI(baseURL string, username string, password string) *API { Password: password, } } - rest := gopencils.Api(baseURL+"/rest/api", auth) + rest := gopencils.Api(baseURL+"/rest/api", auth, 3) // set option for 3 retries on failure if username == "" { if rest.Headers == nil { rest.Headers = http.Header{} @@ -113,10 +113,7 @@ func NewAPI(baseURL string, username string, password string) *API { rest.SetHeader("Authorization", fmt.Sprintf("Bearer %s", password)) } - json := gopencils.Api( - baseURL+"/rpc/json-rpc/confluenceservice-v2", - auth, - ) + json := gopencils.Api(baseURL+"/rpc/json-rpc/confluenceservice-v2", auth, 3) if log.GetLevel() == lorg.LevelTrace { rest.Logger = &tracer{"rest:"} diff --git a/go.mod b/go.mod index 680d1b7..7f063eb 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,13 @@ module github.com/kovetskiy/mark -go 1.23 +go 1.23.0 + +toolchain go1.23.3 require ( github.com/bmatcuk/doublestar/v4 v4.8.1 github.com/dreampuf/mermaid.go v0.0.27 - github.com/kovetskiy/gopencils v0.0.0-20240830111426-6b65e95c9cb0 + github.com/kovetskiy/gopencils v0.0.0-20250404051442-0b776066936a github.com/kovetskiy/lorg v1.2.1-0.20240830111423-ba4fe8b6f7c4 github.com/reconquest/karma-go v1.5.0 github.com/reconquest/pkg v1.3.1-0.20240901105413-68c2adbf2b64 diff --git a/go.sum b/go.sum index cfcbd4d..68c020f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/Shopify/toxiproxy/v2 v2.12.0 h1:d1x++lYZg/zijXPPcv7PH0MvHMzEI5aX/YuUi/Sw+yg= +github.com/Shopify/toxiproxy/v2 v2.12.0/go.mod h1:R9Z38Pw6k2cGZWXHe7tbxjGW9azmY1KbDQJ1kd+h7Tk= github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38= github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/chromedp/cdproto v0.0.0-20250319231242-a755498943c8 h1:AqW2bDQf67Zbq6Tpop/+yJSIknxhiQecO2B8jNYTAPs= @@ -23,8 +25,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs= github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc= -github.com/kovetskiy/gopencils v0.0.0-20240830111426-6b65e95c9cb0 h1:LVc416BwqYl2D6sxv76ElZ4ZAT4+VQk4a80Ki/cNse8= -github.com/kovetskiy/gopencils v0.0.0-20240830111426-6b65e95c9cb0/go.mod h1:dVsBLabGUkYCN1Zh9spGL2GYfAOpG2LPWZf9H0qG66k= +github.com/kovetskiy/gopencils v0.0.0-20250404051442-0b776066936a h1:OPt6gCghZXQ/WZpT6EhGkA7v+YMAYzcCb8SPQWmsb/8= +github.com/kovetskiy/gopencils v0.0.0-20250404051442-0b776066936a/go.mod h1:gRW37oDEg9LzOHApv31YzxKBICcCmPtDogaImsxZ6xc= github.com/kovetskiy/lorg v1.2.1-0.20240830111423-ba4fe8b6f7c4 h1:2eV8tF1u58dqRJMlFUD/Df26BxcIlGVy71rZHN+aNoI= github.com/kovetskiy/lorg v1.2.1-0.20240830111423-ba4fe8b6f7c4/go.mod h1:p1RuSvyflTF/G4ubeATGurCRKWkULOrN/4PUAEFRq0s= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=