Skip to content

Commit d44b55c

Browse files
author
Amin Jamali
committed
Use proto.Equal instead
Previously we created a custom gomega matcher, but since upgrade to go-control-plane 0.11.0 there are extra fields in protobuf that is causing the matcher to fail and proto.Equal is the correct way for testing to see if two object are the same.
1 parent 6019979 commit d44b55c

File tree

2 files changed

+163
-129
lines changed

2 files changed

+163
-129
lines changed

depot/containerstore/proxy_config_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
envoy_discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
2929
envoy_matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
3030
ghodss_yaml "github.com/ghodss/yaml"
31-
"github.com/gogo/protobuf/proto"
3231
"github.com/golang/protobuf/jsonpb"
32+
"github.com/golang/protobuf/proto"
3333
"github.com/golang/protobuf/ptypes"
3434
"github.com/golang/protobuf/ptypes/any"
3535
"github.com/golang/protobuf/ptypes/duration"

0 commit comments

Comments
 (0)