diff options
| author | Mohammed Al Sahaf <msaa1990@gmail.com> | 2020-06-30 20:53:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 11:53:29 -0600 |
| commit | d7dbf8552562edcfb53ab2024d8ceccc33823021 (patch) | |
| tree | 3398991b21f5252f5bc0d6ff9288d53be5fa0c9f /modules/caddyhttp/celmatcher.go | |
| parent | 77f233a4840afb8b081d12b083b19ed314fd975a (diff) | |
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
Diffstat (limited to 'modules/caddyhttp/celmatcher.go')
| -rw-r--r-- | modules/caddyhttp/celmatcher.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/caddyhttp/celmatcher.go b/modules/caddyhttp/celmatcher.go index 6c9cc96..83e01cf 100644 --- a/modules/caddyhttp/celmatcher.go +++ b/modules/caddyhttp/celmatcher.go @@ -25,8 +25,6 @@ import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" - "github.com/gogo/protobuf/proto" - "github.com/golang/protobuf/ptypes/timestamp" "github.com/google/cel-go/cel" "github.com/google/cel-go/checker/decls" "github.com/google/cel-go/common/types" @@ -35,6 +33,8 @@ import ( "github.com/google/cel-go/ext" "github.com/google/cel-go/interpreter/functions" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" + "google.golang.org/protobuf/proto" + timestamp "google.golang.org/protobuf/types/known/timestamppb" ) func init() { |