From ebd1a1f554ea52e99172ee091830561556b56d37 Mon Sep 17 00:00:00 2001 From: John Wang Date: Sun, 10 Dec 2023 11:47:07 -0800 Subject: [PATCH] dep: go mod: update --- go.mod | 14 +++++------ go.sum | 36 +++++++++++++-------------- ringcentral/ringcentral_clientutil.go | 2 +- salesforce/salesforce_clientutil.go | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 7422757..181f9d6 100644 --- a/go.mod +++ b/go.mod @@ -9,15 +9,15 @@ require ( github.com/caarlos0/env/v9 v9.0.0 github.com/golang-jwt/jwt/v5 v5.2.0 github.com/google/go-querystring v1.1.0 - github.com/grokify/go-salesforce v0.2.23 - github.com/grokify/gocharts/v2 v2.15.2 - github.com/grokify/mogo v0.61.1 - github.com/grokify/xgo v0.6.0 + github.com/grokify/go-salesforce v0.2.24 + github.com/grokify/gocharts/v2 v2.16.0 + github.com/grokify/mogo v0.62.2 + github.com/grokify/xgo v0.7.0 github.com/jessevdk/go-flags v1.5.0 github.com/joho/godotenv v1.5.1 github.com/rs/zerolog v1.31.0 golang.org/x/oauth2 v0.15.0 - google.golang.org/api v0.151.0 + google.golang.org/api v0.153.0 gopkg.in/jeevatkm/go-model.v1 v1.1.0 ) @@ -52,12 +52,12 @@ require ( github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect + golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/go.sum b/go.sum index 39178fc..690526f 100644 --- a/go.sum +++ b/go.sum @@ -79,14 +79,14 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= -github.com/grokify/go-salesforce v0.2.23 h1:rEbcLN08AyeGlpVe5C4icEGEUR/6twTp/CMaigZO1xM= -github.com/grokify/go-salesforce v0.2.23/go.mod h1:k66Eoc/cjkLcKheQrbl4IFac92H8DO+4KaWL/iiydTQ= -github.com/grokify/gocharts/v2 v2.15.2 h1:L8Aw0+pMgqxM6RnZbl01bocxoGPqshVu5rjaAqTNYD8= -github.com/grokify/gocharts/v2 v2.15.2/go.mod h1:MZyA5pw1DEA4AaOAVEJUQ7ubFS3MsscBS3fX4wY209o= -github.com/grokify/mogo v0.61.1 h1:ogMXW0klt0532MfwU+BVjhY9UleqeIRtsALsg/eHF08= -github.com/grokify/mogo v0.61.1/go.mod h1:FzB9mZ9cUS52BHpvFFChvE7kPuntf4bjOKNH7/WfNjk= -github.com/grokify/xgo v0.6.0 h1:RLxNSomdDItiNSMiCjW++XKJtDL0wEaG+wPePknMyRA= -github.com/grokify/xgo v0.6.0/go.mod h1:01SAHwsal0COE2mzqMbgEhcpb2Fd7lk2NraFNXdEnBg= +github.com/grokify/go-salesforce v0.2.24 h1:9aM8ffP5K9/0nl5sPJlAe4FCjjBAaia+6sYTBWJLaLU= +github.com/grokify/go-salesforce v0.2.24/go.mod h1:KxirGqztQhstWHy2/Qv3k4W53M1WnHNlihGFKE9Z0+g= +github.com/grokify/gocharts/v2 v2.16.0 h1:dYbf/ZHBGVfmodUG+w1inj0LSiNwKOkVvSDGDEu6WOE= +github.com/grokify/gocharts/v2 v2.16.0/go.mod h1:3bQj6rFR/HMbe0LExBEUwDQsesJW66q4yAWSALHY75g= +github.com/grokify/mogo v0.62.2 h1:Q2SNBqIw3TKdGv4qWR031Ad7ap5UAHC56j7gvwTE3w0= +github.com/grokify/mogo v0.62.2/go.mod h1:IAvFJFUj303UHU0Y6XduAelcTTDYxvrZG25ycuABDSc= +github.com/grokify/xgo v0.7.0 h1:MIoNikeuEJvaIDCnFG4BrnRE61Wgw+H/hhzfgaUlygM= +github.com/grokify/xgo v0.7.0/go.mod h1:13jdZLcsz1RYXc9cjkAzzbwHpeSfNle3EUNTqioi+xQ= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= @@ -174,8 +174,8 @@ golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98y golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= +golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= @@ -255,8 +255,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.151.0 h1:FhfXLO/NFdJIzQtCqjpysWwqKk8AzGWBUhMIx67cVDU= -google.golang.org/api v0.151.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= +google.golang.org/api v0.153.0 h1:N1AwGhielyKFaUqH07/ZSIQR3uNPcV7NVw0vj+j4iR4= +google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= @@ -264,12 +264,12 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= -google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= -google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= -google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 h1:W12Pwm4urIbRdGhMEg2NM9O3TWKjNcxQhs46V0ypf/k= +google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/ringcentral/ringcentral_clientutil.go b/ringcentral/ringcentral_clientutil.go index 0e7d528..bfe6e79 100644 --- a/ringcentral/ringcentral_clientutil.go +++ b/ringcentral/ringcentral_clientutil.go @@ -133,7 +133,7 @@ func BuildURL(serverURL, urlFragment string, addRestAPI bool, queryValues url.Va } else { apiURL = urlutil.JoinAbsolute(apiURL, urlFragment) } - apiURLGo, err := urlutil.URLAddQueryValuesString(apiURL, queryValues) + apiURLGo, err := urlutil.URLStringAddQuery(apiURL, queryValues, false) if err != nil { return serverURL, err } diff --git a/salesforce/salesforce_clientutil.go b/salesforce/salesforce_clientutil.go index 2b383e5..81ca1ac 100644 --- a/salesforce/salesforce_clientutil.go +++ b/salesforce/salesforce_clientutil.go @@ -75,7 +75,7 @@ func (sc *SalesforceClient) ExecSOQL(soql string) (*http.Response, error) { apiURL := sc.URLBuilder.Build("/services/data/v40.0/query/") soql = regexp.MustCompile(`\s+`).ReplaceAllString(strings.TrimSpace(soql), "+") qryMap := map[string][]string{"q": {soql}} - apiURLString := urlutil.URLAddQuery(&apiURL, qryMap).String() + apiURLString := urlutil.URLAddQuery(&apiURL, qryMap, false).String() apiURLString = regexp.MustCompile(`\%2B`).ReplaceAllString(strings.TrimSpace(apiURLString), "+") return sc.ClientMore.Client.Get(apiURLString) }