Skip to content

Commit

Permalink
Merging to release-5.6.0: [TT-13098] exp/modcheck: Update go.mod depe…
Browse files Browse the repository at this point in the history 
…ndencies (#6523)

[TT-13098] exp/modcheck: Update go.mod dependencies (#6523)

### **User description**
Triggered by: titpetric
JIRA: https://tyktech.atlassian.net/browse/TT-13098

| IMPORT | VERSION | LATEST | WARNINGS | CVES |
|:---|:---|:---|:---|:---|
| Masterminds/sprig/v3 | v3.2.3 | v3.3.0 | | |
| getkin/kin-openapi | v0.115.0 | v0.127.0 | Held back from upgrade | |
| hashicorp/consul/api | v1.29.1 | v1.29.4 | | |
| hashicorp/vault/api | v1.14.0 | v1.15.0 | | |
| miekg/dns | v1.1.61 | v1.1.62 | | 0 of 3 |
| oschwald/maxminddb-golang | v1.13.0 | v1.13.1 | | |
| rs/cors | v1.11.0 | v1.11.1 | | 0 of 2 |
| golang.org/x/crypto | v0.24.0 | v0.27.0 | | 0 of 10 |
| golang.org/x/net | v0.26.0 | v0.29.0 | | 0 of 16 |
| golang.org/x/sync | v0.7.0 | v0.8.0 | | |
| google.golang.org/grpc | v1.64.0 | v1.66.2 | | 0 of 2 |
| go-redsync/redsync/v4 | v4.11.0 | v4.13.0 | | |
| redis/go-redis/v9 | v9.5.3 | v9.6.1 | | |
| newrelic/go-agent | v2.13.0 +incompatible | v3.34.0+incompatible |
Held back from upgrade | |
| go.opentelemetry.io/otel | v1.19.0 | v1.30.0 | Held back from upgrade
| |
| go.opentelemetry.io/otel/trace | v1.19.0 | v1.30.0 | Held back from
upgrade | |

<details>
  <summary>Steps performed</summary>

  ~~~
  + go get github.com/Masterminds/sprig/[email protected]
go: downloading github.com/Masterminds/sprig/v3 v3.3.0
go: downloading dario.cat/mergo v1.0.1
go: downloading github.com/Masterminds/semver/v3 v3.3.0
go: downloading github.com/huandu/xstrings v1.5.0
go: downloading github.com/shopspring/decimal v1.4.0
go: downloading github.com/spf13/cast v1.7.0
go: downloading golang.org/x/crypto v0.26.0
go: downloading golang.org/x/text v0.17.0
go: downloading golang.org/x/sys v0.23.0
go: added dario.cat/mergo v1.0.1
go: upgraded github.com/Masterminds/semver/v3 v3.2.0 => v3.3.0
go: upgraded github.com/Masterminds/sprig/v3 v3.2.3 => v3.3.0
go: upgraded github.com/huandu/xstrings v1.3.3 => v1.5.0
go: upgraded github.com/shopspring/decimal v1.2.0 => v1.4.0
go: upgraded github.com/spf13/cast v1.6.0 => v1.7.0
go: upgraded golang.org/x/crypto v0.24.0 => v0.26.0
go: upgraded golang.org/x/sync v0.7.0 => v0.8.0
go: upgraded golang.org/x/sys v0.21.0 => v0.23.0
go: upgraded golang.org/x/text v0.16.0 => v0.17.0
+ go get github.com/hashicorp/consul/[email protected]
go: downloading github.com/hashicorp/consul/api v1.29.4
go: downloading github.com/hashicorp/consul/proto-public v0.6.2
go: upgraded github.com/hashicorp/consul/api v1.29.1 => v1.29.4
+ go get github.com/hashicorp/vault/[email protected]
go: downloading github.com/hashicorp/vault/api v1.15.0
go: downloading github.com/hashicorp/vault v1.15.0
go: downloading github.com/hashicorp/go-retryablehttp v0.7.7
go: upgraded github.com/hashicorp/go-retryablehttp v0.7.6 => v0.7.7
go: upgraded github.com/hashicorp/vault/api v1.14.0 => v1.15.0
+ go get github.com/miekg/[email protected]
go: downloading github.com/miekg/dns v1.1.62
go: downloading golang.org/x/net v0.27.0
go: upgraded github.com/miekg/dns v1.1.61 => v1.1.62
go: upgraded golang.org/x/net v0.26.0 => v0.27.0
+ go get github.com/oschwald/[email protected]
go: downloading github.com/oschwald/maxminddb-golang v1.13.1
go: upgraded github.com/oschwald/maxminddb-golang v1.13.0 => v1.13.1
+ go get github.com/rs/[email protected]
go: downloading github.com/rs/cors v1.11.1
go: upgraded github.com/rs/cors v1.11.0 => v1.11.1
+ go get golang.org/x/[email protected]
go: downloading golang.org/x/crypto v0.27.0
go: downloading golang.org/x/text v0.18.0
go: upgraded golang.org/x/crypto v0.26.0 => v0.27.0
go: upgraded golang.org/x/sys v0.23.0 => v0.25.0
go: upgraded golang.org/x/text v0.17.0 => v0.18.0
+ go get golang.org/x/[email protected]
go: downloading golang.org/x/net v0.29.0
go: upgraded golang.org/x/net v0.27.0 => v0.29.0
+ go get golang.org/x/[email protected]
+ go get google.golang.org/[email protected]
go: downloading google.golang.org/grpc v1.66.2
go: downloading google.golang.org/genproto/googleapis/rpc
v0.0.0-20240604185151-ef581f913117
go: downloading github.com/cespare/xxhash/v2 v2.3.0
go: downloading github.com/golang/glog v1.2.1
go: downloading google.golang.org/genproto/googleapis/api
v0.0.0-20240604185151-ef581f913117
go: upgraded github.com/cespare/xxhash/v2 v2.2.0 => v2.3.0
go: upgraded google.golang.org/genproto/googleapis/api
v0.0.0-20240318140521-94a12d6c2237 => v0.0.0-20240604185151-ef581f913117
go: upgraded google.golang.org/genproto/googleapis/rpc
v0.0.0-20240415180920-8c6c420018be => v0.0.0-20240604185151-ef581f913117
go: upgraded google.golang.org/grpc v1.64.0 => v1.66.2
+ go get github.com/go-redsync/redsync/[email protected]
go: downloading github.com/go-redsync/redsync/v4 v4.13.0
go: downloading github.com/go-redis/redis/v7 v7.4.1
go: upgraded github.com/go-redsync/redsync/v4 v4.11.0 => v4.13.0
+ go get github.com/redis/go-redis/[email protected]
go: downloading github.com/redis/go-redis/v9 v9.6.1
go: upgraded github.com/redis/go-redis/v9 v9.5.3 => v9.6.1
  ~~~
</details>

<details>
  <summary>go mod tidy output</summary>

  ```
  === RUN   TestLint
=== RUN   TestLint/InvalidJSON
=== RUN   TestLint/WrongType
=== RUN   TestLint/FieldTypo
=== RUN   TestLint/Empty
=== RUN   TestLint/Default
=== RUN   TestLint/OldMonitor
=== RUN   TestLint/NullObject
=== RUN   TestLint/MissingPath
=== RUN   TestLint/ExtraPort
=== RUN   TestLint/BadHost
=== RUN   TestLint/BadLogLevel
=== RUN   TestLint/BadStorageType
=== RUN   TestLint/BadPolicySource
=== RUN   TestLint/MalformedDnsCacheEntry
=== RUN   TestLint/BadDnsCacheTTL
=== RUN   TestLint/ExtraDnsCacheCheckInterval
=== RUN   TestLint/InvalidDnsCacheMultipleIPsHandleStrategy
--- PASS: TestLint (0.06s)
    --- PASS: TestLint/InvalidJSON (0.00s)
    --- PASS: TestLint/WrongType (0.00s)
    --- PASS: TestLint/FieldTypo (0.00s)
    --- PASS: TestLint/Empty (0.00s)
    --- PASS: TestLint/Default (0.00s)
    --- PASS: TestLint/OldMonitor (0.00s)
    --- PASS: TestLint/NullObject (0.00s)
    --- PASS: TestLint/MissingPath (0.00s)
    --- PASS: TestLint/ExtraPort (0.00s)
    --- PASS: TestLint/BadHost (0.01s)
    --- PASS: TestLint/BadLogLevel (0.02s)
    --- PASS: TestLint/BadStorageType (0.00s)
    --- PASS: TestLint/BadPolicySource (0.00s)
    --- PASS: TestLint/MalformedDnsCacheEntry (0.00s)
    --- PASS: TestLint/BadDnsCacheTTL (0.00s)
    --- PASS: TestLint/ExtraDnsCacheCheckInterval (0.00s)
    --- PASS: TestLint/InvalidDnsCacheMultipleIPsHandleStrategy (0.00s)
PASS
ok  	github.com/TykTechnologies/tyk/cli/linter	0.118s
=== RUN   TestXTykGateway_Lint
--- PASS: TestXTykGateway_Lint (0.01s)
PASS
ok  	github.com/TykTechnologies/tyk/apidef/oas	0.052s
  ```
</details>


___

### **PR Type**
enhancement, dependencies


___

### **Description**
- Updated multiple Go module dependencies to their latest versions in
`go.mod`.
- Corresponding updates made to `go.sum` to reflect new dependency
versions.
- Improvements in dependency management and potential security
enhancements.


___



### **Changes walkthrough** 📝
<table><thead><tr><th></th><th align="left">Relevant
files</th></tr></thead><tbody><tr><td><strong>Dependencies</strong></td><td><table>
<tr>
  <td>
    <details>
<summary><strong>go.mod</strong><dd><code>Update Go module dependencies
to latest versions</code>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; </dd></summary>
<hr>

go.mod

<li>Updated <code>github.com/Masterminds/sprig/v3</code> from v3.2.3 to
v3.3.0.<br> <li> Updated <code>github.com/hashicorp/consul/api</code>
from v1.29.1 to v1.29.4.<br> <li> Updated
<code>github.com/hashicorp/vault/api</code> from v1.14.0 to v1.15.0.<br>
<li> Updated <code>golang.org/x/crypto</code> from v0.24.0 to v0.27.0.


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/6523/files#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6">+23/-24</a>&nbsp;
</td>

</tr>                    

<tr>
  <td>
    <details>
<summary><strong>go.sum</strong><dd><code>Update Go module checksums for
dependency updates</code>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; </dd></summary>
<hr>

go.sum

<li>Updated checksums for <code>github.com/Masterminds/sprig/v3</code>
to v3.3.0.<br> <li> Updated checksums for
<code>github.com/hashicorp/consul/api</code> to v1.29.4.<br> <li>
Updated checksums for <code>github.com/hashicorp/vault/api</code> to
v1.15.0.<br> <li> Updated checksums for <code>golang.org/x/crypto</code>
to v0.27.0.


</details>


  </td>
<td><a
href="https://github.com/TykTechnologies/tyk/pull/6523/files#diff-3295df7234525439d778f1b282d146a4f1ff6b415248aaac074e8042d9f42d63">+52/-59</a>&nbsp;
</td>

</tr>                    
</table></td></tr></tr></tbody></table>

___

> 💡 **PR-Agent usage**:
>Comment `/help` on the PR to get a list of all available PR-Agent tools
and their descriptions

Co-authored-by: titpetric <[email protected]>
  • Loading branch information
@buger @titpetric
buger and titpetric authored Sep 17, 2024
1 parent d40aca9 commit b0073fc
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 83 deletions.
47 changes: 23 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.6

require (
github.com/Jeffail/tunny v0.1.4
github.com/Masterminds/sprig/v3 v3.2.3
github.com/Masterminds/sprig/v3 v3.3.0
github.com/TykTechnologies/again v0.0.0-20190805133618-6ad301e7eaed
github.com/TykTechnologies/circuitbreaker v2.2.2+incompatible
github.com/TykTechnologies/drl v0.0.0-20231218155806-88e4363884a2
Expand All @@ -29,46 +29,45 @@ require (
github.com/gemnasium/logrus-graylog-hook v2.0.7+incompatible
github.com/getkin/kin-openapi v0.115.0
github.com/go-jose/go-jose/v3 v3.0.3
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/gocraft/health v0.0.0-20170925182251-8675af27fef0
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/protobuf v1.5.4
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.3
github.com/hashicorp/consul/api v1.29.1
github.com/hashicorp/consul/api v1.29.4
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-version v1.7.0
github.com/hashicorp/vault/api v1.14.0
github.com/hashicorp/vault/api v1.15.0
github.com/jensneuse/abstractlogger v0.0.4
github.com/justinas/alice v1.2.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/lonelycode/osin v0.0.0-20160423095202-da239c9dacb6
github.com/mavricknz/ldap v0.0.0-20160227184754-f5a958005e43
github.com/miekg/dns v1.1.61
github.com/miekg/dns v1.1.62
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0
github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1 // test
github.com/opentracing/opentracing-go v1.2.0
github.com/openzipkin/zipkin-go v0.4.3
github.com/oschwald/maxminddb-golang v1.13.0
github.com/oschwald/maxminddb-golang v1.13.1
github.com/paulbellamy/ratecounter v0.2.0
github.com/pires/go-proxyproto v0.7.0
github.com/pmylund/go-cache v2.1.0+incompatible
github.com/robertkrimen/otto v0.4.0
github.com/rs/cors v1.11.0
github.com/rs/cors v1.11.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/afero v1.11.0
github.com/stretchr/testify v1.9.0 // test
github.com/uber/jaeger-client-go v2.30.1-0.20220110192849-8d8e8fcfd04d+incompatible
github.com/valyala/fasthttp v1.55.0 // test
github.com/vmihailenco/msgpack v4.0.4+incompatible
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/crypto v0.24.0
golang.org/x/net v0.26.0
golang.org/x/sync v0.7.0
google.golang.org/grpc v1.64.0
golang.org/x/crypto v0.27.0
golang.org/x/net v0.29.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.66.2
google.golang.org/grpc/examples v0.0.0-20220317213542-f95b001a48df // test
google.golang.org/protobuf v1.34.2
gopkg.in/vmihailenco/msgpack.v2 v2.9.2
Expand All @@ -78,8 +77,8 @@ require (

require (
github.com/TykTechnologies/exp/pkg/limiters v0.0.0-20231219151617-0c4f9315fe5c
github.com/go-redsync/redsync/v4 v4.11.0
github.com/redis/go-redis/v9 v9.5.3
github.com/go-redsync/redsync/v4 v4.13.0
github.com/redis/go-redis/v9 v9.6.1
)

require (
Expand All @@ -98,11 +97,12 @@ require (
)

require (
dario.cat/mergo v1.0.1 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/IBM/sarama v1.43.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/alitto/pond v1.8.3 // indirect
Expand All @@ -111,9 +111,8 @@ require (
github.com/asyncapi/converter-go v0.3.0 // indirect
github.com/asyncapi/parser-go v0.4.2 // indirect
github.com/asyncapi/spec-json-schemas/v2 v2.14.0 // indirect
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/eapache/go-resiliency v1.6.0 // indirect
Expand Down Expand Up @@ -141,7 +140,7 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.6 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
Expand All @@ -150,7 +149,7 @@ require (
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/invopop/yaml v0.2.0 // indirect
Expand Down Expand Up @@ -182,8 +181,8 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tidwall/gjson v1.11.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
Expand All @@ -207,13 +206,13 @@ require (
go.uber.org/zap v1.21.0 // indirect
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
gopkg.in/sourcemap.v1 v1.0.5 // indirect
Expand Down
Loading

0 comments on commit b0073fc

Please sign in to comment.