Skip to content

Commit

Permalink
Bump the go-deps group across 2 directories with 2 updates (#4556)
Browse files Browse the repository at this point in the history
* Bump the go-deps group across 2 directories with 2 updates

Bumps the go-deps group with 2 updates in the /v2 directory: [github.com/google/cel-go](https://github.com/google/cel-go) and [github.com/samber/lo](https://github.com/samber/lo).
Bumps the go-deps group with 2 updates in the /v2/cmd/asoctl directory: [github.com/google/cel-go](https://github.com/google/cel-go) and [github.com/samber/lo](https://github.com/samber/lo).


Updates `github.com/google/cel-go` from 0.22.1 to 0.23.2
- [Release notes](https://github.com/google/cel-go/releases)
- [Commits](google/cel-go@v0.22.1...v0.23.2)

Updates `github.com/samber/lo` from 1.47.0 to 1.49.1
- [Release notes](https://github.com/samber/lo/releases)
- [Commits](samber/lo@v1.47.0...v1.49.1)

Updates `github.com/google/cel-go` from 0.22.1 to 0.23.2
- [Release notes](https://github.com/google/cel-go/releases)
- [Commits](google/cel-go@v0.22.1...v0.23.2)

Updates `github.com/samber/lo` from 1.47.0 to 1.49.1
- [Release notes](https://github.com/samber/lo/releases)
- [Commits](samber/lo@v1.47.0...v1.49.1)

---
updated-dependencies:
- dependency-name: github.com/google/cel-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/samber/lo
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/google/cel-go
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/samber/lo
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Back out CEL update for now

It caused the following test failure:
[controller:test-cover] /go/pkg/mod/k8s.io/apiserver@v0.32.0/pkg/cel/environment/base.go:176:19:
cannot use ext.TwoVarComprehensions (value of type func(options ...ext.TwoVarComprehensionsOption)
"github.com/google/cel-go/cel".EnvOption) as func() "github.com/google/cel-go/cel".EnvOption value
in argument to UnversionedLib

This stems from this change in CEL: google/cel-go#1075

It is due to:
https://github.com/kubernetes/apiserver/blob/master/pkg/cel/environment/base.go#L268
where kube-apiserver purposefully breaks their complication if CEL starts supporting variadic
versioning args (which it just did in 0.23.0).

* More CEL fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Christopher <matthchr@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and matthchr authored Feb 5, 2025
1 parent 28c1d79 commit e86ba6c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion v2/cmd/asoctl/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/samber/lo v1.47.0 // indirect
github.com/samber/lo v1.49.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand Down
4 changes: 2 additions & 2 deletions v2/cmd/asoctl/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
Expand Down
4 changes: 2 additions & 2 deletions v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/go-logr/logr v1.4.2
github.com/go-logr/zapr v1.3.0
github.com/go-sql-driver/mysql v1.8.1
github.com/google/cel-go v0.22.1 // This is pinned to the commit for https://github.com/google/cel-go/pull/1009, we should update to an official release when we can
github.com/google/cel-go v0.22.1
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/hbollon/go-edlib v1.6.0
Expand All @@ -43,7 +43,7 @@ require (
github.com/onsi/gomega v1.36.2
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.20.5
github.com/samber/lo v1.47.0
github.com/samber/lo v1.49.1
github.com/spf13/cobra v1.8.1
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.32.0
Expand Down
4 changes: 2 additions & 2 deletions v2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@ github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
Expand Down

0 comments on commit e86ba6c

Please sign in to comment.