From d7dbf8552562edcfb53ab2024d8ceccc33823021 Mon Sep 17 00:00:00 2001 From: Mohammed Al Sahaf Date: Tue, 30 Jun 2020 20:53:29 +0300 Subject: cel: fix validation of expression result type (#3526) * cel: fix validation of expression result type The earlier code used the proto.Equals from github.com/gogo/protobuf, which failed to compare two messages of the same type for some reason. Switching to proto.Equal from the canonical github.com/golang/protobuf fixes the issue. * deps: remove deprecated github.com/golang/protobuf in favor of google.golang.org/protobuf * downgrade github.com/smallstep/nosql to resolve warning pb.proto warning --- go.mod | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'go.mod') diff --git a/go.mod b/go.mod index 86c987f..9d47c46 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,6 @@ require ( github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac github.com/go-acme/lego/v3 v3.7.0 github.com/go-chi/chi v4.1.2+incompatible - github.com/gogo/protobuf v1.3.1 - github.com/golang/protobuf v1.4.2 github.com/google/cel-go v0.5.1 github.com/jsternberg/zap-logfmt v1.2.0 github.com/klauspost/compress v1.10.10 @@ -22,7 +20,7 @@ require ( github.com/naoina/toml v0.1.1 github.com/smallstep/certificates v0.15.0-rc.1.0.20200506212953-e855707dc274 github.com/smallstep/cli v0.14.4 - github.com/smallstep/nosql v0.3.1 + github.com/smallstep/nosql v0.3.0 github.com/smallstep/truststore v0.9.5 github.com/yuin/goldmark v1.1.32 github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 @@ -30,6 +28,7 @@ require ( golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/net v0.0.0-20200625001655-4c5254603344 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 + google.golang.org/protobuf v1.25.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.3.0 ) -- cgit v1.2.3