Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump google.golang.org/protobuf from 1.28.0 to 1.28.1 #4718

Merged
merged 5 commits into from
Aug 3, 2022
+11 −6
Merged

chore(deps): bump google.golang.org/protobuf from 1.28.0 to 1.28.1 #4718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c9e753
chore(deps): bump google.golang.org/protobuf from 1.28.0 to 1.28.1
dependabot[bot] Aug 1, 2022
15f52a2
Merge branch 'master' into dependabot/go_modules/google.golang.org/pr…
lahabana Aug 2, 2022
258db06
Merge branch 'master' into dependabot/go_modules/google.golang.org/pr…
lahabana Aug 2, 2022
d570c38
Merge branch 'master' into dependabot/go_modules/google.golang.org/pr…
lahabana Aug 2, 2022
790ceaa
test(xds/topology): use gocmp for equality testing
michaelbeaumont Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ require (
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
google.golang.org/protobuf v1.28.1
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.8.1
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,8 +2273,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
6 changes: 4 additions & 2 deletions pkg/xds/topology/dataplanes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package topology_test
import (
"net"

"github.com/google/go-cmp/cmp"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"google.golang.org/protobuf/proto"

mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
"github.com/kumahq/kuma/pkg/core"
Expand Down Expand Up @@ -73,7 +75,7 @@ var _ = Describe("Resolve Dataplane address", func() {

actual := topology.ResolveAddresses(core.Log, lif, given)
Expect(actual).To(HaveLen(4))
Expect(actual).To(Equal(expected))
Expect(expected).Should(BeComparableTo(expected, cmp.Comparer(proto.Equal)))
})
It("should skip dataplane if unable to resolve domain name", func() {
given := []*mesh.DataplaneResource{
Expand All @@ -91,7 +93,7 @@ var _ = Describe("Resolve Dataplane address", func() {
}
actual := topology.ResolveAddresses(core.Log, lif, given)
Expect(actual).To(HaveLen(3))
Expect(actual).To(Equal(expected))
Expect(expected).Should(BeComparableTo(expected, cmp.Comparer(proto.Equal)))
lahabana marked this conversation as resolved.
Show resolved Hide resolved
})
})
})
6 changes: 4 additions & 2 deletions pkg/xds/topology/router_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"time"

"github.com/google/go-cmp/cmp"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"

mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh"
Expand Down Expand Up @@ -604,7 +606,7 @@ var _ = Describe("TrafficRoute", func() {
// when
routes := BuildRouteMap(given.dataplane, given.routes)
// expect
Expect(routes).Should(Equal(given.expected))
Expect(routes).Should(BeComparableTo(given.expected, cmp.Comparer(proto.Equal)))
},
Entry("if an outbound interface has no matching TrafficRoute, the default route should be used", testCase{
dataplane: &core_mesh.DataplaneResource{
Expand Down Expand Up @@ -831,7 +833,7 @@ var _ = Describe("TrafficRoute", func() {
// when
destinations := BuildDestinationMap(given.dataplane, given.routes)
// expect
Expect(destinations).Should(Equal(given.expected))
Expect(destinations).Should(BeComparableTo(given.expected, cmp.Comparer(proto.Equal)))
},
Entry("Dataplane without outbound interfaces", testCase{
dataplane: core_mesh.NewDataplaneResource(),
Expand Down