Skip to content

Commit

Permalink
dep: go mod: update
Browse files Browse the repository at this point in the history
  • Loading branch information
@grokify
grokify committed Nov 25, 2023
1 parent 96439ea commit 161e030
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 64 deletions.
4 changes: 2 additions & 2 deletions cmd/goauth/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ type Options struct {
Body string `short:"d" long:"data" description:"HTTP Body"`
}

func (opts *Options) SimpleRequest() (httpsimple.SimpleRequest, error) {
sr := httpsimple.SimpleRequest{
func (opts *Options) SimpleRequest() (httpsimple.Request, error) {
sr := httpsimple.Request{
URL: opts.URL,
Headers: map[string][]string{},
}
Expand Down
10 changes: 5 additions & 5 deletions credentials.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,28 @@ func (creds *Credentials) NewClient(ctx context.Context) (*http.Client, error) {
return authutil.NewClientToken(authutil.TokenBearer, tok.AccessToken, false), nil
}

func (creds *Credentials) NewSimpleClient(ctx context.Context) (*httpsimple.SimpleClient, error) {
func (creds *Credentials) NewSimpleClient(ctx context.Context) (*httpsimple.Client, error) {
httpClient, err := creds.NewClient(ctx)
if err != nil {
return nil, err
}
return creds.NewSimpleClientHTTP(httpClient)
}

func (creds *Credentials) NewSimpleClientHTTP(httpClient *http.Client) (*httpsimple.SimpleClient, error) {
func (creds *Credentials) NewSimpleClientHTTP(httpClient *http.Client) (*httpsimple.Client, error) {
switch creds.Type {
case TypeJWT:
return nil, ErrJWTNotSupported
case TypeBasic:
return &httpsimple.SimpleClient{
return &httpsimple.Client{
BaseURL: creds.Basic.ServerURL,
HTTPClient: httpClient}, nil
case TypeHeaderQuery:
return &httpsimple.SimpleClient{
return &httpsimple.Client{
BaseURL: creds.HeaderQuery.ServerURL,
HTTPClient: httpClient}, nil
case TypeOAuth2:
return &httpsimple.SimpleClient{
return &httpsimple.Client{
BaseURL: creds.OAuth2.ServerURL,
HTTPClient: httpClient}, nil
default:
Expand Down
6 changes: 3 additions & 3 deletions credentials_basicauth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ func (c *CredentialsBasicAuth) NewClient() (*http.Client, error) {
return &http.Client{}, nil
}

func (c *CredentialsBasicAuth) NewSimpleClient() (httpsimple.SimpleClient, error) {
func (c *CredentialsBasicAuth) NewSimpleClient() (httpsimple.Client, error) {
hclient, err := c.NewClient()
if err != nil {
return httpsimple.SimpleClient{}, err
return httpsimple.Client{}, err
}
return httpsimple.SimpleClient{
return httpsimple.Client{
HTTPClient: hclient,
BaseURL: c.ServerURL}, nil
}
4 changes: 2 additions & 2 deletions credentials_headerquery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ func (c *CredentialsHeaderQuery) NewClient() *http.Client {
return authutil.NewClientHeaderQuery(c.Header, c.Query, c.AllowInsecure)
}

func (c *CredentialsHeaderQuery) NewSimpleClient() httpsimple.SimpleClient {
return httpsimple.SimpleClient{
func (c *CredentialsHeaderQuery) NewSimpleClient() httpsimple.Client {
return httpsimple.Client{
HTTPClient: c.NewClient(),
BaseURL: c.ServerURL}
}
2 changes: 1 addition & 1 deletion credentials_oauth2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func (oc *CredentialsOAuth2) RefreshTokenSimple(refreshToken string) (*oauth2.To
body.Add(authutil.ParamScope, strings.Join(oc.Scopes, " "))
}

sr := httpsimple.SimpleRequest{
sr := httpsimple.Request{
Method: http.MethodPost,
URL: oc.Endpoint.TokenURL,
Headers: map[string][]string{
Expand Down
18 changes: 7 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ require (
github.com/caarlos0/env/v9 v9.0.0
github.com/golang-jwt/jwt/v5 v5.1.0
github.com/google/go-querystring v1.1.0
github.com/grokify/go-salesforce v0.2.22
github.com/grokify/gocharts/v2 v2.15.1
github.com/grokify/gostor v0.2.7
github.com/grokify/mogo v0.60.1
github.com/grokify/go-salesforce v0.2.23
github.com/grokify/gocharts/v2 v2.15.2
github.com/grokify/mogo v0.61.0
github.com/grokify/xgo v0.6.0
github.com/jessevdk/go-flags v1.5.0
github.com/joho/godotenv v1.5.1
github.com/rs/zerolog v1.31.0
Expand All @@ -22,13 +22,11 @@ require (
)

require (
cloud.google.com/go/compute v1.23.2 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/caarlos0/env/v6 v6.10.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -48,22 +46,20 @@ require (
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fastjson v1.6.4 // indirect
github.com/valyala/quicktemplate v1.7.0 // indirect
github.com/xuri/efp v0.0.0-20231025114914-d1ff6096ae53 // indirect
github.com/xuri/excelize/v2 v2.8.0 // indirect
github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.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-20231030173426-d783a09b4405 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/oleiade/reflections.v1 v1.0.0 // indirect
)

// replace github.com/grokify/mogo => ../mogo
Expand Down
46 changes: 18 additions & 28 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
Expand All @@ -9,8 +9,6 @@ github.com/SparkPost/gosparkpost v0.2.0/go.mod h1:S9WKcGeou7cbPpx0kTIgo8Q69WZvUm
github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/buger/jsonparser v1.0.0/go.mod h1:tgcrVJ81GPSF0mz+0nu1Xaz0fazGPrmmJfJtxjbHhUQ=
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II=
github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
github.com/caarlos0/env/v9 v9.0.0 h1:SI6JNsOA+y5gj9njpgybykATIylrRMklbs5ch6wO6pc=
Expand All @@ -35,8 +33,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
Expand Down Expand Up @@ -85,14 +81,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.22 h1:tHqEHO38jy6WnicndNHQVhaCp2bxz/b9HGyKrrd9i/k=
github.com/grokify/go-salesforce v0.2.22/go.mod h1:9knqPM2hZ4yOQW9ZRUF0VniulKePDhWfjHkkI7KalsY=
github.com/grokify/gocharts/v2 v2.15.1 h1:hAdNGjGfcxaNnpI5goPGejODJ3TOcM+uuqQzU04gTsk=
github.com/grokify/gocharts/v2 v2.15.1/go.mod h1:Krp/pPIoi9Mv/kSmLwYZ8DEADi2Oy2H7UnqYTkS0Hkc=
github.com/grokify/gostor v0.2.7 h1:JyuNf8IUT47aks955XcbiJ/N4R7kCFg6a7sBMhYCG2M=
github.com/grokify/gostor v0.2.7/go.mod h1:cF8Nfg+7BKha9V8LdPzHHslt3kR6AshcTTjlOAmifpM=
github.com/grokify/mogo v0.60.1 h1:gC4AG8Kg8NZAMs/d2CyrQNAtG8Wjpjjiau83QXAbeYE=
github.com/grokify/mogo v0.60.1/go.mod h1:wa3PSmp1Gb5F7Ay4nVSrL51+AUd6HwR991UIJtR2ZXU=
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.0 h1:kTlz/80ux4OeI8xvOHyec0PWLSLKBTT523s5n/AcopE=
github.com/grokify/mogo v0.61.0/go.mod h1:22q+ffdRQN4dIywkTBnDEqMzaoOT90zcd+MRQnvddLw=
github.com/grokify/xgo v0.6.0 h1:RLxNSomdDItiNSMiCjW++XKJtDL0wEaG+wPePknMyRA=
github.com/grokify/xgo v0.6.0/go.mod h1:01SAHwsal0COE2mzqMbgEhcpb2Fd7lk2NraFNXdEnBg=
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=
Expand Down Expand Up @@ -127,8 +123,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oleiade/reflections v1.0.1 h1:D1XO3LVEYroYskEsoSiGItp9RUxG6jWnCVvrqH0HHQM=
github.com/oleiade/reflections v1.0.1/go.mod h1:rdFxbxq4QXVZWj0F+e9jqjDkc7dbp97vkRixKo2JR60=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
Expand Down Expand Up @@ -164,8 +158,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus=
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
github.com/valyala/quicktemplate v1.7.0 h1:LUPTJmlVcb46OOUY3IeD9DojFpAVbsG+5WFTcjMJzCM=
github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8=
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
Expand All @@ -188,11 +180,11 @@ golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98y
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
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/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8=
golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
Expand Down Expand Up @@ -278,12 +270,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-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
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-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik=
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
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/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=
Expand All @@ -307,8 +299,6 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/jeevatkm/go-model.v1 v1.1.0 h1:amtTNQLfoLEE35aUWKVI0plheGTHnlOnESGmN+dnTkA=
gopkg.in/jeevatkm/go-model.v1 v1.1.0/go.mod h1:DBVmvWau/0RaL6rFQeTiDcGn3u8xv5rTxKjDw2sIwmA=
gopkg.in/oleiade/reflections.v1 v1.0.0 h1:nV9NFaFd5bXKjilVvPvA+/V/tNQk1pOEEc9gGWDkj+s=
gopkg.in/oleiade/reflections.v1 v1.0.0/go.mod h1:SpA8pv+LUnF0FbB2hyRxc8XSng78D6iLBZ11PDb8Z5g=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
Expand Down
4 changes: 2 additions & 2 deletions hubspot/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ func NewClientAPIKey(apiKey string) *http.Client {
false)
}

func NewSimpleClientAPIKey(apiKey string) httpsimple.SimpleClient {
return httpsimple.SimpleClient{
func NewSimpleClientAPIKey(apiKey string) httpsimple.Client {
return httpsimple.Client{
BaseURL: endpoints.HubspotServerURL,
HTTPClient: NewClientAPIKey(apiKey)}
}
8 changes: 4 additions & 4 deletions hubspot/contacts_export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ func ContactsV3ExportWriteFiles(client *http.Client, fileprefix string, opts *Co
if opts != nil && opts.Limit > LimitMax || opts.Limit < 1 {
return errors.New("invalid limit - must be between 1 and 100 inclusive")
}
sclient := httpsimple.SimpleClient{
sclient := httpsimple.Client{
BaseURL: endpoints.HubspotServerURL,
HTTPClient: client}

sreq := httpsimple.SimpleRequest{
sreq := httpsimple.Request{
Method: http.MethodGet,
URL: ContactsListAPIPathV3}
if opts != nil {
Expand Down Expand Up @@ -138,11 +138,11 @@ func ContactsV1ExportWriteFiles(client *http.Client, fileprefix string, opts *Co
if opts != nil && opts.Count > LimitMax || opts.Count < 1 {
return errors.New("invalid count - must be between 1 and 100 inclusive")
}
sclient := httpsimple.SimpleClient{
sclient := httpsimple.Client{
BaseURL: endpoints.HubspotServerURL,
HTTPClient: client}

sreq := httpsimple.SimpleRequest{
sreq := httpsimple.Request{
Method: http.MethodGet,
URL: ContactsListAPIPathV3}
if opts != nil {
Expand Down
8 changes: 4 additions & 4 deletions multiservice/tokens/tokensetredis/tokenset_redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import (
"strings"

"github.com/grokify/goauth/multiservice/tokens"
"github.com/grokify/gostor"
rds "github.com/grokify/gostor/redis"
"github.com/grokify/xgo/database/document"
"github.com/grokify/xgo/database/document/redis"
"golang.org/x/oauth2"
)

type TokenSet struct {
gsClient gostor.Client
gsClient document.Client
}

func NewTokenSet(client *rds.Client) *TokenSet {
func NewTokenSet(client *redis.Client) *TokenSet {
return &TokenSet{gsClient: client}
}

Expand Down
4 changes: 2 additions & 2 deletions zoom/cmd/jwt_zoom/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ func main() {
}

func createMeeting(client *http.Client) (*http.Response, error) {
sc := httpsimple.SimpleClient{
sc := httpsimple.Client{
BaseURL: zoom.ZoomAPIBaseURL,
HTTPClient: client}
req := httpsimple.SimpleRequest{
req := httpsimple.Request{
Method: http.MethodPost,
URL: urlutil.JoinAbsolute(zoom.ZoomAPIMeURL, "meetings"),
Body: []byte(reqBody),
Expand Down

0 comments on commit 161e030

Please sign in to comment.