From 303e1cbc299d965d91c9914c2404e8fb009da76b Mon Sep 17 00:00:00 2001 From: "Philip K. Warren" Date: Tue, 1 Sep 2026 13:52:29 -0500 Subject: [PATCH] Update protovalidate-go and cel-go Update to the latest protovalidate-go version which pulls in cel-go (whose module name has changed). Update the LSP and lint packages to use the new cel-go module name. --- go.mod | 6 +++--- go.sum | 12 ++++++------ private/buf/buflsp/cel.go | 4 ++-- private/buf/buflsp/completion_cel.go | 8 ++++---- private/buf/buflsp/definition_cel.go | 4 ++-- private/buf/buflsp/hover_cel.go | 12 ++++++------ private/buf/buflsp/semantic_tokens.go | 2 +- private/buf/buflsp/semantic_tokens_cel.go | 8 ++++---- private/buf/buflsp/server.go | 2 +- .../bufcheckserver/internal/buflintvalidate/cel.go | 4 ++-- .../internal/buflintvalidate/cel_test.go | 2 +- .../internal/buflintvalidate/predefined_rules.go | 2 +- .../bufcheckserver/internal/buflintvalidate/util.go | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index 251834373f..e274484a51 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ go 1.26.7 require ( buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.12-20260722160903-4d94f3df3a7b.1 buf.build/gen/go/bufbuild/protodescriptor/protocolbuffers/go v1.36.12-20250109164928-1da0de137947.1 - buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1 + buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1 buf.build/gen/go/bufbuild/registry/connectrpc/go v1.20.0-20260713175918-10d915f5b43b.1 buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.12-20260713175918-10d915f5b43b.1 buf.build/go/app v0.2.1-0.20260721000008-7041f5472338 buf.build/go/bufplugin v0.10.0 buf.build/go/bufprivateusage v0.1.0 - buf.build/go/protovalidate v1.3.0 + buf.build/go/protovalidate v1.4.0 buf.build/go/protoyaml v0.7.0 buf.build/go/spdx v0.2.0 buf.build/go/standard v0.1.1-0.20260325175353-2b287e071df5 + cel.dev/cel-go v0.32.0 connectrpc.com/connect v1.20.0 connectrpc.com/grpcreflect v1.3.0 connectrpc.com/otelconnect v0.9.0 @@ -22,7 +23,6 @@ require ( github.com/bufbuild/protoplugin v0.0.0-20260414125817-25d1d281b46b github.com/cli/browser v1.3.0 github.com/gofrs/flock v0.13.0 - github.com/google/cel-go v0.31.0 github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.21.9 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 2ca262bd25..4870f791d3 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.12-20260722160903-4 buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.12-20260722160903-4d94f3df3a7b.1/go.mod h1:or0FXsDqcJfmWGc8Xx6cr8iAySi3CZ4o0K1+C39pTts= buf.build/gen/go/bufbuild/protodescriptor/protocolbuffers/go v1.36.12-20250109164928-1da0de137947.1 h1:hPzyu9O/M/OguwU08/CntzemR43sEaBw0FIJxnFWVqc= buf.build/gen/go/bufbuild/protodescriptor/protocolbuffers/go v1.36.12-20250109164928-1da0de137947.1/go.mod h1:jMWijYwl5JMuBr0OqOy5wSWh2mkSIfkMlwNsSY1aL6w= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1 h1:6nlcxMOui23ZRVAfJM451duu79P1npA5JRdZqMilrrQ= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1/go.mod h1:TCt1lluMFnctISJXvkIQ4x3ABrPuUKCWKyjKdkJNBpw= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1 h1:Slv0uGxx219srASyiaI5C9cDlyG8kNDcXpTSYcuAeE4= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1/go.mod h1:TCt1lluMFnctISJXvkIQ4x3ABrPuUKCWKyjKdkJNBpw= buf.build/gen/go/bufbuild/registry/connectrpc/go v1.20.0-20260713175918-10d915f5b43b.1 h1:c4w6fQ6wAhZLgVI+HZozlWX9I2aVPN34vrl/8cuovVc= buf.build/gen/go/bufbuild/registry/connectrpc/go v1.20.0-20260713175918-10d915f5b43b.1/go.mod h1:mbcuFKpnCQsF8H2fBs1lN1dQVAiASPQKwFgTkXqYscI= buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.12-20260713175918-10d915f5b43b.1 h1:vXeroJtGt1NaMmWqJRtMFN/lb+sM0VEdwhF4j72RJD4= @@ -18,14 +18,16 @@ buf.build/go/bufprivateusage v0.1.0 h1:SzCoCcmzS3zyXHEXHeSQhGI7OTkgtljoknLzsUz9G buf.build/go/bufprivateusage v0.1.0/go.mod h1:GlCCJ3VVF7EqqU0CoRmo1FzAwwaKymEWSr+ty69xU5w= buf.build/go/interrupt v1.1.0 h1:olBuhgv9Sav4/9pkSLoxgiOsZDgM5VhRhvRpn3DL0lE= buf.build/go/interrupt v1.1.0/go.mod h1:ql56nXPG1oHlvZa6efNC7SKAQ/tUjS6z0mhJl0gyeRM= -buf.build/go/protovalidate v1.3.0 h1:8ITcnZGkAHx6TyhZvro+iET/AyqU8gEWQJK2WsT62ms= -buf.build/go/protovalidate v1.3.0/go.mod h1:82s5g+rFRj1CZPiLv6OTA31jBu2fpq7mLXHwa9mZfEs= +buf.build/go/protovalidate v1.4.0 h1:UjLrYbt5VX7+TMOs2+pG5FhZhIG1mSfK4EIopbb4LcM= +buf.build/go/protovalidate v1.4.0/go.mod h1:8vJfzNT6NIG2qm3uFsJDXMlRmG+bQJzbcIn1Aa0vPGs= buf.build/go/protoyaml v0.7.0 h1:z4oVoFicbpPefhT7WAykxUdfp0yEQlhMQ2mCZOY5V38= buf.build/go/protoyaml v0.7.0/go.mod h1:+a0cavd0uMvirb87xdu2ZMMmjlIQoiH/N2Ich5MGSQ0= buf.build/go/spdx v0.2.0 h1:IItqM0/cMxvFJJumcBuP8NrsIzMs/UYjp/6WSpq8LTw= buf.build/go/spdx v0.2.0/go.mod h1:bXdwQFem9Si3nsbNy8aJKGPoaPi5DKwdeEp5/ArZ6w8= buf.build/go/standard v0.1.1-0.20260325175353-2b287e071df5 h1:njYKSWoLiq2i5O7y2bPPU2Yzp7iAU0Wk9KJ2OoAhNiU= buf.build/go/standard v0.1.1-0.20260325175353-2b287e071df5/go.mod h1:DQmodNT9EHX94WzUaWiZK+/4EaFa/xZTc1gzfCxZVXU= +cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk= +cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0= cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ= @@ -76,8 +78,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0= -github.com/google/cel-go v0.31.0 h1:H0bhpFTqOvmHrBGrWKp7ZlhBm5Hh8PYUEXnwxT1LL7A= -github.com/google/cel-go v0.31.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= diff --git a/private/buf/buflsp/cel.go b/private/buf/buflsp/cel.go index 11b93e60ec..13eb040604 100644 --- a/private/buf/buflsp/cel.go +++ b/private/buf/buflsp/cel.go @@ -18,9 +18,9 @@ import ( "strings" "unicode/utf8" + celast "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" "github.com/bufbuild/protocompile/experimental/source" - celast "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" ) // celIsIdentChar reports whether c is a valid CEL identifier character: diff --git a/private/buf/buflsp/completion_cel.go b/private/buf/buflsp/completion_cel.go index efa640c6d3..e88685ab4e 100644 --- a/private/buf/buflsp/completion_cel.go +++ b/private/buf/buflsp/completion_cel.go @@ -24,13 +24,13 @@ import ( "slices" "strings" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/decls" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/types" "github.com/bufbuild/protocompile/experimental/ast/predeclared" "github.com/bufbuild/protocompile/experimental/ir" "github.com/bufbuild/protocompile/experimental/seq" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/decls" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/types" "go.lsp.dev/protocol" ) diff --git a/private/buf/buflsp/definition_cel.go b/private/buf/buflsp/definition_cel.go index 92a9e42244..157fb0ea30 100644 --- a/private/buf/buflsp/definition_cel.go +++ b/private/buf/buflsp/definition_cel.go @@ -15,9 +15,9 @@ package buflsp import ( + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" "github.com/bufbuild/protocompile/experimental/ir" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" "go.lsp.dev/protocol" ) diff --git a/private/buf/buflsp/hover_cel.go b/private/buf/buflsp/hover_cel.go index fdb742239f..2622b24ca6 100644 --- a/private/buf/buflsp/hover_cel.go +++ b/private/buf/buflsp/hover_cel.go @@ -19,14 +19,14 @@ import ( "maps" "strings" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/operators" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" "github.com/bufbuild/protocompile/experimental/ir" "github.com/bufbuild/protocompile/experimental/seq" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/operators" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" "go.lsp.dev/protocol" ) diff --git a/private/buf/buflsp/semantic_tokens.go b/private/buf/buflsp/semantic_tokens.go index d69addddc5..bf8387f92d 100644 --- a/private/buf/buflsp/semantic_tokens.go +++ b/private/buf/buflsp/semantic_tokens.go @@ -17,13 +17,13 @@ package buflsp import ( "slices" + "cel.dev/cel-go/cel" "github.com/bufbuild/protocompile/experimental/ast" "github.com/bufbuild/protocompile/experimental/ir" "github.com/bufbuild/protocompile/experimental/seq" "github.com/bufbuild/protocompile/experimental/source" "github.com/bufbuild/protocompile/experimental/token" "github.com/bufbuild/protocompile/experimental/token/keyword" - "github.com/google/cel-go/cel" "go.lsp.dev/protocol" ) diff --git a/private/buf/buflsp/semantic_tokens_cel.go b/private/buf/buflsp/semantic_tokens_cel.go index 889eefc7f2..e5ba01f85c 100644 --- a/private/buf/buflsp/semantic_tokens_cel.go +++ b/private/buf/buflsp/semantic_tokens_cel.go @@ -17,14 +17,14 @@ package buflsp import ( "maps" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/ast" + "cel.dev/cel-go/common/overloads" + "cel.dev/cel-go/common/types" "github.com/bufbuild/protocompile/experimental/ir" "github.com/bufbuild/protocompile/experimental/seq" "github.com/bufbuild/protocompile/experimental/source" "github.com/bufbuild/protocompile/experimental/token/keyword" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/ast" - "github.com/google/cel-go/common/overloads" - "github.com/google/cel-go/common/types" ) const ( diff --git a/private/buf/buflsp/server.go b/private/buf/buflsp/server.go index 2b90d91c05..a734549383 100644 --- a/private/buf/buflsp/server.go +++ b/private/buf/buflsp/server.go @@ -24,11 +24,11 @@ import ( celpv "buf.build/go/protovalidate/cel" "buf.build/go/standard/xslices" + "cel.dev/cel-go/cel" "github.com/bufbuild/buf/private/buf/bufformat" "github.com/bufbuild/protocompile/experimental/parser" "github.com/bufbuild/protocompile/experimental/report" "github.com/bufbuild/protocompile/experimental/source" - "github.com/google/cel-go/cel" "go.lsp.dev/protocol" "mvdan.cc/xurls/v2" ) diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel.go b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel.go index dcac12978e..754e7f5fa8 100644 --- a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel.go +++ b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel.go @@ -20,9 +20,9 @@ import ( "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate" celpv "buf.build/go/protovalidate/cel" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/common/types" "github.com/bufbuild/buf/private/bufpkg/bufprotosource" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/common/types" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/dynamicpb" ) diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel_test.go b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel_test.go index d943396695..092eb9c06a 100644 --- a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel_test.go +++ b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/cel_test.go @@ -17,7 +17,7 @@ package buflintvalidate import ( "testing" - "github.com/google/cel-go/cel" + "cel.dev/cel-go/cel" "github.com/stretchr/testify/require" ) diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/predefined_rules.go b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/predefined_rules.go index dcecbf7b1e..6782c62fd5 100644 --- a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/predefined_rules.go +++ b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/predefined_rules.go @@ -19,10 +19,10 @@ import ( "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate" celpv "buf.build/go/protovalidate/cel" + "cel.dev/cel-go/cel" "github.com/bufbuild/buf/private/bufpkg/bufprotosource" "github.com/bufbuild/buf/private/pkg/protoencoding" "github.com/bufbuild/buf/private/pkg/syserror" - "github.com/google/cel-go/cel" ) const ( diff --git a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/util.go b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/util.go index 3730bb7551..6db14a40cd 100644 --- a/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/util.go +++ b/private/bufpkg/bufcheck/bufcheckserver/internal/buflintvalidate/util.go @@ -18,8 +18,8 @@ import ( "fmt" "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate" + "cel.dev/cel-go/cel" "github.com/bufbuild/buf/private/pkg/protoencoding" - "github.com/google/cel-go/cel" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" )