[VOL-5051] - Build and deploy voltctl
[VOL-5152]
[VOL-4961]
[VOL-5063]
[VOL-4966]
[VOL-4893]
[VOL-4906]
go.mod
go.sum
vendor/modules.txt
------------------
o Update voltha-lib-go dep to 7.5.3
o Update voltha-protos dep to 5.4.11
o make mod-update
Makefile
makefiles/
o Add more repo:onf-make makefile logic
o make LOCAL_FIX_PERMS=1 mod-update need to work around docker perm problems.
internal/
pkg/
vendor/
---------
o Update copyright ending date to span 2024.
o make mod-update to regenerate vendor/
Change-Id: Ib89fd6a9cc15c7e08b1274b110dd8141832557e9
diff --git a/vendor/github.com/jhump/protoreflect/dynamic/equal.go b/vendor/github.com/jhump/protoreflect/dynamic/equal.go
index 5fbcc24..e44c6c5 100644
--- a/vendor/github.com/jhump/protoreflect/dynamic/equal.go
+++ b/vendor/github.com/jhump/protoreflect/dynamic/equal.go
@@ -13,6 +13,12 @@
// have the same message type and same fields set to equal values. For proto3 messages, fields set
// to their zero value are considered unset.
func Equal(a, b *Message) bool {
+ if a == b {
+ return true
+ }
+ if (a == nil) != (b == nil) {
+ return false
+ }
if a.md.GetFullyQualifiedName() != b.md.GetFullyQualifiedName() {
return false
}
@@ -128,25 +134,24 @@
return proto.Equal(a, b)
}
// Mixed
- if aok {
- md, err := desc.LoadMessageDescriptorForMessage(b)
- if err != nil {
- return false
- }
- db = NewMessageWithMessageFactory(md, da.mf)
- if db.ConvertFrom(b) != nil {
- return false
- }
- return Equal(da, db)
- } else {
- md, err := desc.LoadMessageDescriptorForMessage(a)
- if err != nil {
- return false
- }
- da = NewMessageWithMessageFactory(md, db.mf)
- if da.ConvertFrom(a) != nil {
- return false
- }
- return Equal(da, db)
+ if bok {
+ // we want a to be the dynamic one
+ b, da = a, db
}
+
+ // Instead of panic'ing below if we have a nil dynamic message, check
+ // now and return false if the input message is not also nil.
+ if da == nil {
+ return isNil(b)
+ }
+
+ md, err := desc.LoadMessageDescriptorForMessage(b)
+ if err != nil {
+ return false
+ }
+ db = NewMessageWithMessageFactory(md, da.mf)
+ if db.ConvertFrom(b) != nil {
+ return false
+ }
+ return Equal(da, db)
}