Skip to content

Commit

Permalink
Merging to release-5.7: [TT-13715] Upgrade to Bento v1.4.0 (#6762)
Browse files Browse the repository at this point in the history 
[TT-13715] Upgrade to Bento v1.4.0 (#6762)

### **User description**
PR for https://tyktech.atlassian.net/browse/TT-13715

With this PR we upgrade Bento to v1.4.0 from
v1.2.0(github.com/TykTechnologies/bento
v0.0.0-20241108123210-93d1717c7171).

We were maintaining our own fork to cherry-pick some commits from
Bento's master branch. The changes released in v1.4.0 and Platform team
has fixed this issue and upgrading v1.4.0 is unblocked.
https://tyktech.atlassian.net/browse/TT-13518


___

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


___

### **Description**
- Upgraded `github.com/warpstreamlabs/bento` from v1.2.0 to v1.4.0,
removing the need for a custom fork.
- Updated multiple dependencies to their latest versions, ensuring
compatibility and leveraging new features or fixes.
- Adjusted indirect dependencies and their checksums to align with the
upgraded modules.
- Removed the `replace` directive for the `bento` fork, simplifying
dependency management.



___



### **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>Upgrade Bento and other
dependencies to newer versions.</code>&nbsp; &nbsp; </dd></summary>
<hr>

go.mod

<li>Upgraded <code>github.com/warpstreamlabs/bento</code> from v1.2.0 to
v1.4.0.<br> <li> Updated various dependencies to newer versions,
including <br><code>golang.org/x/crypto</code>,
<code>golang.org/x/net</code>, <code>google.golang.org/grpc</code>, and
<br>others.<br> <li> Adjusted indirect dependencies to align with the
new versions.<br> <li> Removed the <code>replace</code> directive for
the <code>bento</code> fork.<br>


</details>


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

</tr>

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

go.sum

<li>Updated checksums for dependencies upgraded in
<code>go.mod</code>.<br> <li> Added new checksums for updated indirect
dependencies.<br> <li> Removed checksums for deprecated or replaced
dependencies.<br>


</details>


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

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

___

> 💡 **PR-Agent usage**: Comment `/help "your question"` on any pull
request to receive relevant information

---------

Co-authored-by: Matias <[email protected]>
  • Loading branch information
@buger @mativm02
buger and mativm02 authored Dec 12, 2024
1 parent 7d1f127 commit 76e7a25
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 96 deletions.
62 changes: 31 additions & 31 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ require (
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.27.0
golang.org/x/net v0.29.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.66.2
golang.org/x/crypto v0.29.0
golang.org/x/net v0.31.0
golang.org/x/sync v0.9.0
google.golang.org/grpc v1.67.1
google.golang.org/grpc/examples v0.0.0-20220317213542-f95b001a48df // test
google.golang.org/protobuf v1.34.2
google.golang.org/protobuf v1.35.1
gopkg.in/vmihailenco/msgpack.v2 v2.9.2
gopkg.in/xmlpath.v2 v2.0.0-20150820204837-860cbeca3ebc
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -96,16 +96,16 @@ require (
github.com/testcontainers/testcontainers-go v0.33.0
github.com/testcontainers/testcontainers-go/modules/kafka v0.33.0
github.com/testcontainers/testcontainers-go/modules/nats v0.33.0
github.com/warpstreamlabs/bento v1.2.0
github.com/warpstreamlabs/bento v1.4.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/trace v1.32.0
go.uber.org/mock v0.4.0
golang.org/x/oauth2 v0.21.0
golang.org/x/oauth2 v0.23.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cuelang.org/go v0.7.0 // indirect
cuelang.org/go v0.7.1 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
Expand All @@ -120,7 +120,7 @@ require (
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/alitto/pond v1.8.3 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/asyncapi/converter-go v0.3.0 // indirect
github.com/asyncapi/parser-go v0.4.2 // indirect
Expand All @@ -134,7 +134,7 @@ require (
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // 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/distribution/reference v0.6.0 // indirect
Expand Down Expand Up @@ -163,12 +163,12 @@ require (
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.2.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/govalues/decimal v0.1.29 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/govalues/decimal v0.1.32 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
Expand All @@ -190,8 +190,8 @@ require (
github.com/imdario/mergo v0.3.13 // indirect
github.com/influxdata/go-syslog/v3 v3.0.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/itchyny/gojq v0.12.14 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/itchyny/gojq v0.12.16 // indirect
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
Expand All @@ -203,7 +203,7 @@ require (
github.com/jinzhu/now v1.1.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/linkedin/goavro/v2 v2.12.0 // indirect
github.com/lonelycode/go-uuid v0.0.0-20141202165402-ed3ca8a15a93 // indirect
Expand All @@ -214,7 +214,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mavricknz/asn1-ber v0.0.0-20151103223136-b9df1c2f4213 // indirect
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
github.com/minio/highwayhash v1.0.3 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -241,7 +241,7 @@ require (
github.com/quipo/dependencysolver v0.0.0-20170801134659-2b009cb4ddcc // indirect
github.com/r3labs/sse/v2 v2.8.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rickb777/period v1.0.5 // indirect
github.com/rickb777/period v1.0.7 // indirect
github.com/rickb777/plural v1.4.2 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -263,18 +263,18 @@ require (
github.com/twmb/franz-go v1.16.1 // indirect
github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
github.com/uber/jaeger-lib v2.4.2-0.20210604143007-135cf5605a6d+incompatible // indirect
github.com/urfave/cli/v2 v2.27.1 // indirect
github.com/urfave/cli/v2 v2.27.5 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
Expand All @@ -285,15 +285,15 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/sys v0.27.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
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/appengine v1.6.8 // 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
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
Expand All @@ -302,4 +302,4 @@ require (
nhooyr.io/websocket v1.8.10 // indirect
)

replace github.com/warpstreamlabs/bento v1.2.0 => github.com/TykTechnologies/bento v0.0.0-20241108123210-93d1717c7171
replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
Loading

0 comments on commit 76e7a25

Please sign in to comment.