rebase: rename kube-storage to csi-addons

as the org github.com/kube-storage is renamed
to github.com/csi-addons as the name kube-storage
was more generic.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

go.mod

@@ -6,13 +6,13 @@ require (
 	github.com/aws/aws-sdk-go v1.38.8
 	github.com/ceph/go-ceph v0.8.0
 	github.com/container-storage-interface/spec v1.3.0
+	github.com/csi-addons/replication-lib-utils v0.2.0
+	github.com/csi-addons/spec v0.1.0
 	github.com/go-logr/logr v0.2.1 // indirect
 	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a
-	github.com/kube-storage/replication-lib-utils v0.1.0
-	github.com/kube-storage/spec v0.1.0
 	github.com/kubernetes-csi/csi-lib-utils v0.7.0
 	github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1
 	github.com/libopenstorage/secrets v0.0.0-20201006135900-af310b01fe47

go.sum

@@ -273,6 +273,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/csi-addons/replication-lib-utils v0.2.0 h1:tGs42wfjkObbBo/98a3uxTFWEJ1dq5PIMqPWtdLd040=
+github.com/csi-addons/replication-lib-utils v0.2.0/go.mod h1:ROQlEsc2EerVtc/K/C+6Hx8pqaQ9MVy9xFFpyKfI9lc=
+github.com/csi-addons/spec v0.1.0 h1:y3TOd7qtnwBQPikGa1VvaL7ObyddAZehYW8DNGBlOyc=
+github.com/csi-addons/spec v0.1.0/go.mod h1:Mwq4iLiUV4s+K1bszcWU6aMsR5KPsbIYzzszJ6+56vI=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -516,9 +520,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-metrics-stackdriver v0.2.0/go.mod h1:KLcPyp3dWJAFD+yHisGlJSZktIsTjb50eB72U2YZ9K0=
@@ -802,10 +805,6 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kube-storage/replication-lib-utils v0.1.0 h1:8Q9eIsCZPblz1CURLjb/E1KZDDo9zSx4YlI/ILHJqR0=
-github.com/kube-storage/replication-lib-utils v0.1.0/go.mod h1:8Q9eIsCZPblz1CURLjb/E1KZDDo9zSx4YlI/ILHJqR0=
-github.com/kube-storage/spec v0.1.0 h1:7vsAQ2q6GpS3RkZFJqlm4VExvIXwXz/v+0DGoKxpIJY=
-github.com/kube-storage/spec v0.1.0/go.mod h1:aEM5cuaELIjQPTe4LdyAoR2XvkC5vtd1qz8LgGLf4BQ=
 github.com/kubernetes-csi/csi-lib-utils v0.7.0 h1:t1cS7HTD7z5D7h9iAdjWuHtMxJPb9s1fIv34rxytzqs=
 github.com/kubernetes-csi/csi-lib-utils v0.7.0/go.mod h1:bze+2G9+cmoHxN6+WyG1qT4MDxgZJMLGwc7V4acPNm0=
 github.com/kubernetes-csi/csi-test v2.0.0+incompatible/go.mod h1:YxJ4UiuPWIhMBkxUKY5c267DyA0uDZ/MtAimhx/2TA0=
@@ -1535,9 +1534,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 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/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=

internal/csi-common/server.go

@@ -24,9 +24,9 @@ import (
 	"sync"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/csi-addons/spec/lib/go/replication"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-	"github.com/kube-storage/spec/lib/go/replication"
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"

internal/csi-common/utils.go

@@ -26,8 +26,8 @@ import (
 	"github.com/ceph/ceph-csi/internal/util"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	rp "github.com/kube-storage/replication-lib-utils/protosanitizer"
+	rp "github.com/csi-addons/replication-lib-utils/protosanitizer"
-	"github.com/kube-storage/spec/lib/go/replication"
+	"github.com/csi-addons/spec/lib/go/replication"
 	"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

internal/rbd/replicationcontrollerserver.go

@@ -25,7 +25,7 @@ import (
 	"github.com/ceph/ceph-csi/internal/util"
 
 	librbd "github.com/ceph/go-ceph/rbd"
-	"github.com/kube-storage/spec/lib/go/replication"
+	"github.com/csi-addons/spec/lib/go/replication"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

vendor/github.com/csi-addons/replication-lib-utils/protosanitizer/protosanitizer.go

@@ -138,7 +138,7 @@ func isReplicationSecret(field *protobuf.FieldDescriptorProto) bool {
 }
 
 // eReplicationSecret represents the secret format at
-// https://github.com/kube-storage/spec/blob/v0.1.0/lib/go/replication/
+// https://github.com/csi-addons/spec/blob/v0.1.0/lib/go/replication/
 // replication.pb.go#L640-L649 .
 var eReplicationSecret = &proto.ExtensionDesc{
 	ExtendedType:  (*descriptorpb.FieldOptions)(nil),

vendor/github.com/google/go-cmp/cmp/compare.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // Package cmp determines equality of values.
 //
@@ -100,8 +100,8 @@ func Equal(x, y interface{}, opts ...Option) bool {
 // same input values and options.
 //
 // The output is displayed as a literal in pseudo-Go syntax.
-// At the start of each line, a "-" prefix indicates an element removed from x,
+// At the start of each line, a "-" prefix indicates an element removed from y,
-// a "+" prefix to indicates an element added from y, and the lack of a prefix
+// a "+" prefix to indicates an element added to y, and the lack of a prefix
 // indicates an element common to both x and y. If possible, the output
 // uses fmt.Stringer.String or error.Error methods to produce more humanly
 // readable outputs. In such cases, the string is prefixed with either an

vendor/github.com/google/go-cmp/cmp/export_panic.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build purego
 

vendor/github.com/google/go-cmp/cmp/export_unsafe.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build !purego
 

vendor/github.com/google/go-cmp/cmp/internal/diff/debug_disable.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build !cmp_debug
 

vendor/github.com/google/go-cmp/cmp/internal/diff/debug_enable.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build cmp_debug
 

vendor/github.com/google/go-cmp/cmp/internal/diff/diff.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // Package diff implements an algorithm for producing edit-scripts.
 // The edit-script is a sequence of operations needed to transform one list
@@ -119,7 +119,7 @@ func (r Result) Similar() bool {
 	return r.NumSame+1 >= r.NumDiff
 }
 
-var randBool = rand.New(rand.NewSource(time.Now().Unix())).Intn(2) == 0
+var randInt = rand.New(rand.NewSource(time.Now().Unix())).Intn(2)
 
 // Difference reports whether two lists of lengths nx and ny are equal
 // given the definition of equality provided as f.
@@ -168,6 +168,17 @@ func Difference(nx, ny int, f EqualFunc) (es EditScript) {
 	// A vertical edge is equivalent to inserting a symbol from list Y.
 	// A diagonal edge is equivalent to a matching symbol between both X and Y.
 
+	// To ensure flexibility in changing the algorithm in the future,
+	// introduce some degree of deliberate instability.
+	// This is achieved by fiddling the zigzag iterator to start searching
+	// the graph starting from the bottom-right versus than the top-left.
+	// The result may differ depending on the starting search location,
+	// but still produces a valid edit script.
+	zigzagInit := randInt // either 0 or 1
+	if flags.Deterministic {
+		zigzagInit = 0
+	}
+
 	// Invariants:
 	//	• 0 ≤ fwdPath.X ≤ (fwdFrontier.X, revFrontier.X) ≤ revPath.X ≤ nx
 	//	• 0 ≤ fwdPath.Y ≤ (fwdFrontier.Y, revFrontier.Y) ≤ revPath.Y ≤ ny
@@ -186,11 +197,6 @@ func Difference(nx, ny int, f EqualFunc) (es EditScript) {
 	// approximately the square-root of the search budget.
 	searchBudget := 4 * (nx + ny) // O(n)
 
-	// Running the tests with the "cmp_debug" build tag prints a visualization
-	// of the algorithm running in real-time. This is educational for
-	// understanding how the algorithm works. See debug_enable.go.
-	f = debug.Begin(nx, ny, f, &fwdPath.es, &revPath.es)
-
 	// The algorithm below is a greedy, meet-in-the-middle algorithm for
 	// computing sub-optimal edit-scripts between two lists.
 	//
@@ -208,28 +214,22 @@ func Difference(nx, ny int, f EqualFunc) (es EditScript) {
 	//	frontier towards the opposite corner.
 	//	• This algorithm terminates when either the X coordinates or the
 	//	Y coordinates of the forward and reverse frontier points ever intersect.
-
+	//
 	// This algorithm is correct even if searching only in the forward direction
 	// or in the reverse direction. We do both because it is commonly observed
 	// that two lists commonly differ because elements were added to the front
 	// or end of the other list.
 	//
-	// Non-deterministically start with either the forward or reverse direction
+	// Running the tests with the "cmp_debug" build tag prints a visualization
-	// to introduce some deliberate instability so that we have the flexibility
+	// of the algorithm running in real-time. This is educational for
-	// to change this algorithm in the future.
+	// understanding how the algorithm works. See debug_enable.go.
-	if flags.Deterministic || randBool {
+	f = debug.Begin(nx, ny, f, &fwdPath.es, &revPath.es)
-		goto forwardSearch
+	for {
-	} else {
-		goto reverseSearch
-	}
-
-forwardSearch:
-	{
 		// Forward search from the beginning.
 		if fwdFrontier.X >= revFrontier.X || fwdFrontier.Y >= revFrontier.Y || searchBudget == 0 {
-			goto finishSearch
+			break
 		}
-		for stop1, stop2, i := false, false, 0; !(stop1 && stop2) && searchBudget > 0; i++ {
+		for stop1, stop2, i := false, false, zigzagInit; !(stop1 && stop2) && searchBudget > 0; i++ {
 			// Search in a diagonal pattern for a match.
 			z := zigzag(i)
 			p := point{fwdFrontier.X + z, fwdFrontier.Y - z}
@@ -262,14 +262,10 @@ forwardSearch:
 		} else {
 			fwdFrontier.Y++
 		}
-		goto reverseSearch
-	}
 
-reverseSearch:
-	{
 		// Reverse search from the end.
 		if fwdFrontier.X >= revFrontier.X || fwdFrontier.Y >= revFrontier.Y || searchBudget == 0 {
-			goto finishSearch
+			break
 		}
 		for stop1, stop2, i := false, false, 0; !(stop1 && stop2) && searchBudget > 0; i++ {
 			// Search in a diagonal pattern for a match.
@@ -304,10 +300,8 @@ reverseSearch:
 		} else {
 			revFrontier.Y--
 		}
-		goto forwardSearch
 	}
 
-finishSearch:
 	// Join the forward and reverse paths and then append the reverse path.
 	fwdPath.connect(revPath.point, f)
 	for i := len(revPath.es) - 1; i >= 0; i-- {

vendor/github.com/google/go-cmp/cmp/internal/flags/flags.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package flags
 

vendor/github.com/google/go-cmp/cmp/internal/flags/toolchain_legacy.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build !go1.10
 

vendor/github.com/google/go-cmp/cmp/internal/flags/toolchain_recent.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build go1.10
 

vendor/github.com/google/go-cmp/cmp/internal/function/func.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // Package function provides functionality for identifying function types.
 package function

vendor/github.com/google/go-cmp/cmp/internal/value/name.go

@@ -1,6 +1,6 @@
 // Copyright 2020, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package value
 

vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go

@@ -1,6 +1,6 @@
 // Copyright 2018, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build purego
 

vendor/github.com/google/go-cmp/cmp/internal/value/pointer_unsafe.go

@@ -1,6 +1,6 @@
 // Copyright 2018, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 // +build !purego
 

vendor/github.com/google/go-cmp/cmp/internal/value/sort.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package value
 

vendor/github.com/google/go-cmp/cmp/internal/value/zero.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package value
 

vendor/github.com/google/go-cmp/cmp/options.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/github.com/google/go-cmp/cmp/path.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/github.com/google/go-cmp/cmp/report.go

@@ -1,6 +1,6 @@
 // Copyright 2017, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/github.com/google/go-cmp/cmp/report_compare.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 
@@ -79,7 +79,7 @@ func (opts formatOptions) verbosity() uint {
 	}
 }
 
-const maxVerbosityPreset = 6
+const maxVerbosityPreset = 3
 
 // verbosityPreset modifies the verbosity settings given an index
 // between 0 and maxVerbosityPreset, inclusive.
@@ -100,7 +100,7 @@ func verbosityPreset(opts formatOptions, i int) formatOptions {
 func (opts formatOptions) FormatDiff(v *valueNode, ptrs *pointerReferences) (out textNode) {
 	if opts.DiffMode == diffIdentical {
 		opts = opts.WithVerbosity(1)
-	} else if opts.verbosity() < 3 {
+	} else {
 		opts = opts.WithVerbosity(3)
 	}
 

vendor/github.com/google/go-cmp/cmp/report_references.go

@@ -1,6 +1,6 @@
 // Copyright 2020, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/github.com/google/go-cmp/cmp/report_reflect.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 
@@ -351,8 +351,6 @@ func formatMapKey(v reflect.Value, disambiguate bool, ptrs *pointerReferences) s
 	opts.PrintAddresses = disambiguate
 	opts.AvoidStringer = disambiguate
 	opts.QualifiedNames = disambiguate
-	opts.VerbosityLevel = maxVerbosityPreset
-	opts.LimitVerbosity = true
 	s := opts.FormatValue(v, reflect.Map, ptrs).String()
 	return strings.TrimSpace(s)
 }

vendor/github.com/google/go-cmp/cmp/report_slices.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 
@@ -26,6 +26,8 @@ func (opts formatOptions) CanFormatDiffSlice(v *valueNode) bool {
 		return false // No differences detected
 	case !v.ValueX.IsValid() || !v.ValueY.IsValid():
 		return false // Both values must be valid
+	case v.Type.Kind() == reflect.Slice && (v.ValueX.Len() == 0 || v.ValueY.Len() == 0):
+		return false // Both slice values have to be non-empty
 	case v.NumIgnored > 0:
 		return false // Some ignore option was used
 	case v.NumTransformed > 0:
@@ -43,16 +45,7 @@ func (opts formatOptions) CanFormatDiffSlice(v *valueNode) bool {
 		return false
 	}
 
-	// Check whether this is an interface with the same concrete types.
+	switch t := v.Type; t.Kind() {
-	t := v.Type
-	vx, vy := v.ValueX, v.ValueY
-	if t.Kind() == reflect.Interface && !vx.IsNil() && !vy.IsNil() && vx.Elem().Type() == vy.Elem().Type() {
-		vx, vy = vx.Elem(), vy.Elem()
-		t = vx.Type()
-	}
-
-	// Check whether we provide specialized diffing for this type.
-	switch t.Kind() {
 	case reflect.String:
 	case reflect.Array, reflect.Slice:
 		// Only slices of primitive types have specialized handling.
@@ -64,11 +57,6 @@ func (opts formatOptions) CanFormatDiffSlice(v *valueNode) bool {
 			return false
 		}
 
-		// Both slice values have to be non-empty.
-		if t.Kind() == reflect.Slice && (vx.Len() == 0 || vy.Len() == 0) {
-			return false
-		}
-
 		// If a sufficient number of elements already differ,
 		// use specialized formatting even if length requirement is not met.
 		if v.NumDiff > v.NumSame {
@@ -80,7 +68,7 @@ func (opts formatOptions) CanFormatDiffSlice(v *valueNode) bool {
 
 	// Use specialized string diffing for longer slices or strings.
 	const minLength = 64
-	return vx.Len() >= minLength && vy.Len() >= minLength
+	return v.ValueX.Len() >= minLength && v.ValueY.Len() >= minLength
 }
 
 // FormatDiffSlice prints a diff for the slices (or strings) represented by v.
@@ -89,11 +77,6 @@ func (opts formatOptions) CanFormatDiffSlice(v *valueNode) bool {
 func (opts formatOptions) FormatDiffSlice(v *valueNode) textNode {
 	assert(opts.DiffMode == diffUnknown)
 	t, vx, vy := v.Type, v.ValueX, v.ValueY
-	if t.Kind() == reflect.Interface {
-		vx, vy = vx.Elem(), vy.Elem()
-		t = vx.Type()
-		opts = opts.WithTypeMode(emitType)
-	}
 
 	// Auto-detect the type of the data.
 	var isLinedText, isText, isBinary bool

vendor/github.com/google/go-cmp/cmp/report_text.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/github.com/google/go-cmp/cmp/report_value.go

@@ -1,6 +1,6 @@
 // Copyright 2019, The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// license that can be found in the LICENSE.md file.
 
 package cmp
 

vendor/google.golang.org/protobuf/encoding/prototext/decode.go

@@ -6,6 +6,7 @@ package prototext
 
 import (
 	"fmt"
+	"strings"
 	"unicode/utf8"
 
 	"google.golang.org/protobuf/internal/encoding/messageset"
@@ -22,7 +23,6 @@ import (
 )
 
 // Unmarshal reads the given []byte into the given proto.Message.
-// The provided message must be mutable (e.g., a non-nil pointer to a message).
 func Unmarshal(b []byte, m proto.Message) error {
 	return UnmarshalOptions{}.Unmarshal(b, m)
 }
@@ -51,9 +51,8 @@ type UnmarshalOptions struct {
 	}
 }
 
-// Unmarshal reads the given []byte and populates the given proto.Message
+// Unmarshal reads the given []byte and populates the given proto.Message using options in
-// using options in the UnmarshalOptions object.
+// UnmarshalOptions object.
-// The provided message must be mutable (e.g., a non-nil pointer to a message).
 func (o UnmarshalOptions) Unmarshal(b []byte, m proto.Message) error {
 	return o.unmarshal(b, m)
 }
@@ -159,11 +158,21 @@ func (d decoder) unmarshalMessage(m pref.Message, checkDelims bool) error {
 		switch tok.NameKind() {
 		case text.IdentName:
 			name = pref.Name(tok.IdentName())
-			fd = fieldDescs.ByTextName(string(name))
+			fd = fieldDescs.ByName(name)
+			if fd == nil {
+				// The proto name of a group field is in all lowercase,
+				// while the textproto field name is the group message name.
+				gd := fieldDescs.ByName(pref.Name(strings.ToLower(string(name))))
+				if gd != nil && gd.Kind() == pref.GroupKind && gd.Message().Name() == name {
+					fd = gd
+				}
+			} else if fd.Kind() == pref.GroupKind && fd.Message().Name() != name {
+				fd = nil // reset since field name is actually the message name
+			}
 
 		case text.TypeName:
 			// Handle extensions only. This code path is not for Any.
-			xt, xtErr = d.opts.Resolver.FindExtensionByName(pref.FullName(tok.TypeName()))
+			xt, xtErr = d.findExtension(pref.FullName(tok.TypeName()))
 
 		case text.FieldNumber:
 			isFieldNumberName = true
@@ -260,6 +269,15 @@ func (d decoder) unmarshalMessage(m pref.Message, checkDelims bool) error {
 	return nil
 }
 
+// findExtension returns protoreflect.ExtensionType from the Resolver if found.
+func (d decoder) findExtension(xtName pref.FullName) (pref.ExtensionType, error) {
+	xt, err := d.opts.Resolver.FindExtensionByName(xtName)
+	if err == nil {
+		return xt, nil
+	}
+	return messageset.FindMessageSetExtension(d.opts.Resolver, xtName)
+}
+
 // unmarshalSingular unmarshals a non-repeated field value specified by the
 // given FieldDescriptor.
 func (d decoder) unmarshalSingular(fd pref.FieldDescriptor, m pref.Message) error {

vendor/google.golang.org/protobuf/encoding/prototext/encode.go

@@ -6,6 +6,7 @@ package prototext
 
 import (
 	"fmt"
+	"sort"
 	"strconv"
 	"unicode/utf8"
 
@@ -15,11 +16,10 @@ import (
 	"google.golang.org/protobuf/internal/errors"
 	"google.golang.org/protobuf/internal/flags"
 	"google.golang.org/protobuf/internal/genid"
-	"google.golang.org/protobuf/internal/order"
+	"google.golang.org/protobuf/internal/mapsort"
 	"google.golang.org/protobuf/internal/pragma"
 	"google.golang.org/protobuf/internal/strs"
 	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
@@ -169,15 +169,35 @@ func (e encoder) marshalMessage(m pref.Message, inclDelims bool) error {
 		// If unable to expand, continue on to marshal Any as a regular message.
 	}
 
-	// Marshal fields.
+	// Marshal known fields.
-	var err error
+	fieldDescs := messageDesc.Fields()
-	order.RangeFields(m, order.IndexNameFieldOrder, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
+	size := fieldDescs.Len()
-		if err = e.marshalField(fd.TextName(), v, fd); err != nil {
+	for i := 0; i < size; {
-			return false
+		fd := fieldDescs.Get(i)
+		if od := fd.ContainingOneof(); od != nil {
+			fd = m.WhichOneof(od)
+			i += od.Fields().Len()
+		} else {
+			i++
 		}
-		return true
+
-	})
+		if fd == nil || !m.Has(fd) {
-	if err != nil {
+			continue
+		}
+
+		name := fd.Name()
+		// Use type name for group field name.
+		if fd.Kind() == pref.GroupKind {
+			name = fd.Message().Name()
+		}
+		val := m.Get(fd)
+		if err := e.marshalField(string(name), val, fd); err != nil {
+			return err
+		}
+	}
+
+	// Marshal extensions.
+	if err := e.marshalExtensions(m); err != nil {
 		return err
 	}
 
@@ -270,7 +290,7 @@ func (e encoder) marshalList(name string, list pref.List, fd pref.FieldDescripto
 // marshalMap marshals the given protoreflect.Map as multiple name-value fields.
 func (e encoder) marshalMap(name string, mmap pref.Map, fd pref.FieldDescriptor) error {
 	var err error
-	order.RangeEntries(mmap, order.GenericKeyOrder, func(key pref.MapKey, val pref.Value) bool {
+	mapsort.Range(mmap, fd.MapKey().Kind(), func(key pref.MapKey, val pref.Value) bool {
 		e.WriteName(name)
 		e.StartMessage()
 		defer e.EndMessage()
@@ -291,6 +311,48 @@ func (e encoder) marshalMap(name string, mmap pref.Map, fd pref.FieldDescriptor)
 	return err
 }
 
+// marshalExtensions marshals extension fields.
+func (e encoder) marshalExtensions(m pref.Message) error {
+	type entry struct {
+		key   string
+		value pref.Value
+		desc  pref.FieldDescriptor
+	}
+
+	// Get a sorted list based on field key first.
+	var entries []entry
+	m.Range(func(fd pref.FieldDescriptor, v pref.Value) bool {
+		if !fd.IsExtension() {
+			return true
+		}
+		// For MessageSet extensions, the name used is the parent message.
+		name := fd.FullName()
+		if messageset.IsMessageSetExtension(fd) {
+			name = name.Parent()
+		}
+		entries = append(entries, entry{
+			key:   string(name),
+			value: v,
+			desc:  fd,
+		})
+		return true
+	})
+	// Sort extensions lexicographically.
+	sort.Slice(entries, func(i, j int) bool {
+		return entries[i].key < entries[j].key
+	})
+
+	// Write out sorted list.
+	for _, entry := range entries {
+		// Extension field name is the proto field name enclosed in [].
+		name := "[" + entry.key + "]"
+		if err := e.marshalField(name, entry.value, entry.desc); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // marshalUnknown parses the given []byte and marshals fields out.
 // This function assumes proper encoding in the given []byte.
 func (e encoder) marshalUnknown(b []byte) {

vendor/google.golang.org/protobuf/internal/descfmt/stringer.go

@@ -42,8 +42,6 @@ func formatListOpt(vs list, isRoot, allowMulti bool) string {
 			name = "FileImports"
 		case pref.Descriptor:
 			name = reflect.ValueOf(vs).MethodByName("Get").Type().Out(0).Name() + "s"
-		default:
-			name = reflect.ValueOf(vs).Elem().Type().Name()
 		}
 		start, end = name+"{", "}"
 	}

vendor/google.golang.org/protobuf/internal/detrand/rand.go

@@ -26,14 +26,6 @@ func Bool() bool {
 	return randSeed%2 == 1
 }
 
-// Intn returns a deterministically random integer between 0 and n-1, inclusive.
-func Intn(n int) int {
-	if n <= 0 {
-		panic("must be positive")
-	}
-	return int(randSeed % uint64(n))
-}
-
 // randSeed is a best-effort at an approximate hash of the Go binary.
 var randSeed = binaryHash()
 

vendor/google.golang.org/protobuf/internal/encoding/messageset/messageset.go

@@ -11,9 +11,10 @@ import (
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/internal/errors"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
+	preg "google.golang.org/protobuf/reflect/protoregistry"
 )
 
-// The MessageSet wire format is equivalent to a message defined as follows,
+// The MessageSet wire format is equivalent to a message defiend as follows,
 // where each Item defines an extension field with a field number of 'type_id'
 // and content of 'message'. MessageSet extensions must be non-repeated message
 // fields.
@@ -47,17 +48,33 @@ func IsMessageSet(md pref.MessageDescriptor) bool {
 	return ok && xmd.IsMessageSet()
 }
 
-// IsMessageSetExtension reports this field properly extends a MessageSet.
+// IsMessageSetExtension reports this field extends a MessageSet.
 func IsMessageSetExtension(fd pref.FieldDescriptor) bool {
-	switch {
+	if fd.Name() != ExtensionName {
-	case fd.Name() != ExtensionName:
-		return false
-	case !IsMessageSet(fd.ContainingMessage()):
-		return false
-	case fd.FullName().Parent() != fd.Message().FullName():
 		return false
 	}
-	return true
+	if fd.FullName().Parent() != fd.Message().FullName() {
+		return false
+	}
+	return IsMessageSet(fd.ContainingMessage())
+}
+
+// FindMessageSetExtension locates a MessageSet extension field by name.
+// In text and JSON formats, the extension name used is the message itself.
+// The extension field name is derived by appending ExtensionName.
+func FindMessageSetExtension(r preg.ExtensionTypeResolver, s pref.FullName) (pref.ExtensionType, error) {
+	name := s.Append(ExtensionName)
+	xt, err := r.FindExtensionByName(name)
+	if err != nil {
+		if err == preg.NotFound {
+			return nil, err
+		}
+		return nil, errors.Wrap(err, "%q", name)
+	}
+	if !IsMessageSetExtension(xt.TypeDescriptor()) {
+		return nil, preg.NotFound
+	}
+	return xt, nil
 }
 
 // SizeField returns the size of a MessageSet item field containing an extension

vendor/google.golang.org/protobuf/internal/encoding/tag/tag.go

@@ -104,7 +104,7 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
 		case strings.HasPrefix(s, "json="):
 			jsonName := s[len("json="):]
 			if jsonName != strs.JSONCamelCase(string(f.L0.FullName.Name())) {
-				f.L1.StringName.InitJSON(jsonName)
+				f.L1.JSONName.Init(jsonName)
 			}
 		case s == "packed":
 			f.L1.HasPacked = true

vendor/google.golang.org/protobuf/internal/encoding/text/encode.go

@@ -32,6 +32,7 @@ type Encoder struct {
 	encoderState
 
 	indent      string
+	newline     string // set to "\n" if len(indent) > 0
 	delims      [2]byte
 	outputASCII bool
 }
@@ -60,6 +61,7 @@ func NewEncoder(indent string, delims [2]byte, outputASCII bool) (*Encoder, erro
 			return nil, errors.New("indent may only be composed of space and tab characters")
 		}
 		e.indent = indent
+		e.newline = "\n"
 	}
 	switch delims {
 	case [2]byte{0, 0}:
@@ -124,7 +126,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 			// are used to represent both the proto string and bytes type.
 			r = rune(in[0])
 			fallthrough
-		case r < ' ' || r == '"' || r == '\\' || r == 0x7f:
+		case r < ' ' || r == '"' || r == '\\':
 			out = append(out, '\\')
 			switch r {
 			case '"', '\\':
@@ -141,7 +143,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 				out = strconv.AppendUint(out, uint64(r), 16)
 			}
 			in = in[n:]
-		case r >= utf8.RuneSelf && (outputASCII || r <= 0x009f):
+		case outputASCII && r >= utf8.RuneSelf:
 			out = append(out, '\\')
 			if r <= math.MaxUint16 {
 				out = append(out, 'u')
@@ -166,7 +168,7 @@ func appendString(out []byte, in string, outputASCII bool) []byte {
 // escaping. If no characters need escaping, this returns the input length.
 func indexNeedEscapeInString(s string) int {
 	for i := 0; i < len(s); i++ {
-		if c := s[i]; c < ' ' || c == '"' || c == '\'' || c == '\\' || c >= 0x7f {
+		if c := s[i]; c < ' ' || c == '"' || c == '\'' || c == '\\' || c >= utf8.RuneSelf {
 			return i
 		}
 	}

vendor/google.golang.org/protobuf/internal/fieldsort/fieldsort.go

@@ -0,0 +1,40 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package fieldsort defines an ordering of fields.
+//
+// The ordering defined by this package matches the historic behavior of the proto
+// package, placing extensions first and oneofs last.
+//
+// There is no guarantee about stability of the wire encoding, and users should not
+// depend on the order defined in this package as it is subject to change without
+// notice.
+package fieldsort
+
+import (
+	"google.golang.org/protobuf/reflect/protoreflect"
+)
+
+// Less returns true if field a comes before field j in ordered wire marshal output.
+func Less(a, b protoreflect.FieldDescriptor) bool {
+	ea := a.IsExtension()
+	eb := b.IsExtension()
+	oa := a.ContainingOneof()
+	ob := b.ContainingOneof()
+	switch {
+	case ea != eb:
+		return ea
+	case oa != nil && ob != nil:
+		if oa == ob {
+			return a.Number() < b.Number()
+		}
+		return oa.Index() < ob.Index()
+	case oa != nil && !oa.IsSynthetic():
+		return false
+	case ob != nil && !ob.IsSynthetic():
+		return true
+	default:
+		return a.Number() < b.Number()
+	}
+}

vendor/google.golang.org/protobuf/internal/filedesc/build.go

@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.
 
 // Package filedesc provides functionality for constructing descriptors.
-//
-// The types in this package implement interfaces in the protoreflect package
-// related to protobuf descripriptors.
 package filedesc
 
 import (

vendor/google.golang.org/protobuf/internal/filedesc/desc.go

@@ -13,7 +13,6 @@ import (
 	"google.golang.org/protobuf/internal/descfmt"
 	"google.golang.org/protobuf/internal/descopts"
 	"google.golang.org/protobuf/internal/encoding/defval"
-	"google.golang.org/protobuf/internal/encoding/messageset"
 	"google.golang.org/protobuf/internal/genid"
 	"google.golang.org/protobuf/internal/pragma"
 	"google.golang.org/protobuf/internal/strs"
@@ -100,6 +99,15 @@ func (fd *File) lazyInitOnce() {
 	fd.mu.Unlock()
 }
 
+// ProtoLegacyRawDesc is a pseudo-internal API for allowing the v1 code
+// to be able to retrieve the raw descriptor.
+//
+// WARNING: This method is exempt from the compatibility promise and may be
+// removed in the future without warning.
+func (fd *File) ProtoLegacyRawDesc() []byte {
+	return fd.builder.RawDescriptor
+}
+
 // GoPackagePath is a pseudo-internal API for determining the Go package path
 // that this file descriptor is declared in.
 //
@@ -199,7 +207,7 @@ type (
 		Number           pref.FieldNumber
 		Cardinality      pref.Cardinality // must be consistent with Message.RequiredNumbers
 		Kind             pref.Kind
-		StringName       stringName
+		JSONName         jsonName
 		IsProto3Optional bool // promoted from google.protobuf.FieldDescriptorProto
 		IsWeak           bool // promoted from google.protobuf.FieldOptions
 		HasPacked        bool // promoted from google.protobuf.FieldOptions
@@ -269,9 +277,8 @@ func (fd *Field) Options() pref.ProtoMessage {
 func (fd *Field) Number() pref.FieldNumber      { return fd.L1.Number }
 func (fd *Field) Cardinality() pref.Cardinality { return fd.L1.Cardinality }
 func (fd *Field) Kind() pref.Kind               { return fd.L1.Kind }
-func (fd *Field) HasJSONName() bool             { return fd.L1.StringName.hasJSON }
+func (fd *Field) HasJSONName() bool             { return fd.L1.JSONName.has }
-func (fd *Field) JSONName() string              { return fd.L1.StringName.getJSON(fd) }
+func (fd *Field) JSONName() string              { return fd.L1.JSONName.get(fd) }
-func (fd *Field) TextName() string              { return fd.L1.StringName.getText(fd) }
 func (fd *Field) HasPresence() bool {
 	return fd.L1.Cardinality != pref.Repeated && (fd.L0.ParentFile.L1.Syntax == pref.Proto2 || fd.L1.Message != nil || fd.L1.ContainingOneof != nil)
 }
@@ -366,7 +373,7 @@ type (
 	}
 	ExtensionL2 struct {
 		Options          func() pref.ProtoMessage
-		StringName       stringName
+		JSONName         jsonName
 		IsProto3Optional bool // promoted from google.protobuf.FieldDescriptorProto
 		IsPacked         bool // promoted from google.protobuf.FieldOptions
 		Default          defaultValue
@@ -384,9 +391,8 @@ func (xd *Extension) Options() pref.ProtoMessage {
 func (xd *Extension) Number() pref.FieldNumber      { return xd.L1.Number }
 func (xd *Extension) Cardinality() pref.Cardinality { return xd.L1.Cardinality }
 func (xd *Extension) Kind() pref.Kind               { return xd.L1.Kind }
-func (xd *Extension) HasJSONName() bool             { return xd.lazyInit().StringName.hasJSON }
+func (xd *Extension) HasJSONName() bool             { return xd.lazyInit().JSONName.has }
-func (xd *Extension) JSONName() string              { return xd.lazyInit().StringName.getJSON(xd) }
+func (xd *Extension) JSONName() string              { return xd.lazyInit().JSONName.get(xd) }
-func (xd *Extension) TextName() string              { return xd.lazyInit().StringName.getText(xd) }
 func (xd *Extension) HasPresence() bool             { return xd.L1.Cardinality != pref.Repeated }
 func (xd *Extension) HasOptionalKeyword() bool {
 	return (xd.L0.ParentFile.L1.Syntax == pref.Proto2 && xd.L1.Cardinality == pref.Optional) || xd.lazyInit().IsProto3Optional
@@ -500,50 +506,27 @@ func (d *Base) Syntax() pref.Syntax                 { return d.L0.ParentFile.Syn
 func (d *Base) IsPlaceholder() bool                 { return false }
 func (d *Base) ProtoInternal(pragma.DoNotImplement) {}
 
-type stringName struct {
+type jsonName struct {
-	hasJSON  bool
+	has  bool
-	once     sync.Once
+	once sync.Once
-	nameJSON string
+	name string
-	nameText string
 }
 
-// InitJSON initializes the name. It is exported for use by other internal packages.
+// Init initializes the name. It is exported for use by other internal packages.
-func (s *stringName) InitJSON(name string) {
+func (js *jsonName) Init(s string) {
-	s.hasJSON = true
+	js.has = true
-	s.nameJSON = name
+	js.name = s
 }
 
-func (s *stringName) lazyInit(fd pref.FieldDescriptor) *stringName {
+func (js *jsonName) get(fd pref.FieldDescriptor) string {
-	s.once.Do(func() {
+	if !js.has {
-		if fd.IsExtension() {
+		js.once.Do(func() {
-			// For extensions, JSON and text are formatted the same way.
+			js.name = strs.JSONCamelCase(string(fd.Name()))
-			var name string
+		})
-			if messageset.IsMessageSetExtension(fd) {
+	}
-				name = string("[" + fd.FullName().Parent() + "]")
+	return js.name
-			} else {
-				name = string("[" + fd.FullName() + "]")
-			}
-			s.nameJSON = name
-			s.nameText = name
-		} else {
-			// Format the JSON name.
-			if !s.hasJSON {
-				s.nameJSON = strs.JSONCamelCase(string(fd.Name()))
-			}
-
-			// Format the text name.
-			s.nameText = string(fd.Name())
-			if fd.Kind() == pref.GroupKind {
-				s.nameText = string(fd.Message().Name())
-			}
-		}
-	})
-	return s
 }
 
-func (s *stringName) getJSON(fd pref.FieldDescriptor) string { return s.lazyInit(fd).nameJSON }
-func (s *stringName) getText(fd pref.FieldDescriptor) string { return s.lazyInit(fd).nameText }
-
 func DefaultValue(v pref.Value, ev pref.EnumValueDescriptor) defaultValue {
 	dv := defaultValue{has: v.IsValid(), val: v, enum: ev}
 	if b, ok := v.Interface().([]byte); ok {

vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go

@@ -451,7 +451,7 @@ func (fd *Field) unmarshalFull(b []byte, sb *strs.Builder, pf *File, pd pref.Des
 			case genid.FieldDescriptorProto_Name_field_number:
 				fd.L0.FullName = appendFullName(sb, pd.FullName(), v)
 			case genid.FieldDescriptorProto_JsonName_field_number:
-				fd.L1.StringName.InitJSON(sb.MakeString(v))
+				fd.L1.JSONName.Init(sb.MakeString(v))
 			case genid.FieldDescriptorProto_DefaultValue_field_number:
 				fd.L1.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveMessages
 			case genid.FieldDescriptorProto_TypeName_field_number:
@@ -551,7 +551,7 @@ func (xd *Extension) unmarshalFull(b []byte, sb *strs.Builder) {
 			b = b[m:]
 			switch num {
 			case genid.FieldDescriptorProto_JsonName_field_number:
-				xd.L2.StringName.InitJSON(sb.MakeString(v))
+				xd.L2.JSONName.Init(sb.MakeString(v))
 			case genid.FieldDescriptorProto_DefaultValue_field_number:
 				xd.L2.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveExtensions
 			case genid.FieldDescriptorProto_TypeName_field_number:

vendor/google.golang.org/protobuf/internal/filedesc/desc_list.go

@@ -6,12 +6,9 @@ package filedesc
 
 import (
 	"fmt"
-	"math"
 	"sort"
 	"sync"
 
-	"google.golang.org/protobuf/internal/genid"
-
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/internal/descfmt"
 	"google.golang.org/protobuf/internal/errors"
@@ -248,7 +245,6 @@ type OneofFields struct {
 	once   sync.Once
 	byName map[pref.Name]pref.FieldDescriptor        // protected by once
 	byJSON map[string]pref.FieldDescriptor           // protected by once
-	byText map[string]pref.FieldDescriptor           // protected by once
 	byNum  map[pref.FieldNumber]pref.FieldDescriptor // protected by once
 }
 
@@ -256,7 +252,6 @@ func (p *OneofFields) Len() int                                         { return
 func (p *OneofFields) Get(i int) pref.FieldDescriptor                   { return p.List[i] }
 func (p *OneofFields) ByName(s pref.Name) pref.FieldDescriptor          { return p.lazyInit().byName[s] }
 func (p *OneofFields) ByJSONName(s string) pref.FieldDescriptor         { return p.lazyInit().byJSON[s] }
-func (p *OneofFields) ByTextName(s string) pref.FieldDescriptor         { return p.lazyInit().byText[s] }
 func (p *OneofFields) ByNumber(n pref.FieldNumber) pref.FieldDescriptor { return p.lazyInit().byNum[n] }
 func (p *OneofFields) Format(s fmt.State, r rune)                       { descfmt.FormatList(s, r, p) }
 func (p *OneofFields) ProtoInternal(pragma.DoNotImplement)              {}
@@ -266,13 +261,11 @@ func (p *OneofFields) lazyInit() *OneofFields {
 		if len(p.List) > 0 {
 			p.byName = make(map[pref.Name]pref.FieldDescriptor, len(p.List))
 			p.byJSON = make(map[string]pref.FieldDescriptor, len(p.List))
-			p.byText = make(map[string]pref.FieldDescriptor, len(p.List))
 			p.byNum = make(map[pref.FieldNumber]pref.FieldDescriptor, len(p.List))
 			for _, f := range p.List {
 				// Field names and numbers are guaranteed to be unique.
 				p.byName[f.Name()] = f
 				p.byJSON[f.JSONName()] = f
-				p.byText[f.TextName()] = f
 				p.byNum[f.Number()] = f
 			}
 		}
@@ -281,170 +274,9 @@ func (p *OneofFields) lazyInit() *OneofFields {
 }
 
 type SourceLocations struct {
-	// List is a list of SourceLocations.
-	// The SourceLocation.Next field does not need to be populated
-	// as it will be lazily populated upon first need.
 	List []pref.SourceLocation
-
-	// File is the parent file descriptor that these locations are relative to.
-	// If non-nil, ByDescriptor verifies that the provided descriptor
-	// is a child of this file descriptor.
-	File pref.FileDescriptor
-
-	once   sync.Once
-	byPath map[pathKey]int
 }
 
-func (p *SourceLocations) Len() int                      { return len(p.List) }
+func (p *SourceLocations) Len() int                            { return len(p.List) }
-func (p *SourceLocations) Get(i int) pref.SourceLocation { return p.lazyInit().List[i] }
+func (p *SourceLocations) Get(i int) pref.SourceLocation       { return p.List[i] }
-func (p *SourceLocations) byKey(k pathKey) pref.SourceLocation {
-	if i, ok := p.lazyInit().byPath[k]; ok {
-		return p.List[i]
-	}
-	return pref.SourceLocation{}
-}
-func (p *SourceLocations) ByPath(path pref.SourcePath) pref.SourceLocation {
-	return p.byKey(newPathKey(path))
-}
-func (p *SourceLocations) ByDescriptor(desc pref.Descriptor) pref.SourceLocation {
-	if p.File != nil && desc != nil && p.File != desc.ParentFile() {
-		return pref.SourceLocation{} // mismatching parent files
-	}
-	var pathArr [16]int32
-	path := pathArr[:0]
-	for {
-		switch desc.(type) {
-		case pref.FileDescriptor:
-			// Reverse the path since it was constructed in reverse.
-			for i, j := 0, len(path)-1; i < j; i, j = i+1, j-1 {
-				path[i], path[j] = path[j], path[i]
-			}
-			return p.byKey(newPathKey(path))
-		case pref.MessageDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.FileDescriptor:
-				path = append(path, int32(genid.FileDescriptorProto_MessageType_field_number))
-			case pref.MessageDescriptor:
-				path = append(path, int32(genid.DescriptorProto_NestedType_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		case pref.FieldDescriptor:
-			isExtension := desc.(pref.FieldDescriptor).IsExtension()
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			if isExtension {
-				switch desc.(type) {
-				case pref.FileDescriptor:
-					path = append(path, int32(genid.FileDescriptorProto_Extension_field_number))
-				case pref.MessageDescriptor:
-					path = append(path, int32(genid.DescriptorProto_Extension_field_number))
-				default:
-					return pref.SourceLocation{}
-				}
-			} else {
-				switch desc.(type) {
-				case pref.MessageDescriptor:
-					path = append(path, int32(genid.DescriptorProto_Field_field_number))
-				default:
-					return pref.SourceLocation{}
-				}
-			}
-		case pref.OneofDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.MessageDescriptor:
-				path = append(path, int32(genid.DescriptorProto_OneofDecl_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		case pref.EnumDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.FileDescriptor:
-				path = append(path, int32(genid.FileDescriptorProto_EnumType_field_number))
-			case pref.MessageDescriptor:
-				path = append(path, int32(genid.DescriptorProto_EnumType_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		case pref.EnumValueDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.EnumDescriptor:
-				path = append(path, int32(genid.EnumDescriptorProto_Value_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		case pref.ServiceDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.FileDescriptor:
-				path = append(path, int32(genid.FileDescriptorProto_Service_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		case pref.MethodDescriptor:
-			path = append(path, int32(desc.Index()))
-			desc = desc.Parent()
-			switch desc.(type) {
-			case pref.ServiceDescriptor:
-				path = append(path, int32(genid.ServiceDescriptorProto_Method_field_number))
-			default:
-				return pref.SourceLocation{}
-			}
-		default:
-			return pref.SourceLocation{}
-		}
-	}
-}
-func (p *SourceLocations) lazyInit() *SourceLocations {
-	p.once.Do(func() {
-		if len(p.List) > 0 {
-			// Collect all the indexes for a given path.
-			pathIdxs := make(map[pathKey][]int, len(p.List))
-			for i, l := range p.List {
-				k := newPathKey(l.Path)
-				pathIdxs[k] = append(pathIdxs[k], i)
-			}
-
-			// Update the next index for all locations.
-			p.byPath = make(map[pathKey]int, len(p.List))
-			for k, idxs := range pathIdxs {
-				for i := 0; i < len(idxs)-1; i++ {
-					p.List[idxs[i]].Next = idxs[i+1]
-				}
-				p.List[idxs[len(idxs)-1]].Next = 0
-				p.byPath[k] = idxs[0] // record the first location for this path
-			}
-		}
-	})
-	return p
-}
 func (p *SourceLocations) ProtoInternal(pragma.DoNotImplement) {}
-
-// pathKey is a comparable representation of protoreflect.SourcePath.
-type pathKey struct {
-	arr [16]uint8 // first n-1 path segments; last element is the length
-	str string    // used if the path does not fit in arr
-}
-
-func newPathKey(p pref.SourcePath) (k pathKey) {
-	if len(p) < len(k.arr) {
-		for i, ps := range p {
-			if ps < 0 || math.MaxUint8 <= ps {
-				return pathKey{str: p.String()}
-			}
-			k.arr[i] = uint8(ps)
-		}
-		k.arr[len(k.arr)-1] = uint8(len(p))
-		return k
-	}
-	return pathKey{str: p.String()}
-}

vendor/google.golang.org/protobuf/internal/filedesc/desc_list_gen.go

@@ -142,7 +142,6 @@ type Fields struct {
 	once   sync.Once
 	byName map[protoreflect.Name]*Field        // protected by once
 	byJSON map[string]*Field                   // protected by once
-	byText map[string]*Field                   // protected by once
 	byNum  map[protoreflect.FieldNumber]*Field // protected by once
 }
 
@@ -164,12 +163,6 @@ func (p *Fields) ByJSONName(s string) protoreflect.FieldDescriptor {
 	}
 	return nil
 }
-func (p *Fields) ByTextName(s string) protoreflect.FieldDescriptor {
-	if d := p.lazyInit().byText[s]; d != nil {
-		return d
-	}
-	return nil
-}
 func (p *Fields) ByNumber(n protoreflect.FieldNumber) protoreflect.FieldDescriptor {
 	if d := p.lazyInit().byNum[n]; d != nil {
 		return d
@@ -185,7 +178,6 @@ func (p *Fields) lazyInit() *Fields {
 		if len(p.List) > 0 {
 			p.byName = make(map[protoreflect.Name]*Field, len(p.List))
 			p.byJSON = make(map[string]*Field, len(p.List))
-			p.byText = make(map[string]*Field, len(p.List))
 			p.byNum = make(map[protoreflect.FieldNumber]*Field, len(p.List))
 			for i := range p.List {
 				d := &p.List[i]
@@ -195,9 +187,6 @@ func (p *Fields) lazyInit() *Fields {
 				if _, ok := p.byJSON[d.JSONName()]; !ok {
 					p.byJSON[d.JSONName()] = d
 				}
-				if _, ok := p.byText[d.TextName()]; !ok {
-					p.byText[d.TextName()] = d
-				}
 				if _, ok := p.byNum[d.Number()]; !ok {
 					p.byNum[d.Number()] = d
 				}

vendor/google.golang.org/protobuf/internal/impl/api_export.go

@@ -167,7 +167,7 @@ func (Export) MessageTypeOf(m message) pref.MessageType {
 	if mv := (Export{}).protoMessageV2Of(m); mv != nil {
 		return mv.ProtoReflect().Type()
 	}
-	return legacyLoadMessageType(reflect.TypeOf(m), "")
+	return legacyLoadMessageInfo(reflect.TypeOf(m), "")
 }
 
 // MessageStringOf returns the message value as a string,

vendor/google.golang.org/protobuf/internal/impl/codec_field.go

@@ -10,7 +10,6 @@ import (
 	"sync"
 
 	"google.golang.org/protobuf/encoding/protowire"
-	"google.golang.org/protobuf/internal/errors"
 	"google.golang.org/protobuf/proto"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 	preg "google.golang.org/protobuf/reflect/protoregistry"
@@ -21,7 +20,6 @@ type errInvalidUTF8 struct{}
 
 func (errInvalidUTF8) Error() string     { return "string field contains invalid UTF-8" }
 func (errInvalidUTF8) InvalidUTF8() bool { return true }
-func (errInvalidUTF8) Unwrap() error     { return errors.Error }
 
 // initOneofFieldCoders initializes the fast-path functions for the fields in a oneof.
 //
@@ -244,7 +242,7 @@ func consumeMessageInfo(b []byte, p pointer, wtyp protowire.Type, f *coderFieldI
 	}
 	v, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	if p.Elem().IsNil() {
 		p.SetPointer(pointerOfValue(reflect.New(f.mi.GoReflectType.Elem())))
@@ -278,7 +276,7 @@ func consumeMessage(b []byte, m proto.Message, wtyp protowire.Type, opts unmarsh
 	}
 	v, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{
 		Buf:     v,
@@ -422,7 +420,7 @@ func consumeGroup(b []byte, m proto.Message, num protowire.Number, wtyp protowir
 	}
 	b, n := protowire.ConsumeGroup(num, b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{
 		Buf:     b,
@@ -496,7 +494,7 @@ func consumeMessageSliceInfo(b []byte, p pointer, wtyp protowire.Type, f *coderF
 	}
 	v, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	m := reflect.New(f.mi.GoReflectType.Elem()).Interface()
 	mp := pointerOfIface(m)
@@ -552,7 +550,7 @@ func consumeMessageSlice(b []byte, p pointer, goType reflect.Type, wtyp protowir
 	}
 	v, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	mp := reflect.New(goType.Elem())
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{
@@ -615,7 +613,7 @@ func consumeMessageSliceValue(b []byte, listv pref.Value, _ protowire.Number, wt
 	}
 	v, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return pref.Value{}, out, errDecode
+		return pref.Value{}, out, protowire.ParseError(n)
 	}
 	m := list.NewElement()
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{
@@ -683,7 +681,7 @@ func consumeGroupSliceValue(b []byte, listv pref.Value, num protowire.Number, wt
 	}
 	b, n := protowire.ConsumeGroup(num, b)
 	if n < 0 {
-		return pref.Value{}, out, errDecode
+		return pref.Value{}, out, protowire.ParseError(n)
 	}
 	m := list.NewElement()
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{
@@ -769,7 +767,7 @@ func consumeGroupSlice(b []byte, p pointer, num protowire.Number, wtyp protowire
 	}
 	b, n := protowire.ConsumeGroup(num, b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	mp := reflect.New(goType.Elem())
 	o, err := opts.Options().UnmarshalState(piface.UnmarshalInput{

vendor/google.golang.org/protobuf/internal/impl/codec_map.go

@@ -5,6 +5,7 @@
 package impl
 
 import (
+	"errors"
 	"reflect"
 	"sort"
 
@@ -117,7 +118,7 @@ func consumeMap(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi *mapInfo
 	}
 	b, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	var (
 		key = mapi.keyZero
@@ -126,10 +127,10 @@ func consumeMap(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi *mapInfo
 	for len(b) > 0 {
 		num, wtyp, n := protowire.ConsumeTag(b)
 		if n < 0 {
-			return out, errDecode
+			return out, protowire.ParseError(n)
 		}
 		if num > protowire.MaxValidNumber {
-			return out, errDecode
+			return out, errors.New("invalid field number")
 		}
 		b = b[n:]
 		err := errUnknown
@@ -156,7 +157,7 @@ func consumeMap(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi *mapInfo
 		if err == errUnknown {
 			n = protowire.ConsumeFieldValue(num, wtyp, b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 		} else if err != nil {
 			return out, err
@@ -174,7 +175,7 @@ func consumeMapOfMessage(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi
 	}
 	b, n := protowire.ConsumeBytes(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	var (
 		key = mapi.keyZero
@@ -183,10 +184,10 @@ func consumeMapOfMessage(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi
 	for len(b) > 0 {
 		num, wtyp, n := protowire.ConsumeTag(b)
 		if n < 0 {
-			return out, errDecode
+			return out, protowire.ParseError(n)
 		}
 		if num > protowire.MaxValidNumber {
-			return out, errDecode
+			return out, errors.New("invalid field number")
 		}
 		b = b[n:]
 		err := errUnknown
@@ -207,7 +208,7 @@ func consumeMapOfMessage(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi
 			var v []byte
 			v, n = protowire.ConsumeBytes(b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 			var o unmarshalOutput
 			o, err = f.mi.unmarshalPointer(v, pointerOfValue(val), 0, opts)
@@ -220,7 +221,7 @@ func consumeMapOfMessage(b []byte, mapv reflect.Value, wtyp protowire.Type, mapi
 		if err == errUnknown {
 			n = protowire.ConsumeFieldValue(num, wtyp, b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 		} else if err != nil {
 			return out, err

vendor/google.golang.org/protobuf/internal/impl/codec_message.go

@@ -11,7 +11,7 @@ import (
 
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/internal/encoding/messageset"
-	"google.golang.org/protobuf/internal/order"
+	"google.golang.org/protobuf/internal/fieldsort"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 	piface "google.golang.org/protobuf/runtime/protoiface"
 )
@@ -27,7 +27,6 @@ type coderMessageInfo struct {
 	coderFields        map[protowire.Number]*coderFieldInfo
 	sizecacheOffset    offset
 	unknownOffset      offset
-	unknownPtrKind     bool
 	extensionOffset    offset
 	needsInitCheck     bool
 	isMessageSet       bool
@@ -48,20 +47,9 @@ type coderFieldInfo struct {
 }
 
 func (mi *MessageInfo) makeCoderMethods(t reflect.Type, si structInfo) {
-	mi.sizecacheOffset = invalidOffset
+	mi.sizecacheOffset = si.sizecacheOffset
-	mi.unknownOffset = invalidOffset
+	mi.unknownOffset = si.unknownOffset
-	mi.extensionOffset = invalidOffset
+	mi.extensionOffset = si.extensionOffset
-
-	if si.sizecacheOffset.IsValid() && si.sizecacheType == sizecacheType {
-		mi.sizecacheOffset = si.sizecacheOffset
-	}
-	if si.unknownOffset.IsValid() && (si.unknownType == unknownFieldsAType || si.unknownType == unknownFieldsBType) {
-		mi.unknownOffset = si.unknownOffset
-		mi.unknownPtrKind = si.unknownType.Kind() == reflect.Ptr
-	}
-	if si.extensionOffset.IsValid() && si.extensionType == extensionFieldsType {
-		mi.extensionOffset = si.extensionOffset
-	}
 
 	mi.coderFields = make(map[protowire.Number]*coderFieldInfo)
 	fields := mi.Desc.Fields()
@@ -85,27 +73,6 @@ func (mi *MessageInfo) makeCoderMethods(t reflect.Type, si structInfo) {
 		var funcs pointerCoderFuncs
 		var childMessage *MessageInfo
 		switch {
-		case ft == nil:
-			// This never occurs for generated message types.
-			// It implies that a hand-crafted type has missing Go fields
-			// for specific protobuf message fields.
-			funcs = pointerCoderFuncs{
-				size: func(p pointer, f *coderFieldInfo, opts marshalOptions) int {
-					return 0
-				},
-				marshal: func(b []byte, p pointer, f *coderFieldInfo, opts marshalOptions) ([]byte, error) {
-					return nil, nil
-				},
-				unmarshal: func(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, opts unmarshalOptions) (unmarshalOutput, error) {
-					panic("missing Go struct field for " + string(fd.FullName()))
-				},
-				isInit: func(p pointer, f *coderFieldInfo) error {
-					panic("missing Go struct field for " + string(fd.FullName()))
-				},
-				merge: func(dst, src pointer, f *coderFieldInfo, opts mergeOptions) {
-					panic("missing Go struct field for " + string(fd.FullName()))
-				},
-			}
 		case isOneof:
 			fieldOffset = offsetOf(fs, mi.Exporter)
 		case fd.IsWeak():
@@ -169,7 +136,7 @@ func (mi *MessageInfo) makeCoderMethods(t reflect.Type, si structInfo) {
 		sort.Slice(mi.orderedCoderFields, func(i, j int) bool {
 			fi := fields.ByNumber(mi.orderedCoderFields[i].num)
 			fj := fields.ByNumber(mi.orderedCoderFields[j].num)
-			return order.LegacyFieldOrder(fi, fj)
+			return fieldsort.Less(fi, fj)
 		})
 	}
 
@@ -190,28 +157,3 @@ func (mi *MessageInfo) makeCoderMethods(t reflect.Type, si structInfo) {
 		mi.methods.Merge = mi.merge
 	}
 }
-
-// getUnknownBytes returns a *[]byte for the unknown fields.
-// It is the caller's responsibility to check whether the pointer is nil.
-// This function is specially designed to be inlineable.
-func (mi *MessageInfo) getUnknownBytes(p pointer) *[]byte {
-	if mi.unknownPtrKind {
-		return *p.Apply(mi.unknownOffset).BytesPtr()
-	} else {
-		return p.Apply(mi.unknownOffset).Bytes()
-	}
-}
-
-// mutableUnknownBytes returns a *[]byte for the unknown fields.
-// The returned pointer is guaranteed to not be nil.
-func (mi *MessageInfo) mutableUnknownBytes(p pointer) *[]byte {
-	if mi.unknownPtrKind {
-		bp := p.Apply(mi.unknownOffset).BytesPtr()
-		if *bp == nil {
-			*bp = new([]byte)
-		}
-		return *bp
-	} else {
-		return p.Apply(mi.unknownOffset).Bytes()
-	}
-}

vendor/google.golang.org/protobuf/internal/impl/codec_messageset.go

@@ -29,9 +29,8 @@ func sizeMessageSet(mi *MessageInfo, p pointer, opts marshalOptions) (size int)
 		size += xi.funcs.size(x.Value(), protowire.SizeTag(messageset.FieldMessage), opts)
 	}
 
-	if u := mi.getUnknownBytes(p); u != nil {
+	unknown := *p.Apply(mi.unknownOffset).Bytes()
-		size += messageset.SizeUnknown(*u)
+	size += messageset.SizeUnknown(unknown)
-	}
 
 	return size
 }
@@ -70,12 +69,10 @@ func marshalMessageSet(mi *MessageInfo, b []byte, p pointer, opts marshalOptions
 		}
 	}
 
-	if u := mi.getUnknownBytes(p); u != nil {
+	unknown := *p.Apply(mi.unknownOffset).Bytes()
-		var err error
+	b, err := messageset.AppendUnknown(b, unknown)
-		b, err = messageset.AppendUnknown(b, *u)
+	if err != nil {
-		if err != nil {
+		return b, err
-			return b, err
-		}
 	}
 
 	return b, nil
@@ -103,13 +100,13 @@ func unmarshalMessageSet(mi *MessageInfo, b []byte, p pointer, opts unmarshalOpt
 		*ep = make(map[int32]ExtensionField)
 	}
 	ext := *ep
+	unknown := p.Apply(mi.unknownOffset).Bytes()
 	initialized := true
 	err = messageset.Unmarshal(b, true, func(num protowire.Number, v []byte) error {
 		o, err := mi.unmarshalExtension(v, num, protowire.BytesType, ext, opts)
 		if err == errUnknown {
-			u := mi.mutableUnknownBytes(p)
+			*unknown = protowire.AppendTag(*unknown, num, protowire.BytesType)
-			*u = protowire.AppendTag(*u, num, protowire.BytesType)
+			*unknown = append(*unknown, v...)
-			*u = append(*u, v...)
 			return nil
 		}
 		if !o.initialized {

vendor/google.golang.org/protobuf/internal/impl/codec_reflect.go

@@ -30,7 +30,7 @@ func consumeEnum(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInfo, _
 	}
 	v, n := protowire.ConsumeVarint(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	p.v.Elem().SetInt(int64(v))
 	out.n = n
@@ -130,12 +130,12 @@ func consumeEnumSlice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInf
 	if wtyp == protowire.BytesType {
 		b, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return out, errDecode
+			return out, protowire.ParseError(n)
 		}
 		for len(b) > 0 {
 			v, n := protowire.ConsumeVarint(b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 			rv := reflect.New(s.Type().Elem()).Elem()
 			rv.SetInt(int64(v))
@@ -150,7 +150,7 @@ func consumeEnumSlice(b []byte, p pointer, wtyp protowire.Type, f *coderFieldInf
 	}
 	v, n := protowire.ConsumeVarint(b)
 	if n < 0 {
-		return out, errDecode
+		return out, protowire.ParseError(n)
 	}
 	rv := reflect.New(s.Type().Elem()).Elem()
 	rv.SetInt(int64(v))

vendor/google.golang.org/protobuf/internal/impl/convert.go

@@ -423,13 +423,6 @@ func (c *messageConverter) PBValueOf(v reflect.Value) pref.Value {
 	if v.Type() != c.goType {
 		panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
 	}
-	if c.isNonPointer() {
-		if v.CanAddr() {
-			v = v.Addr() // T => *T
-		} else {
-			v = reflect.Zero(reflect.PtrTo(v.Type()))
-		}
-	}
 	if m, ok := v.Interface().(pref.ProtoMessage); ok {
 		return pref.ValueOfMessage(m.ProtoReflect())
 	}
@@ -444,16 +437,6 @@ func (c *messageConverter) GoValueOf(v pref.Value) reflect.Value {
 	} else {
 		rv = reflect.ValueOf(m.Interface())
 	}
-	if c.isNonPointer() {
-		if rv.Type() != reflect.PtrTo(c.goType) {
-			panic(fmt.Sprintf("invalid type: got %v, want %v", rv.Type(), reflect.PtrTo(c.goType)))
-		}
-		if !rv.IsNil() {
-			rv = rv.Elem() // *T => T
-		} else {
-			rv = reflect.Zero(rv.Type().Elem())
-		}
-	}
 	if rv.Type() != c.goType {
 		panic(fmt.Sprintf("invalid type: got %v, want %v", rv.Type(), c.goType))
 	}
@@ -468,9 +451,6 @@ func (c *messageConverter) IsValidPB(v pref.Value) bool {
 	} else {
 		rv = reflect.ValueOf(m.Interface())
 	}
-	if c.isNonPointer() {
-		return rv.Type() == reflect.PtrTo(c.goType)
-	}
 	return rv.Type() == c.goType
 }
 
@@ -479,18 +459,9 @@ func (c *messageConverter) IsValidGo(v reflect.Value) bool {
 }
 
 func (c *messageConverter) New() pref.Value {
-	if c.isNonPointer() {
-		return c.PBValueOf(reflect.New(c.goType).Elem())
-	}
 	return c.PBValueOf(reflect.New(c.goType.Elem()))
 }
 
 func (c *messageConverter) Zero() pref.Value {
 	return c.PBValueOf(reflect.Zero(c.goType))
 }
-
-// isNonPointer reports whether the type is a non-pointer type.
-// This never occurs for generated message types.
-func (c *messageConverter) isNonPointer() bool {
-	return c.goType.Kind() != reflect.Ptr
-}

vendor/google.golang.org/protobuf/internal/impl/decode.go

@@ -17,8 +17,6 @@ import (
 	piface "google.golang.org/protobuf/runtime/protoiface"
 )
 
-var errDecode = errors.New("cannot parse invalid wire-format data")
-
 type unmarshalOptions struct {
 	flags    protoiface.UnmarshalInputFlags
 	resolver interface {
@@ -102,13 +100,13 @@ func (mi *MessageInfo) unmarshalPointer(b []byte, p pointer, groupTag protowire.
 			var n int
 			tag, n = protowire.ConsumeVarint(b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 			b = b[n:]
 		}
 		var num protowire.Number
 		if n := tag >> 3; n < uint64(protowire.MinValidNumber) || n > uint64(protowire.MaxValidNumber) {
-			return out, errDecode
+			return out, errors.New("invalid field number")
 		} else {
 			num = protowire.Number(n)
 		}
@@ -116,7 +114,7 @@ func (mi *MessageInfo) unmarshalPointer(b []byte, p pointer, groupTag protowire.
 
 		if wtyp == protowire.EndGroupType {
 			if num != groupTag {
-				return out, errDecode
+				return out, errors.New("mismatching end group marker")
 			}
 			groupTag = 0
 			break
@@ -172,10 +170,10 @@ func (mi *MessageInfo) unmarshalPointer(b []byte, p pointer, groupTag protowire.
 			}
 			n = protowire.ConsumeFieldValue(num, wtyp, b)
 			if n < 0 {
-				return out, errDecode
+				return out, protowire.ParseError(n)
 			}
 			if !opts.DiscardUnknown() && mi.unknownOffset.IsValid() {
-				u := mi.mutableUnknownBytes(p)
+				u := p.Apply(mi.unknownOffset).Bytes()
 				*u = protowire.AppendTag(*u, num, wtyp)
 				*u = append(*u, b[:n]...)
 			}
@@ -183,7 +181,7 @@ func (mi *MessageInfo) unmarshalPointer(b []byte, p pointer, groupTag protowire.
 		b = b[n:]
 	}
 	if groupTag != 0 {
-		return out, errDecode
+		return out, errors.New("missing end group marker")
 	}
 	if mi.numRequiredFields > 0 && bits.OnesCount64(requiredMask) != int(mi.numRequiredFields) {
 		initialized = false
@@ -223,7 +221,7 @@ func (mi *MessageInfo) unmarshalExtension(b []byte, num protowire.Number, wtyp p
 					return out, nil
 				}
 			case ValidationInvalid:
-				return out, errDecode
+				return out, errors.New("invalid wire format")
 			case ValidationUnknown:
 			}
 		}

vendor/google.golang.org/protobuf/internal/impl/encode.go

@@ -79,9 +79,8 @@ func (mi *MessageInfo) sizePointerSlow(p pointer, opts marshalOptions) (size int
 		size += f.funcs.size(fptr, f, opts)
 	}
 	if mi.unknownOffset.IsValid() {
-		if u := mi.getUnknownBytes(p); u != nil {
+		u := *p.Apply(mi.unknownOffset).Bytes()
-			size += len(*u)
+		size += len(u)
-		}
 	}
 	if mi.sizecacheOffset.IsValid() {
 		if size > math.MaxInt32 {
@@ -142,9 +141,8 @@ func (mi *MessageInfo) marshalAppendPointer(b []byte, p pointer, opts marshalOpt
 		}
 	}
 	if mi.unknownOffset.IsValid() && !mi.isMessageSet {
-		if u := mi.getUnknownBytes(p); u != nil {
+		u := *p.Apply(mi.unknownOffset).Bytes()
-			b = append(b, (*u)...)
+		b = append(b, u...)
-		}
 	}
 	return b, nil
 }

vendor/google.golang.org/protobuf/internal/impl/legacy_export.go

@@ -30,7 +30,7 @@ func (Export) LegacyMessageTypeOf(m piface.MessageV1, name pref.FullName) pref.M
 	if mv := (Export{}).protoMessageV2Of(m); mv != nil {
 		return mv.ProtoReflect().Type()
 	}
-	return legacyLoadMessageType(reflect.TypeOf(m), name)
+	return legacyLoadMessageInfo(reflect.TypeOf(m), name)
 }
 
 // UnmarshalJSONEnum unmarshals an enum from a JSON-encoded input.

vendor/google.golang.org/protobuf/internal/impl/legacy_extension.go

@@ -154,8 +154,7 @@ func (x placeholderExtension) Number() pref.FieldNumber                   { retu
 func (x placeholderExtension) Cardinality() pref.Cardinality              { return 0 }
 func (x placeholderExtension) Kind() pref.Kind                            { return 0 }
 func (x placeholderExtension) HasJSONName() bool                          { return false }
-func (x placeholderExtension) JSONName() string                           { return "[" + string(x.name) + "]" }
+func (x placeholderExtension) JSONName() string                           { return "" }
-func (x placeholderExtension) TextName() string                           { return "[" + string(x.name) + "]" }
 func (x placeholderExtension) HasPresence() bool                          { return false }
 func (x placeholderExtension) HasOptionalKeyword() bool                   { return false }
 func (x placeholderExtension) IsExtension() bool                          { return true }

vendor/google.golang.org/protobuf/internal/impl/legacy_message.go

@@ -24,24 +24,14 @@ import (
 // legacyWrapMessage wraps v as a protoreflect.Message,
 // where v must be a *struct kind and not implement the v2 API already.
 func legacyWrapMessage(v reflect.Value) pref.Message {
-	t := v.Type()
+	typ := v.Type()
-	if t.Kind() != reflect.Ptr || t.Elem().Kind() != reflect.Struct {
+	if typ.Kind() != reflect.Ptr || typ.Elem().Kind() != reflect.Struct {
 		return aberrantMessage{v: v}
 	}
-	mt := legacyLoadMessageInfo(t, "")
+	mt := legacyLoadMessageInfo(typ, "")
 	return mt.MessageOf(v.Interface())
 }
 
-// legacyLoadMessageType dynamically loads a protoreflect.Type for t,
-// where t must be not implement the v2 API already.
-// The provided name is used if it cannot be determined from the message.
-func legacyLoadMessageType(t reflect.Type, name pref.FullName) protoreflect.MessageType {
-	if t.Kind() != reflect.Ptr || t.Elem().Kind() != reflect.Struct {
-		return aberrantMessageType{t}
-	}
-	return legacyLoadMessageInfo(t, name)
-}
-
 var legacyMessageTypeCache sync.Map // map[reflect.Type]*MessageInfo
 
 // legacyLoadMessageInfo dynamically loads a *MessageInfo for t,
@@ -59,9 +49,8 @@ func legacyLoadMessageInfo(t reflect.Type, name pref.FullName) *MessageInfo {
 		GoReflectType: t,
 	}
 
-	var hasMarshal, hasUnmarshal bool
 	v := reflect.Zero(t).Interface()
-	if _, hasMarshal = v.(legacyMarshaler); hasMarshal {
+	if _, ok := v.(legacyMarshaler); ok {
 		mi.methods.Marshal = legacyMarshal
 
 		// We have no way to tell whether the type's Marshal method
@@ -70,10 +59,10 @@ func legacyLoadMessageInfo(t reflect.Type, name pref.FullName) *MessageInfo {
 		// calling Marshal methods when present.
 		mi.methods.Flags |= piface.SupportMarshalDeterministic
 	}
-	if _, hasUnmarshal = v.(legacyUnmarshaler); hasUnmarshal {
+	if _, ok := v.(legacyUnmarshaler); ok {
 		mi.methods.Unmarshal = legacyUnmarshal
 	}
-	if _, hasMerge := v.(legacyMerger); hasMerge || (hasMarshal && hasUnmarshal) {
+	if _, ok := v.(legacyMerger); ok {
 		mi.methods.Merge = legacyMerge
 	}
 
@@ -86,7 +75,7 @@ func legacyLoadMessageInfo(t reflect.Type, name pref.FullName) *MessageInfo {
 var legacyMessageDescCache sync.Map // map[reflect.Type]protoreflect.MessageDescriptor
 
 // LegacyLoadMessageDesc returns an MessageDescriptor derived from the Go type,
-// which should be a *struct kind and must not implement the v2 API already.
+// which must be a *struct kind and not implement the v2 API already.
 //
 // This is exported for testing purposes.
 func LegacyLoadMessageDesc(t reflect.Type) pref.MessageDescriptor {
@@ -125,20 +114,18 @@ func legacyLoadMessageDesc(t reflect.Type, name pref.FullName) pref.MessageDescr
 	// If the Go type has no fields, then this might be a proto3 empty message
 	// from before the size cache was added. If there are any fields, check to
 	// see that at least one of them looks like something we generated.
-	if t.Elem().Kind() == reflect.Struct {
+	if nfield := t.Elem().NumField(); nfield > 0 {
-		if nfield := t.Elem().NumField(); nfield > 0 {
+		hasProtoField := false
-			hasProtoField := false
+		for i := 0; i < nfield; i++ {
-			for i := 0; i < nfield; i++ {
+			f := t.Elem().Field(i)
-				f := t.Elem().Field(i)
+			if f.Tag.Get("protobuf") != "" || f.Tag.Get("protobuf_oneof") != "" || strings.HasPrefix(f.Name, "XXX_") {
-				if f.Tag.Get("protobuf") != "" || f.Tag.Get("protobuf_oneof") != "" || strings.HasPrefix(f.Name, "XXX_") {
+				hasProtoField = true
-					hasProtoField = true
+				break
-					break
-				}
-			}
-			if !hasProtoField {
-				return aberrantLoadMessageDesc(t, name)
 			}
 		}
+		if !hasProtoField {
+			return aberrantLoadMessageDesc(t, name)
+		}
 	}
 
 	md := legacyLoadFileDesc(b).Messages().Get(idxs[0])
@@ -383,7 +370,7 @@ type legacyMerger interface {
 	Merge(protoiface.MessageV1)
 }
 
-var aberrantProtoMethods = &piface.Methods{
+var legacyProtoMethods = &piface.Methods{
 	Marshal:   legacyMarshal,
 	Unmarshal: legacyUnmarshal,
 	Merge:     legacyMerge,
@@ -414,40 +401,18 @@ func legacyUnmarshal(in piface.UnmarshalInput) (piface.UnmarshalOutput, error) {
 	v := in.Message.(unwrapper).protoUnwrap()
 	unmarshaler, ok := v.(legacyUnmarshaler)
 	if !ok {
-		return piface.UnmarshalOutput{}, errors.New("%T does not implement Unmarshal", v)
+		return piface.UnmarshalOutput{}, errors.New("%T does not implement Marshal", v)
 	}
 	return piface.UnmarshalOutput{}, unmarshaler.Unmarshal(in.Buf)
 }
 
 func legacyMerge(in piface.MergeInput) piface.MergeOutput {
-	// Check whether this supports the legacy merger.
 	dstv := in.Destination.(unwrapper).protoUnwrap()
 	merger, ok := dstv.(legacyMerger)
-	if ok {
-		merger.Merge(Export{}.ProtoMessageV1Of(in.Source))
-		return piface.MergeOutput{Flags: piface.MergeComplete}
-	}
-
-	// If legacy merger is unavailable, implement merge in terms of
-	// a marshal and unmarshal operation.
-	srcv := in.Source.(unwrapper).protoUnwrap()
-	marshaler, ok := srcv.(legacyMarshaler)
 	if !ok {
 		return piface.MergeOutput{}
 	}
-	dstv = in.Destination.(unwrapper).protoUnwrap()
+	merger.Merge(Export{}.ProtoMessageV1Of(in.Source))
-	unmarshaler, ok := dstv.(legacyUnmarshaler)
-	if !ok {
-		return piface.MergeOutput{}
-	}
-	b, err := marshaler.Marshal()
-	if err != nil {
-		return piface.MergeOutput{}
-	}
-	err = unmarshaler.Unmarshal(b)
-	if err != nil {
-		return piface.MergeOutput{}
-	}
 	return piface.MergeOutput{Flags: piface.MergeComplete}
 }
 
@@ -457,9 +422,6 @@ type aberrantMessageType struct {
 }
 
 func (mt aberrantMessageType) New() pref.Message {
-	if mt.t.Kind() == reflect.Ptr {
-		return aberrantMessage{reflect.New(mt.t.Elem())}
-	}
 	return aberrantMessage{reflect.Zero(mt.t)}
 }
 func (mt aberrantMessageType) Zero() pref.Message {
@@ -481,17 +443,6 @@ type aberrantMessage struct {
 	v reflect.Value
 }
 
-// Reset implements the v1 proto.Message.Reset method.
-func (m aberrantMessage) Reset() {
-	if mr, ok := m.v.Interface().(interface{ Reset() }); ok {
-		mr.Reset()
-		return
-	}
-	if m.v.Kind() == reflect.Ptr && !m.v.IsNil() {
-		m.v.Elem().Set(reflect.Zero(m.v.Type().Elem()))
-	}
-}
-
 func (m aberrantMessage) ProtoReflect() pref.Message {
 	return m
 }
@@ -503,40 +454,33 @@ func (m aberrantMessage) Type() pref.MessageType {
 	return aberrantMessageType{m.v.Type()}
 }
 func (m aberrantMessage) New() pref.Message {
-	if m.v.Type().Kind() == reflect.Ptr {
-		return aberrantMessage{reflect.New(m.v.Type().Elem())}
-	}
 	return aberrantMessage{reflect.Zero(m.v.Type())}
 }
 func (m aberrantMessage) Interface() pref.ProtoMessage {
 	return m
 }
 func (m aberrantMessage) Range(f func(pref.FieldDescriptor, pref.Value) bool) {
-	return
 }
 func (m aberrantMessage) Has(pref.FieldDescriptor) bool {
-	return false
+	panic("invalid field descriptor")
 }
 func (m aberrantMessage) Clear(pref.FieldDescriptor) {
-	panic("invalid Message.Clear on " + string(m.Descriptor().FullName()))
+	panic("invalid field descriptor")
 }
-func (m aberrantMessage) Get(fd pref.FieldDescriptor) pref.Value {
+func (m aberrantMessage) Get(pref.FieldDescriptor) pref.Value {
-	if fd.Default().IsValid() {
+	panic("invalid field descriptor")
-		return fd.Default()
-	}
-	panic("invalid Message.Get on " + string(m.Descriptor().FullName()))
 }
 func (m aberrantMessage) Set(pref.FieldDescriptor, pref.Value) {
-	panic("invalid Message.Set on " + string(m.Descriptor().FullName()))
+	panic("invalid field descriptor")
 }
 func (m aberrantMessage) Mutable(pref.FieldDescriptor) pref.Value {
-	panic("invalid Message.Mutable on " + string(m.Descriptor().FullName()))
+	panic("invalid field descriptor")
 }
 func (m aberrantMessage) NewField(pref.FieldDescriptor) pref.Value {
-	panic("invalid Message.NewField on " + string(m.Descriptor().FullName()))
+	panic("invalid field descriptor")
 }
 func (m aberrantMessage) WhichOneof(pref.OneofDescriptor) pref.FieldDescriptor {
-	panic("invalid Message.WhichOneof descriptor on " + string(m.Descriptor().FullName()))
+	panic("invalid oneof descriptor")
 }
 func (m aberrantMessage) GetUnknown() pref.RawFields {
 	return nil
@@ -545,13 +489,13 @@ func (m aberrantMessage) SetUnknown(pref.RawFields) {
 	// SetUnknown discards its input on messages which don't support unknown field storage.
 }
 func (m aberrantMessage) IsValid() bool {
-	if m.v.Kind() == reflect.Ptr {
+	// An invalid message is a read-only, empty message. Since we don't know anything
-		return !m.v.IsNil()
+	// about the alleged contents of this message, we can't say with confidence that
-	}
+	// it is invalid in this sense. Therefore, report it as valid.
-	return false
+	return true
 }
 func (m aberrantMessage) ProtoMethods() *piface.Methods {
-	return aberrantProtoMethods
+	return legacyProtoMethods
 }
 func (m aberrantMessage) protoUnwrap() interface{} {
 	return m.v.Interface()

vendor/google.golang.org/protobuf/internal/impl/merge.go

@@ -77,9 +77,9 @@ func (mi *MessageInfo) mergePointer(dst, src pointer, opts mergeOptions) {
 		}
 	}
 	if mi.unknownOffset.IsValid() {
-		su := mi.getUnknownBytes(src)
+		du := dst.Apply(mi.unknownOffset).Bytes()
-		if su != nil && len(*su) > 0 {
+		su := src.Apply(mi.unknownOffset).Bytes()
-			du := mi.mutableUnknownBytes(dst)
+		if len(*su) > 0 {
 			*du = append(*du, *su...)
 		}
 	}

vendor/google.golang.org/protobuf/internal/impl/message.go

@@ -15,7 +15,6 @@ import (
 	"google.golang.org/protobuf/internal/genid"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
-	preg "google.golang.org/protobuf/reflect/protoregistry"
 )
 
 // MessageInfo provides protobuf related functionality for a given Go type
@@ -110,29 +109,22 @@ func (mi *MessageInfo) getPointer(m pref.Message) (p pointer, ok bool) {
 type (
 	SizeCache       = int32
 	WeakFields      = map[int32]protoreflect.ProtoMessage
-	UnknownFields   = unknownFieldsA // TODO: switch to unknownFieldsB
+	UnknownFields   = []byte
-	unknownFieldsA  = []byte
-	unknownFieldsB  = *[]byte
 	ExtensionFields = map[int32]ExtensionField
 )
 
 var (
 	sizecacheType       = reflect.TypeOf(SizeCache(0))
 	weakFieldsType      = reflect.TypeOf(WeakFields(nil))
-	unknownFieldsAType  = reflect.TypeOf(unknownFieldsA(nil))
+	unknownFieldsType   = reflect.TypeOf(UnknownFields(nil))
-	unknownFieldsBType  = reflect.TypeOf(unknownFieldsB(nil))
 	extensionFieldsType = reflect.TypeOf(ExtensionFields(nil))
 )
 
 type structInfo struct {
 	sizecacheOffset offset
-	sizecacheType   reflect.Type
 	weakOffset      offset
-	weakType        reflect.Type
 	unknownOffset   offset
-	unknownType     reflect.Type
 	extensionOffset offset
-	extensionType   reflect.Type
 
 	fieldsByNumber        map[pref.FieldNumber]reflect.StructField
 	oneofsByName          map[pref.Name]reflect.StructField
@@ -159,22 +151,18 @@ fieldLoop:
 		case genid.SizeCache_goname, genid.SizeCacheA_goname:
 			if f.Type == sizecacheType {
 				si.sizecacheOffset = offsetOf(f, mi.Exporter)
-				si.sizecacheType = f.Type
 			}
 		case genid.WeakFields_goname, genid.WeakFieldsA_goname:
 			if f.Type == weakFieldsType {
 				si.weakOffset = offsetOf(f, mi.Exporter)
-				si.weakType = f.Type
 			}
 		case genid.UnknownFields_goname, genid.UnknownFieldsA_goname:
-			if f.Type == unknownFieldsAType || f.Type == unknownFieldsBType {
+			if f.Type == unknownFieldsType {
 				si.unknownOffset = offsetOf(f, mi.Exporter)
-				si.unknownType = f.Type
 			}
 		case genid.ExtensionFields_goname, genid.ExtensionFieldsA_goname, genid.ExtensionFieldsB_goname:
 			if f.Type == extensionFieldsType {
 				si.extensionOffset = offsetOf(f, mi.Exporter)
-				si.extensionType = f.Type
 			}
 		default:
 			for _, s := range strings.Split(f.Tag.Get("protobuf"), ",") {
@@ -224,53 +212,4 @@ func (mi *MessageInfo) New() protoreflect.Message {
 func (mi *MessageInfo) Zero() protoreflect.Message {
 	return mi.MessageOf(reflect.Zero(mi.GoReflectType).Interface())
 }
-func (mi *MessageInfo) Descriptor() protoreflect.MessageDescriptor {
+func (mi *MessageInfo) Descriptor() protoreflect.MessageDescriptor { return mi.Desc }
-	return mi.Desc
-}
-func (mi *MessageInfo) Enum(i int) protoreflect.EnumType {
-	mi.init()
-	fd := mi.Desc.Fields().Get(i)
-	return Export{}.EnumTypeOf(mi.fieldTypes[fd.Number()])
-}
-func (mi *MessageInfo) Message(i int) protoreflect.MessageType {
-	mi.init()
-	fd := mi.Desc.Fields().Get(i)
-	switch {
-	case fd.IsWeak():
-		mt, _ := preg.GlobalTypes.FindMessageByName(fd.Message().FullName())
-		return mt
-	case fd.IsMap():
-		return mapEntryType{fd.Message(), mi.fieldTypes[fd.Number()]}
-	default:
-		return Export{}.MessageTypeOf(mi.fieldTypes[fd.Number()])
-	}
-}
-
-type mapEntryType struct {
-	desc    protoreflect.MessageDescriptor
-	valType interface{} // zero value of enum or message type
-}
-
-func (mt mapEntryType) New() protoreflect.Message {
-	return nil
-}
-func (mt mapEntryType) Zero() protoreflect.Message {
-	return nil
-}
-func (mt mapEntryType) Descriptor() protoreflect.MessageDescriptor {
-	return mt.desc
-}
-func (mt mapEntryType) Enum(i int) protoreflect.EnumType {
-	fd := mt.desc.Fields().Get(i)
-	if fd.Enum() == nil {
-		return nil
-	}
-	return Export{}.EnumTypeOf(mt.valType)
-}
-func (mt mapEntryType) Message(i int) protoreflect.MessageType {
-	fd := mt.desc.Fields().Get(i)
-	if fd.Message() == nil {
-		return nil
-	}
-	return Export{}.MessageTypeOf(mt.valType)
-}

vendor/google.golang.org/protobuf/internal/impl/message_reflect.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/pragma"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 )
@@ -17,11 +16,6 @@ type reflectMessageInfo struct {
 	fields map[pref.FieldNumber]*fieldInfo
 	oneofs map[pref.Name]*oneofInfo
 
-	// fieldTypes contains the zero value of an enum or message field.
-	// For lists, it contains the element type.
-	// For maps, it contains the entry value type.
-	fieldTypes map[pref.FieldNumber]interface{}
-
 	// denseFields is a subset of fields where:
 	//	0 < fieldDesc.Number() < len(denseFields)
 	// It provides faster access to the fieldInfo, but may be incomplete.
@@ -42,7 +36,6 @@ func (mi *MessageInfo) makeReflectFuncs(t reflect.Type, si structInfo) {
 	mi.makeKnownFieldsFunc(si)
 	mi.makeUnknownFieldsFunc(t, si)
 	mi.makeExtensionFieldsFunc(t, si)
-	mi.makeFieldTypes(si)
 }
 
 // makeKnownFieldsFunc generates functions for operations that can be performed
@@ -58,23 +51,17 @@ func (mi *MessageInfo) makeKnownFieldsFunc(si structInfo) {
 	for i := 0; i < fds.Len(); i++ {
 		fd := fds.Get(i)
 		fs := si.fieldsByNumber[fd.Number()]
-		isOneof := fd.ContainingOneof() != nil && !fd.ContainingOneof().IsSynthetic()
-		if isOneof {
-			fs = si.oneofsByName[fd.ContainingOneof().Name()]
-		}
 		var fi fieldInfo
 		switch {
-		case fs.Type == nil:
+		case fd.ContainingOneof() != nil && !fd.ContainingOneof().IsSynthetic():
-			fi = fieldInfoForMissing(fd) // never occurs for officially generated message types
+			fi = fieldInfoForOneof(fd, si.oneofsByName[fd.ContainingOneof().Name()], mi.Exporter, si.oneofWrappersByNumber[fd.Number()])
-		case isOneof:
-			fi = fieldInfoForOneof(fd, fs, mi.Exporter, si.oneofWrappersByNumber[fd.Number()])
 		case fd.IsMap():
 			fi = fieldInfoForMap(fd, fs, mi.Exporter)
 		case fd.IsList():
 			fi = fieldInfoForList(fd, fs, mi.Exporter)
 		case fd.IsWeak():
 			fi = fieldInfoForWeakMessage(fd, si.weakOffset)
-		case fd.Message() != nil:
+		case fd.Kind() == pref.MessageKind || fd.Kind() == pref.GroupKind:
 			fi = fieldInfoForMessage(fd, fs, mi.Exporter)
 		default:
 			fi = fieldInfoForScalar(fd, fs, mi.Exporter)
@@ -105,53 +92,27 @@ func (mi *MessageInfo) makeKnownFieldsFunc(si structInfo) {
 			i++
 		}
 	}
-
-	// Introduce instability to iteration order, but keep it deterministic.
-	if len(mi.rangeInfos) > 1 && detrand.Bool() {
-		i := detrand.Intn(len(mi.rangeInfos) - 1)
-		mi.rangeInfos[i], mi.rangeInfos[i+1] = mi.rangeInfos[i+1], mi.rangeInfos[i]
-	}
 }
 
 func (mi *MessageInfo) makeUnknownFieldsFunc(t reflect.Type, si structInfo) {
-	switch {
+	mi.getUnknown = func(pointer) pref.RawFields { return nil }
-	case si.unknownOffset.IsValid() && si.unknownType == unknownFieldsAType:
+	mi.setUnknown = func(pointer, pref.RawFields) { return }
-		// Handle as []byte.
+	if si.unknownOffset.IsValid() {
 		mi.getUnknown = func(p pointer) pref.RawFields {
 			if p.IsNil() {
 				return nil
 			}
-			return *p.Apply(mi.unknownOffset).Bytes()
+			rv := p.Apply(si.unknownOffset).AsValueOf(unknownFieldsType)
+			return pref.RawFields(*rv.Interface().(*[]byte))
 		}
 		mi.setUnknown = func(p pointer, b pref.RawFields) {
 			if p.IsNil() {
 				panic("invalid SetUnknown on nil Message")
 			}
-			*p.Apply(mi.unknownOffset).Bytes() = b
+			rv := p.Apply(si.unknownOffset).AsValueOf(unknownFieldsType)
+			*rv.Interface().(*[]byte) = []byte(b)
 		}
-	case si.unknownOffset.IsValid() && si.unknownType == unknownFieldsBType:
+	} else {
-		// Handle as *[]byte.
-		mi.getUnknown = func(p pointer) pref.RawFields {
-			if p.IsNil() {
-				return nil
-			}
-			bp := p.Apply(mi.unknownOffset).BytesPtr()
-			if *bp == nil {
-				return nil
-			}
-			return **bp
-		}
-		mi.setUnknown = func(p pointer, b pref.RawFields) {
-			if p.IsNil() {
-				panic("invalid SetUnknown on nil Message")
-			}
-			bp := p.Apply(mi.unknownOffset).BytesPtr()
-			if *bp == nil {
-				*bp = new([]byte)
-			}
-			**bp = b
-		}
-	default:
 		mi.getUnknown = func(pointer) pref.RawFields {
 			return nil
 		}
@@ -178,58 +139,6 @@ func (mi *MessageInfo) makeExtensionFieldsFunc(t reflect.Type, si structInfo) {
 		}
 	}
 }
-func (mi *MessageInfo) makeFieldTypes(si structInfo) {
-	md := mi.Desc
-	fds := md.Fields()
-	for i := 0; i < fds.Len(); i++ {
-		var ft reflect.Type
-		fd := fds.Get(i)
-		fs := si.fieldsByNumber[fd.Number()]
-		isOneof := fd.ContainingOneof() != nil && !fd.ContainingOneof().IsSynthetic()
-		if isOneof {
-			fs = si.oneofsByName[fd.ContainingOneof().Name()]
-		}
-		var isMessage bool
-		switch {
-		case fs.Type == nil:
-			continue // never occurs for officially generated message types
-		case isOneof:
-			if fd.Enum() != nil || fd.Message() != nil {
-				ft = si.oneofWrappersByNumber[fd.Number()].Field(0).Type
-			}
-		case fd.IsMap():
-			if fd.MapValue().Enum() != nil || fd.MapValue().Message() != nil {
-				ft = fs.Type.Elem()
-			}
-			isMessage = fd.MapValue().Message() != nil
-		case fd.IsList():
-			if fd.Enum() != nil || fd.Message() != nil {
-				ft = fs.Type.Elem()
-			}
-			isMessage = fd.Message() != nil
-		case fd.Enum() != nil:
-			ft = fs.Type
-			if fd.HasPresence() && ft.Kind() == reflect.Ptr {
-				ft = ft.Elem()
-			}
-		case fd.Message() != nil:
-			ft = fs.Type
-			if fd.IsWeak() {
-				ft = nil
-			}
-			isMessage = true
-		}
-		if isMessage && ft != nil && ft.Kind() != reflect.Ptr {
-			ft = reflect.PtrTo(ft) // never occurs for officially generated message types
-		}
-		if ft != nil {
-			if mi.fieldTypes == nil {
-				mi.fieldTypes = make(map[pref.FieldNumber]interface{})
-			}
-			mi.fieldTypes[fd.Number()] = reflect.Zero(ft).Interface()
-		}
-	}
-}
 
 type extensionMap map[int32]ExtensionField
 
@@ -397,6 +306,7 @@ var (
 // pointer to a named Go struct. If the provided type has a ProtoReflect method,
 // it must be implemented by calling this method.
 func (mi *MessageInfo) MessageOf(m interface{}) pref.Message {
+	// TODO: Switch the input to be an opaque Pointer.
 	if reflect.TypeOf(m) != mi.GoReflectType {
 		panic(fmt.Sprintf("type mismatch: got %T, want %v", m, mi.GoReflectType))
 	}
@@ -410,17 +320,6 @@ func (mi *MessageInfo) MessageOf(m interface{}) pref.Message {
 func (m *messageReflectWrapper) pointer() pointer          { return m.p }
 func (m *messageReflectWrapper) messageInfo() *MessageInfo { return m.mi }
 
-// Reset implements the v1 proto.Message.Reset method.
-func (m *messageIfaceWrapper) Reset() {
-	if mr, ok := m.protoUnwrap().(interface{ Reset() }); ok {
-		mr.Reset()
-		return
-	}
-	rv := reflect.ValueOf(m.protoUnwrap())
-	if rv.Kind() == reflect.Ptr && !rv.IsNil() {
-		rv.Elem().Set(reflect.Zero(rv.Type().Elem()))
-	}
-}
 func (m *messageIfaceWrapper) ProtoReflect() pref.Message {
 	return (*messageReflectWrapper)(m)
 }

vendor/google.golang.org/protobuf/internal/impl/message_reflect_field.go

@@ -28,39 +28,6 @@ type fieldInfo struct {
 	newField   func() pref.Value
 }
 
-func fieldInfoForMissing(fd pref.FieldDescriptor) fieldInfo {
-	// This never occurs for generated message types.
-	// It implies that a hand-crafted type has missing Go fields
-	// for specific protobuf message fields.
-	return fieldInfo{
-		fieldDesc: fd,
-		has: func(p pointer) bool {
-			return false
-		},
-		clear: func(p pointer) {
-			panic("missing Go struct field for " + string(fd.FullName()))
-		},
-		get: func(p pointer) pref.Value {
-			return fd.Default()
-		},
-		set: func(p pointer, v pref.Value) {
-			panic("missing Go struct field for " + string(fd.FullName()))
-		},
-		mutable: func(p pointer) pref.Value {
-			panic("missing Go struct field for " + string(fd.FullName()))
-		},
-		newMessage: func() pref.Message {
-			panic("missing Go struct field for " + string(fd.FullName()))
-		},
-		newField: func() pref.Value {
-			if v := fd.Default(); v.IsValid() {
-				return v
-			}
-			panic("missing Go struct field for " + string(fd.FullName()))
-		},
-	}
-}
-
 func fieldInfoForOneof(fd pref.FieldDescriptor, fs reflect.StructField, x exporter, ot reflect.Type) fieldInfo {
 	ft := fs.Type
 	if ft.Kind() != reflect.Interface {
@@ -130,7 +97,7 @@ func fieldInfoForOneof(fd pref.FieldDescriptor, fs reflect.StructField, x export
 				rv.Set(reflect.New(ot))
 			}
 			rv = rv.Elem().Elem().Field(0)
-			if rv.Kind() == reflect.Ptr && rv.IsNil() {
+			if rv.IsNil() {
 				rv.Set(conv.GoValueOf(pref.ValueOfMessage(conv.New().Message())))
 			}
 			return conv.PBValueOf(rv)
@@ -258,10 +225,7 @@ func fieldInfoForScalar(fd pref.FieldDescriptor, fs reflect.StructField, x expor
 	isBytes := ft.Kind() == reflect.Slice && ft.Elem().Kind() == reflect.Uint8
 	if nullable {
 		if ft.Kind() != reflect.Ptr && ft.Kind() != reflect.Slice {
-			// This never occurs for generated message types.
+			panic(fmt.Sprintf("field %v has invalid type: got %v, want pointer", fd.FullName(), ft))
-			// Despite the protobuf type system specifying presence,
-			// the Go field type cannot represent it.
-			nullable = false
 		}
 		if ft.Kind() == reflect.Ptr {
 			ft = ft.Elem()
@@ -424,9 +388,6 @@ func fieldInfoForMessage(fd pref.FieldDescriptor, fs reflect.StructField, x expo
 				return false
 			}
 			rv := p.Apply(fieldOffset).AsValueOf(fs.Type).Elem()
-			if fs.Type.Kind() != reflect.Ptr {
-				return !isZero(rv)
-			}
 			return !rv.IsNil()
 		},
 		clear: func(p pointer) {
@@ -443,13 +404,13 @@ func fieldInfoForMessage(fd pref.FieldDescriptor, fs reflect.StructField, x expo
 		set: func(p pointer, v pref.Value) {
 			rv := p.Apply(fieldOffset).AsValueOf(fs.Type).Elem()
 			rv.Set(conv.GoValueOf(v))
-			if fs.Type.Kind() == reflect.Ptr && rv.IsNil() {
+			if rv.IsNil() {
 				panic(fmt.Sprintf("field %v has invalid nil pointer", fd.FullName()))
 			}
 		},
 		mutable: func(p pointer) pref.Value {
 			rv := p.Apply(fieldOffset).AsValueOf(fs.Type).Elem()
-			if fs.Type.Kind() == reflect.Ptr && rv.IsNil() {
+			if rv.IsNil() {
 				rv.Set(conv.GoValueOf(conv.New()))
 			}
 			return conv.PBValueOf(rv)
@@ -503,41 +464,3 @@ func makeOneofInfo(od pref.OneofDescriptor, si structInfo, x exporter) *oneofInf
 	}
 	return oi
 }
-
-// isZero is identical to reflect.Value.IsZero.
-// TODO: Remove this when Go1.13 is the minimally supported Go version.
-func isZero(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return math.Float64bits(v.Float()) == 0
-	case reflect.Complex64, reflect.Complex128:
-		c := v.Complex()
-		return math.Float64bits(real(c)) == 0 && math.Float64bits(imag(c)) == 0
-	case reflect.Array:
-		for i := 0; i < v.Len(); i++ {
-			if !isZero(v.Index(i)) {
-				return false
-			}
-		}
-		return true
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice, reflect.UnsafePointer:
-		return v.IsNil()
-	case reflect.String:
-		return v.Len() == 0
-	case reflect.Struct:
-		for i := 0; i < v.NumField(); i++ {
-			if !isZero(v.Field(i)) {
-				return false
-			}
-		}
-		return true
-	default:
-		panic(&reflect.ValueError{"reflect.Value.IsZero", v.Kind()})
-	}
-}

vendor/google.golang.org/protobuf/internal/impl/pointer_reflect.go

@@ -121,7 +121,6 @@ func (p pointer) String() *string          { return p.v.Interface().(*string) }
 func (p pointer) StringPtr() **string      { return p.v.Interface().(**string) }
 func (p pointer) StringSlice() *[]string   { return p.v.Interface().(*[]string) }
 func (p pointer) Bytes() *[]byte           { return p.v.Interface().(*[]byte) }
-func (p pointer) BytesPtr() **[]byte       { return p.v.Interface().(**[]byte) }
 func (p pointer) BytesSlice() *[][]byte    { return p.v.Interface().(*[][]byte) }
 func (p pointer) WeakFields() *weakFields  { return (*weakFields)(p.v.Interface().(*WeakFields)) }
 func (p pointer) Extensions() *map[int32]ExtensionField {

vendor/google.golang.org/protobuf/internal/impl/pointer_unsafe.go

@@ -109,7 +109,6 @@ func (p pointer) String() *string                       { return (*string)(p.p)
 func (p pointer) StringPtr() **string                   { return (**string)(p.p) }
 func (p pointer) StringSlice() *[]string                { return (*[]string)(p.p) }
 func (p pointer) Bytes() *[]byte                        { return (*[]byte)(p.p) }
-func (p pointer) BytesPtr() **[]byte                    { return (**[]byte)(p.p) }
 func (p pointer) BytesSlice() *[][]byte                 { return (*[][]byte)(p.p) }
 func (p pointer) WeakFields() *weakFields               { return (*weakFields)(p.p) }
 func (p pointer) Extensions() *map[int32]ExtensionField { return (*map[int32]ExtensionField)(p.p) }

vendor/google.golang.org/protobuf/internal/mapsort/mapsort.go

@@ -0,0 +1,43 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package mapsort provides sorted access to maps.
+package mapsort
+
+import (
+	"sort"
+
+	"google.golang.org/protobuf/reflect/protoreflect"
+)
+
+// Range iterates over every map entry in sorted key order,
+// calling f for each key and value encountered.
+func Range(mapv protoreflect.Map, keyKind protoreflect.Kind, f func(protoreflect.MapKey, protoreflect.Value) bool) {
+	var keys []protoreflect.MapKey
+	mapv.Range(func(key protoreflect.MapKey, _ protoreflect.Value) bool {
+		keys = append(keys, key)
+		return true
+	})
+	sort.Slice(keys, func(i, j int) bool {
+		switch keyKind {
+		case protoreflect.BoolKind:
+			return !keys[i].Bool() && keys[j].Bool()
+		case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind,
+			protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
+			return keys[i].Int() < keys[j].Int()
+		case protoreflect.Uint32Kind, protoreflect.Fixed32Kind,
+			protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
+			return keys[i].Uint() < keys[j].Uint()
+		case protoreflect.StringKind:
+			return keys[i].String() < keys[j].String()
+		default:
+			panic("invalid kind: " + keyKind.String())
+		}
+	})
+	for _, key := range keys {
+		if !f(key, mapv.Get(key)) {
+			break
+		}
+	}
+}

vendor/google.golang.org/protobuf/internal/order/order.go

@@ -1,89 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package order
-
-import (
-	pref "google.golang.org/protobuf/reflect/protoreflect"
-)
-
-// FieldOrder specifies the ordering to visit message fields.
-// It is a function that reports whether x is ordered before y.
-type FieldOrder func(x, y pref.FieldDescriptor) bool
-
-var (
-	// AnyFieldOrder specifies no specific field ordering.
-	AnyFieldOrder FieldOrder = nil
-
-	// LegacyFieldOrder sorts fields in the same ordering as emitted by
-	// wire serialization in the github.com/golang/protobuf implementation.
-	LegacyFieldOrder FieldOrder = func(x, y pref.FieldDescriptor) bool {
-		ox, oy := x.ContainingOneof(), y.ContainingOneof()
-		inOneof := func(od pref.OneofDescriptor) bool {
-			return od != nil && !od.IsSynthetic()
-		}
-
-		// Extension fields sort before non-extension fields.
-		if x.IsExtension() != y.IsExtension() {
-			return x.IsExtension() && !y.IsExtension()
-		}
-		// Fields not within a oneof sort before those within a oneof.
-		if inOneof(ox) != inOneof(oy) {
-			return !inOneof(ox) && inOneof(oy)
-		}
-		// Fields in disjoint oneof sets are sorted by declaration index.
-		if ox != nil && oy != nil && ox != oy {
-			return ox.Index() < oy.Index()
-		}
-		// Fields sorted by field number.
-		return x.Number() < y.Number()
-	}
-
-	// NumberFieldOrder sorts fields by their field number.
-	NumberFieldOrder FieldOrder = func(x, y pref.FieldDescriptor) bool {
-		return x.Number() < y.Number()
-	}
-
-	// IndexNameFieldOrder sorts non-extension fields before extension fields.
-	// Non-extensions are sorted according to their declaration index.
-	// Extensions are sorted according to their full name.
-	IndexNameFieldOrder FieldOrder = func(x, y pref.FieldDescriptor) bool {
-		// Non-extension fields sort before extension fields.
-		if x.IsExtension() != y.IsExtension() {
-			return !x.IsExtension() && y.IsExtension()
-		}
-		// Extensions sorted by fullname.
-		if x.IsExtension() && y.IsExtension() {
-			return x.FullName() < y.FullName()
-		}
-		// Non-extensions sorted by declaration index.
-		return x.Index() < y.Index()
-	}
-)
-
-// KeyOrder specifies the ordering to visit map entries.
-// It is a function that reports whether x is ordered before y.
-type KeyOrder func(x, y pref.MapKey) bool
-
-var (
-	// AnyKeyOrder specifies no specific key ordering.
-	AnyKeyOrder KeyOrder = nil
-
-	// GenericKeyOrder sorts false before true, numeric keys in ascending order,
-	// and strings in lexicographical ordering according to UTF-8 codepoints.
-	GenericKeyOrder KeyOrder = func(x, y pref.MapKey) bool {
-		switch x.Interface().(type) {
-		case bool:
-			return !x.Bool() && y.Bool()
-		case int32, int64:
-			return x.Int() < y.Int()
-		case uint32, uint64:
-			return x.Uint() < y.Uint()
-		case string:
-			return x.String() < y.String()
-		default:
-			panic("invalid map key type")
-		}
-	}
-)

vendor/google.golang.org/protobuf/internal/order/range.go

@@ -1,115 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package order provides ordered access to messages and maps.
-package order
-
-import (
-	"sort"
-	"sync"
-
-	pref "google.golang.org/protobuf/reflect/protoreflect"
-)
-
-type messageField struct {
-	fd pref.FieldDescriptor
-	v  pref.Value
-}
-
-var messageFieldPool = sync.Pool{
-	New: func() interface{} { return new([]messageField) },
-}
-
-type (
-	// FieldRnger is an interface for visiting all fields in a message.
-	// The protoreflect.Message type implements this interface.
-	FieldRanger interface{ Range(VisitField) }
-	// VisitField is called everytime a message field is visited.
-	VisitField = func(pref.FieldDescriptor, pref.Value) bool
-)
-
-// RangeFields iterates over the fields of fs according to the specified order.
-func RangeFields(fs FieldRanger, less FieldOrder, fn VisitField) {
-	if less == nil {
-		fs.Range(fn)
-		return
-	}
-
-	// Obtain a pre-allocated scratch buffer.
-	p := messageFieldPool.Get().(*[]messageField)
-	fields := (*p)[:0]
-	defer func() {
-		if cap(fields) < 1024 {
-			*p = fields
-			messageFieldPool.Put(p)
-		}
-	}()
-
-	// Collect all fields in the message and sort them.
-	fs.Range(func(fd pref.FieldDescriptor, v pref.Value) bool {
-		fields = append(fields, messageField{fd, v})
-		return true
-	})
-	sort.Slice(fields, func(i, j int) bool {
-		return less(fields[i].fd, fields[j].fd)
-	})
-
-	// Visit the fields in the specified ordering.
-	for _, f := range fields {
-		if !fn(f.fd, f.v) {
-			return
-		}
-	}
-}
-
-type mapEntry struct {
-	k pref.MapKey
-	v pref.Value
-}
-
-var mapEntryPool = sync.Pool{
-	New: func() interface{} { return new([]mapEntry) },
-}
-
-type (
-	// EntryRanger is an interface for visiting all fields in a message.
-	// The protoreflect.Map type implements this interface.
-	EntryRanger interface{ Range(VisitEntry) }
-	// VisitEntry is called everytime a map entry is visited.
-	VisitEntry = func(pref.MapKey, pref.Value) bool
-)
-
-// RangeEntries iterates over the entries of es according to the specified order.
-func RangeEntries(es EntryRanger, less KeyOrder, fn VisitEntry) {
-	if less == nil {
-		es.Range(fn)
-		return
-	}
-
-	// Obtain a pre-allocated scratch buffer.
-	p := mapEntryPool.Get().(*[]mapEntry)
-	entries := (*p)[:0]
-	defer func() {
-		if cap(entries) < 1024 {
-			*p = entries
-			mapEntryPool.Put(p)
-		}
-	}()
-
-	// Collect all entries in the map and sort them.
-	es.Range(func(k pref.MapKey, v pref.Value) bool {
-		entries = append(entries, mapEntry{k, v})
-		return true
-	})
-	sort.Slice(entries, func(i, j int) bool {
-		return less(entries[i].k, entries[j].k)
-	})
-
-	// Visit the entries in the specified ordering.
-	for _, e := range entries {
-		if !fn(e.k, e.v) {
-			return
-		}
-	}
-}

vendor/google.golang.org/protobuf/internal/version/version.go

@@ -52,7 +52,7 @@ import (
 //	10. Send out the CL for review and submit it.
 const (
 	Major      = 1
-	Minor      = 26
+	Minor      = 25
 	Patch      = 0
 	PreRelease = ""
 )

vendor/google.golang.org/protobuf/proto/decode.go

@@ -45,14 +45,12 @@ type UnmarshalOptions struct {
 }
 
 // Unmarshal parses the wire-format message in b and places the result in m.
-// The provided message must be mutable (e.g., a non-nil pointer to a message).
 func Unmarshal(b []byte, m Message) error {
 	_, err := UnmarshalOptions{}.unmarshal(b, m.ProtoReflect())
 	return err
 }
 
 // Unmarshal parses the wire-format message in b and places the result in m.
-// The provided message must be mutable (e.g., a non-nil pointer to a message).
 func (o UnmarshalOptions) Unmarshal(b []byte, m Message) error {
 	_, err := o.unmarshal(b, m.ProtoReflect())
 	return err
@@ -118,10 +116,10 @@ func (o UnmarshalOptions) unmarshalMessageSlow(b []byte, m protoreflect.Message)
 		// Parse the tag (field number and wire type).
 		num, wtyp, tagLen := protowire.ConsumeTag(b)
 		if tagLen < 0 {
-			return errDecode
+			return protowire.ParseError(tagLen)
 		}
 		if num > protowire.MaxValidNumber {
-			return errDecode
+			return errors.New("invalid field number")
 		}
 
 		// Find the field descriptor for this field number.
@@ -161,7 +159,7 @@ func (o UnmarshalOptions) unmarshalMessageSlow(b []byte, m protoreflect.Message)
 			}
 			valLen = protowire.ConsumeFieldValue(num, wtyp, b[tagLen:])
 			if valLen < 0 {
-				return errDecode
+				return protowire.ParseError(valLen)
 			}
 			if !o.DiscardUnknown {
 				m.SetUnknown(append(m.GetUnknown(), b[:tagLen+valLen]...))
@@ -196,7 +194,7 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp protowire.Type, mapv proto
 	}
 	b, n = protowire.ConsumeBytes(b)
 	if n < 0 {
-		return 0, errDecode
+		return 0, protowire.ParseError(n)
 	}
 	var (
 		keyField = fd.MapKey()
@@ -215,10 +213,10 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp protowire.Type, mapv proto
 	for len(b) > 0 {
 		num, wtyp, n := protowire.ConsumeTag(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		if num > protowire.MaxValidNumber {
-			return 0, errDecode
+			return 0, errors.New("invalid field number")
 		}
 		b = b[n:]
 		err = errUnknown
@@ -248,7 +246,7 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp protowire.Type, mapv proto
 		if err == errUnknown {
 			n = protowire.ConsumeFieldValue(num, wtyp, b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 		} else if err != nil {
 			return 0, err
@@ -274,5 +272,3 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp protowire.Type, mapv proto
 // to the unknown field set of a message. It is never returned from an exported
 // function.
 var errUnknown = errors.New("BUG: internal error (unknown)")
-
-var errDecode = errors.New("cannot parse invalid wire-format data")

vendor/google.golang.org/protobuf/proto/decode_gen.go

@@ -27,7 +27,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfBool(protowire.DecodeBool(v)), n, nil
 	case protoreflect.EnumKind:
@@ -36,7 +36,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfEnum(protoreflect.EnumNumber(v)), n, nil
 	case protoreflect.Int32Kind:
@@ -45,7 +45,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt32(int32(v)), n, nil
 	case protoreflect.Sint32Kind:
@@ -54,7 +54,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt32(int32(protowire.DecodeZigZag(v & math.MaxUint32))), n, nil
 	case protoreflect.Uint32Kind:
@@ -63,7 +63,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfUint32(uint32(v)), n, nil
 	case protoreflect.Int64Kind:
@@ -72,7 +72,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt64(int64(v)), n, nil
 	case protoreflect.Sint64Kind:
@@ -81,7 +81,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt64(protowire.DecodeZigZag(v)), n, nil
 	case protoreflect.Uint64Kind:
@@ -90,7 +90,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfUint64(v), n, nil
 	case protoreflect.Sfixed32Kind:
@@ -99,7 +99,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt32(int32(v)), n, nil
 	case protoreflect.Fixed32Kind:
@@ -108,7 +108,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfUint32(uint32(v)), n, nil
 	case protoreflect.FloatKind:
@@ -117,7 +117,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfFloat32(math.Float32frombits(uint32(v))), n, nil
 	case protoreflect.Sfixed64Kind:
@@ -126,7 +126,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfInt64(int64(v)), n, nil
 	case protoreflect.Fixed64Kind:
@@ -135,7 +135,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfUint64(v), n, nil
 	case protoreflect.DoubleKind:
@@ -144,7 +144,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfFloat64(math.Float64frombits(v)), n, nil
 	case protoreflect.StringKind:
@@ -153,7 +153,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		if strs.EnforceUTF8(fd) && !utf8.Valid(v) {
 			return protoreflect.Value{}, 0, errors.InvalidUTF8(string(fd.FullName()))
@@ -165,7 +165,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfBytes(append(emptyBuf[:], v...)), n, nil
 	case protoreflect.MessageKind:
@@ -174,7 +174,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfBytes(v), n, nil
 	case protoreflect.GroupKind:
@@ -183,7 +183,7 @@ func (o UnmarshalOptions) unmarshalScalar(b []byte, wtyp protowire.Type, fd prot
 		}
 		v, n := protowire.ConsumeGroup(fd.Number(), b)
 		if n < 0 {
-			return val, 0, errDecode
+			return val, 0, protowire.ParseError(n)
 		}
 		return protoreflect.ValueOfBytes(v), n, nil
 	default:
@@ -197,12 +197,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfBool(protowire.DecodeBool(v)))
@@ -214,7 +214,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfBool(protowire.DecodeBool(v)))
 		return n, nil
@@ -222,12 +222,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfEnum(protoreflect.EnumNumber(v)))
@@ -239,7 +239,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfEnum(protoreflect.EnumNumber(v)))
 		return n, nil
@@ -247,12 +247,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt32(int32(v)))
@@ -264,7 +264,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt32(int32(v)))
 		return n, nil
@@ -272,12 +272,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt32(int32(protowire.DecodeZigZag(v & math.MaxUint32))))
@@ -289,7 +289,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt32(int32(protowire.DecodeZigZag(v & math.MaxUint32))))
 		return n, nil
@@ -297,12 +297,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfUint32(uint32(v)))
@@ -314,7 +314,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfUint32(uint32(v)))
 		return n, nil
@@ -322,12 +322,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt64(int64(v)))
@@ -339,7 +339,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt64(int64(v)))
 		return n, nil
@@ -347,12 +347,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt64(protowire.DecodeZigZag(v)))
@@ -364,7 +364,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt64(protowire.DecodeZigZag(v)))
 		return n, nil
@@ -372,12 +372,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeVarint(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfUint64(v))
@@ -389,7 +389,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeVarint(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfUint64(v))
 		return n, nil
@@ -397,12 +397,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed32(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt32(int32(v)))
@@ -414,7 +414,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt32(int32(v)))
 		return n, nil
@@ -422,12 +422,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed32(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfUint32(uint32(v)))
@@ -439,7 +439,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfUint32(uint32(v)))
 		return n, nil
@@ -447,12 +447,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed32(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfFloat32(math.Float32frombits(uint32(v))))
@@ -464,7 +464,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed32(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfFloat32(math.Float32frombits(uint32(v))))
 		return n, nil
@@ -472,12 +472,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed64(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfInt64(int64(v)))
@@ -489,7 +489,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfInt64(int64(v)))
 		return n, nil
@@ -497,12 +497,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed64(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfUint64(v))
@@ -514,7 +514,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfUint64(v))
 		return n, nil
@@ -522,12 +522,12 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		if wtyp == protowire.BytesType {
 			buf, n := protowire.ConsumeBytes(b)
 			if n < 0 {
-				return 0, errDecode
+				return 0, protowire.ParseError(n)
 			}
 			for len(buf) > 0 {
 				v, n := protowire.ConsumeFixed64(buf)
 				if n < 0 {
-					return 0, errDecode
+					return 0, protowire.ParseError(n)
 				}
 				buf = buf[n:]
 				list.Append(protoreflect.ValueOfFloat64(math.Float64frombits(v)))
@@ -539,7 +539,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeFixed64(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfFloat64(math.Float64frombits(v)))
 		return n, nil
@@ -549,7 +549,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		if strs.EnforceUTF8(fd) && !utf8.Valid(v) {
 			return 0, errors.InvalidUTF8(string(fd.FullName()))
@@ -562,7 +562,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		list.Append(protoreflect.ValueOfBytes(append(emptyBuf[:], v...)))
 		return n, nil
@@ -572,7 +572,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeBytes(b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		m := list.NewElement()
 		if err := o.unmarshalMessage(v, m.Message()); err != nil {
@@ -586,7 +586,7 @@ func (o UnmarshalOptions) unmarshalList(b []byte, wtyp protowire.Type, list prot
 		}
 		v, n := protowire.ConsumeGroup(fd.Number(), b)
 		if n < 0 {
-			return 0, errDecode
+			return 0, protowire.ParseError(n)
 		}
 		m := list.NewElement()
 		if err := o.unmarshalMessage(v, m.Message()); err != nil {

vendor/google.golang.org/protobuf/proto/encode.go

@@ -5,9 +5,12 @@
 package proto
 
 import (
+	"sort"
+
 	"google.golang.org/protobuf/encoding/protowire"
 	"google.golang.org/protobuf/internal/encoding/messageset"
-	"google.golang.org/protobuf/internal/order"
+	"google.golang.org/protobuf/internal/fieldsort"
+	"google.golang.org/protobuf/internal/mapsort"
 	"google.golang.org/protobuf/internal/pragma"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/runtime/protoiface"
@@ -208,15 +211,14 @@ func (o MarshalOptions) marshalMessageSlow(b []byte, m protoreflect.Message) ([]
 	if messageset.IsMessageSet(m.Descriptor()) {
 		return o.marshalMessageSet(b, m)
 	}
-	fieldOrder := order.AnyFieldOrder
+	// There are many choices for what order we visit fields in. The default one here
-	if o.Deterministic {
+	// is chosen for reasonable efficiency and simplicity given the protoreflect API.
-		// TODO: This should use a more natural ordering like NumberFieldOrder,
+	// It is not deterministic, since Message.Range does not return fields in any
-		// but doing so breaks golden tests that make invalid assumption about
+	// defined order.
-		// output stability of this implementation.
+	//
-		fieldOrder = order.LegacyFieldOrder
+	// When using deterministic serialization, we sort the known fields.
-	}
 	var err error
-	order.RangeFields(m, fieldOrder, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
+	o.rangeFields(m, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 		b, err = o.marshalField(b, fd, v)
 		return err == nil
 	})
@@ -227,6 +229,27 @@ func (o MarshalOptions) marshalMessageSlow(b []byte, m protoreflect.Message) ([]
 	return b, nil
 }
 
+// rangeFields visits fields in a defined order when deterministic serialization is enabled.
+func (o MarshalOptions) rangeFields(m protoreflect.Message, f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) {
+	if !o.Deterministic {
+		m.Range(f)
+		return
+	}
+	var fds []protoreflect.FieldDescriptor
+	m.Range(func(fd protoreflect.FieldDescriptor, _ protoreflect.Value) bool {
+		fds = append(fds, fd)
+		return true
+	})
+	sort.Slice(fds, func(a, b int) bool {
+		return fieldsort.Less(fds[a], fds[b])
+	})
+	for _, fd := range fds {
+		if !f(fd, m.Get(fd)) {
+			break
+		}
+	}
+}
+
 func (o MarshalOptions) marshalField(b []byte, fd protoreflect.FieldDescriptor, value protoreflect.Value) ([]byte, error) {
 	switch {
 	case fd.IsList():
@@ -269,12 +292,8 @@ func (o MarshalOptions) marshalList(b []byte, fd protoreflect.FieldDescriptor, l
 func (o MarshalOptions) marshalMap(b []byte, fd protoreflect.FieldDescriptor, mapv protoreflect.Map) ([]byte, error) {
 	keyf := fd.MapKey()
 	valf := fd.MapValue()
-	keyOrder := order.AnyKeyOrder
-	if o.Deterministic {
-		keyOrder = order.GenericKeyOrder
-	}
 	var err error
-	order.RangeEntries(mapv, keyOrder, func(key protoreflect.MapKey, value protoreflect.Value) bool {
+	o.rangeMap(mapv, keyf.Kind(), func(key protoreflect.MapKey, value protoreflect.Value) bool {
 		b = protowire.AppendTag(b, fd.Number(), protowire.BytesType)
 		var pos int
 		b, pos = appendSpeculativeLength(b)
@@ -293,6 +312,14 @@ func (o MarshalOptions) marshalMap(b []byte, fd protoreflect.FieldDescriptor, ma
 	return b, err
 }
 
+func (o MarshalOptions) rangeMap(mapv protoreflect.Map, kind protoreflect.Kind, f func(protoreflect.MapKey, protoreflect.Value) bool) {
+	if !o.Deterministic {
+		mapv.Range(f)
+		return
+	}
+	mapsort.Range(mapv, kind, f)
+}
+
 // When encoding length-prefixed fields, we speculatively set aside some number of bytes
 // for the length, encode the data, and then encode the length (shifting the data if necessary
 // to make room).

vendor/google.golang.org/protobuf/proto/equal.go

@@ -111,31 +111,18 @@ func equalList(fd pref.FieldDescriptor, x, y pref.List) bool {
 
 // equalValue compares two singular values.
 func equalValue(fd pref.FieldDescriptor, x, y pref.Value) bool {
-	switch fd.Kind() {
+	switch {
-	case pref.BoolKind:
+	case fd.Message() != nil:
-		return x.Bool() == y.Bool()
+		return equalMessage(x.Message(), y.Message())
-	case pref.EnumKind:
+	case fd.Kind() == pref.BytesKind:
-		return x.Enum() == y.Enum()
+		return bytes.Equal(x.Bytes(), y.Bytes())
-	case pref.Int32Kind, pref.Sint32Kind,
+	case fd.Kind() == pref.FloatKind, fd.Kind() == pref.DoubleKind:
-		pref.Int64Kind, pref.Sint64Kind,
-		pref.Sfixed32Kind, pref.Sfixed64Kind:
-		return x.Int() == y.Int()
-	case pref.Uint32Kind, pref.Uint64Kind,
-		pref.Fixed32Kind, pref.Fixed64Kind:
-		return x.Uint() == y.Uint()
-	case pref.FloatKind, pref.DoubleKind:
 		fx := x.Float()
 		fy := y.Float()
 		if math.IsNaN(fx) || math.IsNaN(fy) {
 			return math.IsNaN(fx) && math.IsNaN(fy)
 		}
 		return fx == fy
-	case pref.StringKind:
-		return x.String() == y.String()
-	case pref.BytesKind:
-		return bytes.Equal(x.Bytes(), y.Bytes())
-	case pref.MessageKind, pref.GroupKind:
-		return equalMessage(x.Message(), y.Message())
 	default:
 		return x.Interface() == y.Interface()
 	}

vendor/google.golang.org/protobuf/proto/messageset.go

@@ -9,7 +9,6 @@ import (
 	"google.golang.org/protobuf/internal/encoding/messageset"
 	"google.golang.org/protobuf/internal/errors"
 	"google.golang.org/protobuf/internal/flags"
-	"google.golang.org/protobuf/internal/order"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 )
@@ -29,12 +28,8 @@ func (o MarshalOptions) marshalMessageSet(b []byte, m protoreflect.Message) ([]b
 	if !flags.ProtoLegacy {
 		return b, errors.New("no support for message_set_wire_format")
 	}
-	fieldOrder := order.AnyFieldOrder
-	if o.Deterministic {
-		fieldOrder = order.NumberFieldOrder
-	}
 	var err error
-	order.RangeFields(m, fieldOrder, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
+	o.rangeFields(m, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 		b, err = o.marshalMessageSetField(b, fd, v)
 		return err == nil
 	})

vendor/google.golang.org/protobuf/proto/proto.go

@@ -32,12 +32,3 @@ var Error error
 func init() {
 	Error = errors.Error
 }
-
-// MessageName returns the full name of m.
-// If m is nil, it returns an empty string.
-func MessageName(m Message) protoreflect.FullName {
-	if m == nil {
-		return ""
-	}
-	return m.ProtoReflect().Descriptor().FullName()
-}

vendor/google.golang.org/protobuf/reflect/protodesc/desc.go

@@ -144,7 +144,6 @@ func (o FileOptions) New(fd *descriptorpb.FileDescriptorProto, r Resolver) (prot
 	}
 
 	// Handle source locations.
-	f.L2.Locations.File = f
 	for _, loc := range fd.GetSourceCodeInfo().GetLocation() {
 		var l protoreflect.SourceLocation
 		// TODO: Validate that the path points to an actual declaration?

vendor/google.golang.org/protobuf/reflect/protodesc/desc_init.go

@@ -135,7 +135,7 @@ func (r descsByName) initFieldsFromDescriptorProto(fds []*descriptorpb.FieldDesc
 			f.L1.Kind = protoreflect.Kind(fd.GetType())
 		}
 		if fd.JsonName != nil {
-			f.L1.StringName.InitJSON(fd.GetJsonName())
+			f.L1.JSONName.Init(fd.GetJsonName())
 		}
 	}
 	return fs, nil
@@ -175,7 +175,7 @@ func (r descsByName) initExtensionDeclarations(xds []*descriptorpb.FieldDescript
 			x.L1.Kind = protoreflect.Kind(xd.GetType())
 		}
 		if xd.JsonName != nil {
-			x.L2.StringName.InitJSON(xd.GetJsonName())
+			x.L2.JSONName.Init(xd.GetJsonName())
 		}
 	}
 	return xs, nil

vendor/google.golang.org/protobuf/reflect/protodesc/desc_validate.go

@@ -239,9 +239,6 @@ func validateExtensionDeclarations(xs []filedesc.Extension, xds []*descriptorpb.
 			return errors.New("extension field %q has an invalid cardinality: %d", x.FullName(), x.Cardinality())
 		}
 		if xd.JsonName != nil {
-			// A bug in older versions of protoc would always populate the
-			// "json_name" option for extensions when it is meaningless.
-			// When it did so, it would always use the camel-cased field name.
 			if xd.GetJsonName() != strs.JSONCamelCase(string(x.Name())) {
 				return errors.New("extension field %q may not have an explicitly set JSON name: %q", x.FullName(), xd.GetJsonName())
 			}

vendor/google.golang.org/protobuf/reflect/protodesc/proto.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"google.golang.org/protobuf/internal/encoding/defval"
-	"google.golang.org/protobuf/internal/strs"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
@@ -21,11 +20,9 @@ import (
 func ToFileDescriptorProto(file protoreflect.FileDescriptor) *descriptorpb.FileDescriptorProto {
 	p := &descriptorpb.FileDescriptorProto{
 		Name:    proto.String(file.Path()),
+		Package: proto.String(string(file.Package())),
 		Options: proto.Clone(file.Options()).(*descriptorpb.FileOptions),
 	}
-	if file.Package() != "" {
-		p.Package = proto.String(string(file.Package()))
-	}
 	for i, imports := 0, file.Imports(); i < imports.Len(); i++ {
 		imp := imports.Get(i)
 		p.Dependency = append(p.Dependency, imp.Path())
@@ -141,14 +138,7 @@ func ToFieldDescriptorProto(field protoreflect.FieldDescriptor) *descriptorpb.Fi
 		p.TypeName = fullNameOf(field.Message())
 	}
 	if field.HasJSONName() {
-		// A bug in older versions of protoc would always populate the
+		p.JsonName = proto.String(field.JSONName())
-		// "json_name" option for extensions when it is meaningless.
-		// When it did so, it would always use the camel-cased field name.
-		if field.IsExtension() {
-			p.JsonName = proto.String(strs.JSONCamelCase(string(field.Name())))
-		} else {
-			p.JsonName = proto.String(field.JSONName())
-		}
 	}
 	if field.Syntax() == protoreflect.Proto3 && field.HasOptionalKeyword() {
 		p.Proto3Optional = proto.Bool(true)

vendor/google.golang.org/protobuf/reflect/protoreflect/source.go

@@ -4,10 +4,6 @@
 
 package protoreflect
 
-import (
-	"strconv"
-)
-
 // SourceLocations is a list of source locations.
 type SourceLocations interface {
 	// Len reports the number of source locations in the proto file.
@@ -15,20 +11,9 @@ type SourceLocations interface {
 	// Get returns the ith SourceLocation. It panics if out of bounds.
 	Get(int) SourceLocation
 
-	// ByPath returns the SourceLocation for the given path,
-	// returning the first location if multiple exist for the same path.
-	// If multiple locations exist for the same path,
-	// then SourceLocation.Next index can be used to identify the
-	// index of the next SourceLocation.
-	// If no location exists for this path, it returns the zero value.
-	ByPath(path SourcePath) SourceLocation
-
-	// ByDescriptor returns the SourceLocation for the given descriptor,
-	// returning the first location if multiple exist for the same path.
-	// If no location exists for this descriptor, it returns the zero value.
-	ByDescriptor(desc Descriptor) SourceLocation
-
 	doNotImplement
+
+	// TODO: Add ByPath and ByDescriptor helper methods.
 }
 
 // SourceLocation describes a source location and
@@ -54,10 +39,6 @@ type SourceLocation struct {
 	LeadingComments string
 	// TrailingComments is the trailing attached comment for the declaration.
 	TrailingComments string
-
-	// Next is an index into SourceLocations for the next source location that
-	// has the same Path. It is zero if there is no next location.
-	Next int
 }
 
 // SourcePath identifies part of a file descriptor for a source location.
@@ -67,62 +48,5 @@ type SourceLocation struct {
 // See google.protobuf.SourceCodeInfo.Location.path.
 type SourcePath []int32
 
-// Equal reports whether p1 equals p2.
+// TODO: Add SourcePath.String method to pretty-print the path. For example:
-func (p1 SourcePath) Equal(p2 SourcePath) bool {
+//	".message_type[6].nested_type[15].field[3]"
-	if len(p1) != len(p2) {
-		return false
-	}
-	for i := range p1 {
-		if p1[i] != p2[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// String formats the path in a humanly readable manner.
-// The output is guaranteed to be deterministic,
-// making it suitable for use as a key into a Go map.
-// It is not guaranteed to be stable as the exact output could change
-// in a future version of this module.
-//
-// Example output:
-//	.message_type[6].nested_type[15].field[3]
-func (p SourcePath) String() string {
-	b := p.appendFileDescriptorProto(nil)
-	for _, i := range p {
-		b = append(b, '.')
-		b = strconv.AppendInt(b, int64(i), 10)
-	}
-	return string(b)
-}
-
-type appendFunc func(*SourcePath, []byte) []byte
-
-func (p *SourcePath) appendSingularField(b []byte, name string, f appendFunc) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	b = append(b, '.')
-	b = append(b, name...)
-	*p = (*p)[1:]
-	if f != nil {
-		b = f(p, b)
-	}
-	return b
-}
-
-func (p *SourcePath) appendRepeatedField(b []byte, name string, f appendFunc) []byte {
-	b = p.appendSingularField(b, name, nil)
-	if len(*p) == 0 || (*p)[0] < 0 {
-		return b
-	}
-	b = append(b, '[')
-	b = strconv.AppendUint(b, uint64((*p)[0]), 10)
-	b = append(b, ']')
-	*p = (*p)[1:]
-	if f != nil {
-		b = f(p, b)
-	}
-	return b
-}

vendor/google.golang.org/protobuf/reflect/protoreflect/source_gen.go

@@ -1,461 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by generate-protos. DO NOT EDIT.
-
-package protoreflect
-
-func (p *SourcePath) appendFileDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendSingularField(b, "package", nil)
-	case 3:
-		b = p.appendRepeatedField(b, "dependency", nil)
-	case 10:
-		b = p.appendRepeatedField(b, "public_dependency", nil)
-	case 11:
-		b = p.appendRepeatedField(b, "weak_dependency", nil)
-	case 4:
-		b = p.appendRepeatedField(b, "message_type", (*SourcePath).appendDescriptorProto)
-	case 5:
-		b = p.appendRepeatedField(b, "enum_type", (*SourcePath).appendEnumDescriptorProto)
-	case 6:
-		b = p.appendRepeatedField(b, "service", (*SourcePath).appendServiceDescriptorProto)
-	case 7:
-		b = p.appendRepeatedField(b, "extension", (*SourcePath).appendFieldDescriptorProto)
-	case 8:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendFileOptions)
-	case 9:
-		b = p.appendSingularField(b, "source_code_info", (*SourcePath).appendSourceCodeInfo)
-	case 12:
-		b = p.appendSingularField(b, "syntax", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendRepeatedField(b, "field", (*SourcePath).appendFieldDescriptorProto)
-	case 6:
-		b = p.appendRepeatedField(b, "extension", (*SourcePath).appendFieldDescriptorProto)
-	case 3:
-		b = p.appendRepeatedField(b, "nested_type", (*SourcePath).appendDescriptorProto)
-	case 4:
-		b = p.appendRepeatedField(b, "enum_type", (*SourcePath).appendEnumDescriptorProto)
-	case 5:
-		b = p.appendRepeatedField(b, "extension_range", (*SourcePath).appendDescriptorProto_ExtensionRange)
-	case 8:
-		b = p.appendRepeatedField(b, "oneof_decl", (*SourcePath).appendOneofDescriptorProto)
-	case 7:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendMessageOptions)
-	case 9:
-		b = p.appendRepeatedField(b, "reserved_range", (*SourcePath).appendDescriptorProto_ReservedRange)
-	case 10:
-		b = p.appendRepeatedField(b, "reserved_name", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendEnumDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendRepeatedField(b, "value", (*SourcePath).appendEnumValueDescriptorProto)
-	case 3:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendEnumOptions)
-	case 4:
-		b = p.appendRepeatedField(b, "reserved_range", (*SourcePath).appendEnumDescriptorProto_EnumReservedRange)
-	case 5:
-		b = p.appendRepeatedField(b, "reserved_name", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendServiceDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendRepeatedField(b, "method", (*SourcePath).appendMethodDescriptorProto)
-	case 3:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendServiceOptions)
-	}
-	return b
-}
-
-func (p *SourcePath) appendFieldDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 3:
-		b = p.appendSingularField(b, "number", nil)
-	case 4:
-		b = p.appendSingularField(b, "label", nil)
-	case 5:
-		b = p.appendSingularField(b, "type", nil)
-	case 6:
-		b = p.appendSingularField(b, "type_name", nil)
-	case 2:
-		b = p.appendSingularField(b, "extendee", nil)
-	case 7:
-		b = p.appendSingularField(b, "default_value", nil)
-	case 9:
-		b = p.appendSingularField(b, "oneof_index", nil)
-	case 10:
-		b = p.appendSingularField(b, "json_name", nil)
-	case 8:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendFieldOptions)
-	case 17:
-		b = p.appendSingularField(b, "proto3_optional", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendFileOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "java_package", nil)
-	case 8:
-		b = p.appendSingularField(b, "java_outer_classname", nil)
-	case 10:
-		b = p.appendSingularField(b, "java_multiple_files", nil)
-	case 20:
-		b = p.appendSingularField(b, "java_generate_equals_and_hash", nil)
-	case 27:
-		b = p.appendSingularField(b, "java_string_check_utf8", nil)
-	case 9:
-		b = p.appendSingularField(b, "optimize_for", nil)
-	case 11:
-		b = p.appendSingularField(b, "go_package", nil)
-	case 16:
-		b = p.appendSingularField(b, "cc_generic_services", nil)
-	case 17:
-		b = p.appendSingularField(b, "java_generic_services", nil)
-	case 18:
-		b = p.appendSingularField(b, "py_generic_services", nil)
-	case 42:
-		b = p.appendSingularField(b, "php_generic_services", nil)
-	case 23:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 31:
-		b = p.appendSingularField(b, "cc_enable_arenas", nil)
-	case 36:
-		b = p.appendSingularField(b, "objc_class_prefix", nil)
-	case 37:
-		b = p.appendSingularField(b, "csharp_namespace", nil)
-	case 39:
-		b = p.appendSingularField(b, "swift_prefix", nil)
-	case 40:
-		b = p.appendSingularField(b, "php_class_prefix", nil)
-	case 41:
-		b = p.appendSingularField(b, "php_namespace", nil)
-	case 44:
-		b = p.appendSingularField(b, "php_metadata_namespace", nil)
-	case 45:
-		b = p.appendSingularField(b, "ruby_package", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendSourceCodeInfo(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendRepeatedField(b, "location", (*SourcePath).appendSourceCodeInfo_Location)
-	}
-	return b
-}
-
-func (p *SourcePath) appendDescriptorProto_ExtensionRange(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "start", nil)
-	case 2:
-		b = p.appendSingularField(b, "end", nil)
-	case 3:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendExtensionRangeOptions)
-	}
-	return b
-}
-
-func (p *SourcePath) appendOneofDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendOneofOptions)
-	}
-	return b
-}
-
-func (p *SourcePath) appendMessageOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "message_set_wire_format", nil)
-	case 2:
-		b = p.appendSingularField(b, "no_standard_descriptor_accessor", nil)
-	case 3:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 7:
-		b = p.appendSingularField(b, "map_entry", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendDescriptorProto_ReservedRange(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "start", nil)
-	case 2:
-		b = p.appendSingularField(b, "end", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendEnumValueDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendSingularField(b, "number", nil)
-	case 3:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendEnumValueOptions)
-	}
-	return b
-}
-
-func (p *SourcePath) appendEnumOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 2:
-		b = p.appendSingularField(b, "allow_alias", nil)
-	case 3:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendEnumDescriptorProto_EnumReservedRange(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "start", nil)
-	case 2:
-		b = p.appendSingularField(b, "end", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendMethodDescriptorProto(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name", nil)
-	case 2:
-		b = p.appendSingularField(b, "input_type", nil)
-	case 3:
-		b = p.appendSingularField(b, "output_type", nil)
-	case 4:
-		b = p.appendSingularField(b, "options", (*SourcePath).appendMethodOptions)
-	case 5:
-		b = p.appendSingularField(b, "client_streaming", nil)
-	case 6:
-		b = p.appendSingularField(b, "server_streaming", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendServiceOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 33:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendFieldOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "ctype", nil)
-	case 2:
-		b = p.appendSingularField(b, "packed", nil)
-	case 6:
-		b = p.appendSingularField(b, "jstype", nil)
-	case 5:
-		b = p.appendSingularField(b, "lazy", nil)
-	case 3:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 10:
-		b = p.appendSingularField(b, "weak", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendUninterpretedOption(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 2:
-		b = p.appendRepeatedField(b, "name", (*SourcePath).appendUninterpretedOption_NamePart)
-	case 3:
-		b = p.appendSingularField(b, "identifier_value", nil)
-	case 4:
-		b = p.appendSingularField(b, "positive_int_value", nil)
-	case 5:
-		b = p.appendSingularField(b, "negative_int_value", nil)
-	case 6:
-		b = p.appendSingularField(b, "double_value", nil)
-	case 7:
-		b = p.appendSingularField(b, "string_value", nil)
-	case 8:
-		b = p.appendSingularField(b, "aggregate_value", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendSourceCodeInfo_Location(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendRepeatedField(b, "path", nil)
-	case 2:
-		b = p.appendRepeatedField(b, "span", nil)
-	case 3:
-		b = p.appendSingularField(b, "leading_comments", nil)
-	case 4:
-		b = p.appendSingularField(b, "trailing_comments", nil)
-	case 6:
-		b = p.appendRepeatedField(b, "leading_detached_comments", nil)
-	}
-	return b
-}
-
-func (p *SourcePath) appendExtensionRangeOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendOneofOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendEnumValueOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendMethodOptions(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 33:
-		b = p.appendSingularField(b, "deprecated", nil)
-	case 34:
-		b = p.appendSingularField(b, "idempotency_level", nil)
-	case 999:
-		b = p.appendRepeatedField(b, "uninterpreted_option", (*SourcePath).appendUninterpretedOption)
-	}
-	return b
-}
-
-func (p *SourcePath) appendUninterpretedOption_NamePart(b []byte) []byte {
-	if len(*p) == 0 {
-		return b
-	}
-	switch (*p)[0] {
-	case 1:
-		b = p.appendSingularField(b, "name_part", nil)
-	case 2:
-		b = p.appendSingularField(b, "is_extension", nil)
-	}
-	return b
-}

vendor/google.golang.org/protobuf/reflect/protoreflect/type.go

@@ -232,15 +232,11 @@ type MessageDescriptor interface {
 type isMessageDescriptor interface{ ProtoType(MessageDescriptor) }
 
 // MessageType encapsulates a MessageDescriptor with a concrete Go implementation.
-// It is recommended that implementations of this interface also implement the
-// MessageFieldTypes interface.
 type MessageType interface {
 	// New returns a newly allocated empty message.
-	// It may return nil for synthetic messages representing a map entry.
 	New() Message
 
 	// Zero returns an empty, read-only message.
-	// It may return nil for synthetic messages representing a map entry.
 	Zero() Message
 
 	// Descriptor returns the message descriptor.
@@ -249,26 +245,6 @@ type MessageType interface {
 	Descriptor() MessageDescriptor
 }
 
-// MessageFieldTypes extends a MessageType by providing type information
-// regarding enums and messages referenced by the message fields.
-type MessageFieldTypes interface {
-	MessageType
-
-	// Enum returns the EnumType for the ith field in Descriptor.Fields.
-	// It returns nil if the ith field is not an enum kind.
-	// It panics if out of bounds.
-	//
-	// Invariant: mt.Enum(i).Descriptor() == mt.Descriptor().Fields(i).Enum()
-	Enum(i int) EnumType
-
-	// Message returns the MessageType for the ith field in Descriptor.Fields.
-	// It returns nil if the ith field is not a message or group kind.
-	// It panics if out of bounds.
-	//
-	// Invariant: mt.Message(i).Descriptor() == mt.Descriptor().Fields(i).Message()
-	Message(i int) MessageType
-}
-
 // MessageDescriptors is a list of message declarations.
 type MessageDescriptors interface {
 	// Len reports the number of messages.
@@ -303,15 +279,8 @@ type FieldDescriptor interface {
 
 	// JSONName reports the name used for JSON serialization.
 	// It is usually the camel-cased form of the field name.
-	// Extension fields are represented by the full name surrounded by brackets.
 	JSONName() string
 
-	// TextName reports the name used for text serialization.
-	// It is usually the name of the field, except that groups use the name
-	// of the inlined message, and extension fields are represented by the
-	// full name surrounded by brackets.
-	TextName() string
-
 	// HasPresence reports whether the field distinguishes between unpopulated
 	// and default values.
 	HasPresence() bool
@@ -402,9 +371,6 @@ type FieldDescriptors interface {
 	// ByJSONName returns the FieldDescriptor for a field with s as the JSON name.
 	// It returns nil if not found.
 	ByJSONName(s string) FieldDescriptor
-	// ByTextName returns the FieldDescriptor for a field with s as the text name.
-	// It returns nil if not found.
-	ByTextName(s string) FieldDescriptor
 	// ByNumber returns the FieldDescriptor for a field numbered n.
 	// It returns nil if not found.
 	ByNumber(n FieldNumber) FieldDescriptor

vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go

@@ -17,49 +17,24 @@ package protoregistry
 
 import (
 	"fmt"
-	"os"
+	"log"
 	"strings"
 	"sync"
 
-	"google.golang.org/protobuf/internal/encoding/messageset"
 	"google.golang.org/protobuf/internal/errors"
-	"google.golang.org/protobuf/internal/flags"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
-// conflictPolicy configures the policy for handling registration conflicts.
-//
-// It can be over-written at compile time with a linker-initialized variable:
-//	go build -ldflags "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn"
-//
-// It can be over-written at program execution with an environment variable:
-//	GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn ./main
-//
-// Neither of the above are covered by the compatibility promise and
-// may be removed in a future release of this module.
-var conflictPolicy = "panic" // "panic" | "warn" | "ignore"
-
 // ignoreConflict reports whether to ignore a registration conflict
 // given the descriptor being registered and the error.
 // It is a variable so that the behavior is easily overridden in another file.
 var ignoreConflict = func(d protoreflect.Descriptor, err error) bool {
-	const env = "GOLANG_PROTOBUF_REGISTRATION_CONFLICT"
+	log.Printf(""+
-	const faq = "https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict"
+		"WARNING: %v\n"+
-	policy := conflictPolicy
+		"A future release will panic on registration conflicts. See:\n"+
-	if v := os.Getenv(env); v != "" {
+		"https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict\n"+
-		policy = v
+		"\n", err)
-	}
+	return true
-	switch policy {
-	case "panic":
-		panic(fmt.Sprintf("%v\nSee %v\n", err, faq))
-	case "warn":
-		fmt.Fprintf(os.Stderr, "WARNING: %v\nSee %v\n\n", err, faq)
-		return true
-	case "ignore":
-		return true
-	default:
-		panic("invalid " + env + " value: " + os.Getenv(env))
-	}
 }
 
 var globalMutex sync.RWMutex
@@ -121,7 +96,38 @@ func (r *Files) RegisterFile(file protoreflect.FileDescriptor) error {
 	}
 	path := file.Path()
 	if prev := r.filesByPath[path]; prev != nil {
-		r.checkGenProtoConflict(path)
+		// TODO: Remove this after some soak-in period after moving these types.
+		var prevPath string
+		const prevModule = "google.golang.org/genproto"
+		const prevVersion = "cb27e3aa (May 26th, 2020)"
+		switch path {
+		case "google/protobuf/field_mask.proto":
+			prevPath = prevModule + "/protobuf/field_mask"
+		case "google/protobuf/api.proto":
+			prevPath = prevModule + "/protobuf/api"
+		case "google/protobuf/type.proto":
+			prevPath = prevModule + "/protobuf/ptype"
+		case "google/protobuf/source_context.proto":
+			prevPath = prevModule + "/protobuf/source_context"
+		}
+		if r == GlobalFiles && prevPath != "" {
+			pkgName := strings.TrimSuffix(strings.TrimPrefix(path, "google/protobuf/"), ".proto")
+			pkgName = strings.Replace(pkgName, "_", "", -1) + "pb"
+			currPath := "google.golang.org/protobuf/types/known/" + pkgName
+			panic(fmt.Sprintf(""+
+				"duplicate registration of %q\n"+
+				"\n"+
+				"The generated definition for this file has moved:\n"+
+				"\tfrom: %q\n"+
+				"\tto:   %q\n"+
+				"A dependency on the %q module must\n"+
+				"be at version %v or higher.\n"+
+				"\n"+
+				"Upgrade the dependency by running:\n"+
+				"\tgo get -u %v\n",
+				path, prevPath, currPath, prevModule, prevVersion, prevPath))
+		}
+
 		err := errors.New("file %q is already registered", file.Path())
 		err = amendErrorWithCaller(err, prev, file)
 		if r == GlobalFiles && ignoreConflict(file, err) {
@@ -172,47 +178,6 @@ func (r *Files) RegisterFile(file protoreflect.FileDescriptor) error {
 	return nil
 }
 
-// Several well-known types were hosted in the google.golang.org/genproto module
-// but were later moved to this module. To avoid a weak dependency on the
-// genproto module (and its relatively large set of transitive dependencies),
-// we rely on a registration conflict to determine whether the genproto version
-// is too old (i.e., does not contain aliases to the new type declarations).
-func (r *Files) checkGenProtoConflict(path string) {
-	if r != GlobalFiles {
-		return
-	}
-	var prevPath string
-	const prevModule = "google.golang.org/genproto"
-	const prevVersion = "cb27e3aa (May 26th, 2020)"
-	switch path {
-	case "google/protobuf/field_mask.proto":
-		prevPath = prevModule + "/protobuf/field_mask"
-	case "google/protobuf/api.proto":
-		prevPath = prevModule + "/protobuf/api"
-	case "google/protobuf/type.proto":
-		prevPath = prevModule + "/protobuf/ptype"
-	case "google/protobuf/source_context.proto":
-		prevPath = prevModule + "/protobuf/source_context"
-	default:
-		return
-	}
-	pkgName := strings.TrimSuffix(strings.TrimPrefix(path, "google/protobuf/"), ".proto")
-	pkgName = strings.Replace(pkgName, "_", "", -1) + "pb" // e.g., "field_mask" => "fieldmaskpb"
-	currPath := "google.golang.org/protobuf/types/known/" + pkgName
-	panic(fmt.Sprintf(""+
-		"duplicate registration of %q\n"+
-		"\n"+
-		"The generated definition for this file has moved:\n"+
-		"\tfrom: %q\n"+
-		"\tto:   %q\n"+
-		"A dependency on the %q module must\n"+
-		"be at version %v or higher.\n"+
-		"\n"+
-		"Upgrade the dependency by running:\n"+
-		"\tgo get -u %v\n",
-		path, prevPath, currPath, prevModule, prevVersion, prevPath))
-}
-
 // FindDescriptorByName looks up a descriptor by the full name.
 //
 // This returns (nil, NotFound) if not found.
@@ -595,25 +560,13 @@ func (r *Types) FindEnumByName(enum protoreflect.FullName) (protoreflect.EnumTyp
 	return nil, NotFound
 }
 
-// FindMessageByName looks up a message by its full name,
+// FindMessageByName looks up a message by its full name.
-// e.g. "google.protobuf.Any".
+// E.g., "google.protobuf.Any"
 //
-// This returns (nil, NotFound) if not found.
+// This return (nil, NotFound) if not found.
 func (r *Types) FindMessageByName(message protoreflect.FullName) (protoreflect.MessageType, error) {
-	if r == nil {
+	// The full name by itself is a valid URL.
-		return nil, NotFound
+	return r.FindMessageByURL(string(message))
-	}
-	if r == GlobalTypes {
-		globalMutex.RLock()
-		defer globalMutex.RUnlock()
-	}
-	if v := r.typesByName[message]; v != nil {
-		if mt, _ := v.(protoreflect.MessageType); mt != nil {
-			return mt, nil
-		}
-		return nil, errors.New("found wrong type: got %v, want message", typeName(v))
-	}
-	return nil, NotFound
 }
 
 // FindMessageByURL looks up a message by a URL identifier.
@@ -621,8 +574,6 @@ func (r *Types) FindMessageByName(message protoreflect.FullName) (protoreflect.M
 //
 // This returns (nil, NotFound) if not found.
 func (r *Types) FindMessageByURL(url string) (protoreflect.MessageType, error) {
-	// This function is similar to FindMessageByName but
-	// truncates anything before and including '/' in the URL.
 	if r == nil {
 		return nil, NotFound
 	}
@@ -662,26 +613,6 @@ func (r *Types) FindExtensionByName(field protoreflect.FullName) (protoreflect.E
 		if xt, _ := v.(protoreflect.ExtensionType); xt != nil {
 			return xt, nil
 		}
-
-		// MessageSet extensions are special in that the name of the extension
-		// is the name of the message type used to extend the MessageSet.
-		// This naming scheme is used by text and JSON serialization.
-		//
-		// This feature is protected by the ProtoLegacy flag since MessageSets
-		// are a proto1 feature that is long deprecated.
-		if flags.ProtoLegacy {
-			if _, ok := v.(protoreflect.MessageType); ok {
-				field := field.Append(messageset.ExtensionName)
-				if v := r.typesByName[field]; v != nil {
-					if xt, _ := v.(protoreflect.ExtensionType); xt != nil {
-						if messageset.IsMessageSetExtension(xt.TypeDescriptor()) {
-							return xt, nil
-						}
-					}
-				}
-			}
-		}
-
 		return nil, errors.New("found wrong type: got %v, want extension", typeName(v))
 	}
 	return nil, NotFound

vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go

@@ -3557,15 +3557,16 @@ var file_google_protobuf_descriptor_proto_rawDesc = []byte{
 	0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x65, 0x67,
 	0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x12,
 	0x10, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x6e,
-	0x64, 0x42, 0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x64, 0x42, 0x8f, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x10, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x10, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x2d, 0x67, 0x6f,
+	0x69, 0x70, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x48, 0x01, 0x5a, 0x3e, 0x67,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x70, 0x62, 0xf8, 0x01, 0x01, 0xa2, 0x02,
+	0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1a, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72,
+	0x6f, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0xf8, 0x01, 0x01,
-	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f,
+	0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1a, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x6e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x52, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e,
 }
 
 var (

vendor/google.golang.org/protobuf/types/known/anypb/any.pb.go

@@ -166,13 +166,10 @@ import (
 //  Example 4: Pack and unpack a message in Go
 //
 //      foo := &pb.Foo{...}
-//      any, err := anypb.New(foo)
+//      any, err := ptypes.MarshalAny(foo)
-//      if err != nil {
-//        ...
-//      }
 //      ...
 //      foo := &pb.Foo{}
-//      if err := any.UnmarshalTo(foo); err != nil {
+//      if err := ptypes.UnmarshalAny(any, foo); err != nil {
 //        ...
 //      }
 //
@@ -423,15 +420,14 @@ var file_google_protobuf_any_proto_rawDesc = []byte{
 	0x41, 0x6e, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x14,
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x42, 0x76, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x6f, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x08, 0x41, 0x6e, 0x79,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x2f,
+	0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x79, 0xa2, 0x02,
-	0x61, 0x6e, 0x79, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f,
+	0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e,
-	0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72,
+	0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

vendor/google.golang.org/protobuf/types/known/durationpb/duration.pb.go

@@ -303,16 +303,16 @@ var file_google_protobuf_duration_proto_rawDesc = []byte{
 	0x66, 0x22, 0x3a, 0x0a, 0x08, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a,
 	0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07,
 	0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x83, 0x01,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x7c, 0x0a,
-	0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50,
+	0x6f, 0x62, 0x75, 0x66, 0x42, 0x0d, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x2f, 0x64,
+	0x66, 0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x70, 0x62, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47,
+	0x6e, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f,
-	0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
+	0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79,
+	0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x6f, 0x33,
 }
 
 var (

vendor/google.golang.org/protobuf/types/known/timestamppb/timestamp.pb.go

@@ -134,16 +134,7 @@ import (
 //         .setNanos((int) ((millis % 1000) * 1000000)).build();
 //
 //
-// Example 5: Compute Timestamp from Java `Instant.now()`.
+// Example 5: Compute Timestamp from current time in Python.
-//
-//     Instant now = Instant.now();
-//
-//     Timestamp timestamp =
-//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-//             .setNanos(now.getNano()).build();
-//
-//
-// Example 6: Compute Timestamp from current time in Python.
 //
 //     timestamp = Timestamp()
 //     timestamp.GetCurrentTime()
@@ -315,15 +306,15 @@ var file_google_protobuf_timestamp_proto_rawDesc = []byte{
 	0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e,
 	0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42,
-	0x85, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x7e, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42, 0x0e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x6d, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x69, 0x6d, 0x65,
-	0x6e, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x70, 0x62, 0xf8, 0x01, 0x01,
+	0x73, 0x74, 0x61, 0x6d, 0x70, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02,
-	0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f,
+	0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62,
-	0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

vendor/google.golang.org/protobuf/types/known/wrapperspb/wrappers.pb.go

@@ -580,16 +580,15 @@ var file_google_protobuf_wrappers_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
 	0x61, 0x6c, 0x75, 0x65, 0x22, 0x22, 0x0a, 0x0a, 0x42, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c,
 	0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x83, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d,
+	0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x7c, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x42,
-	0x42, 0x0d, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x0d, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x01, 0x5a, 0x31, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67,
+	0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
-	0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x79,
+	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
-	0x70, 0x65, 0x73, 0x2f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
+	0x70, 0x65, 0x73, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0xf8, 0x01, 0x01, 0xa2,
-	0x72, 0x73, 0x70, 0x62, 0xf8, 0x01, 0x01, 0xa2, 0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e,
+	0x02, 0x03, 0x47, 0x50, 0x42, 0xaa, 0x02, 0x1e, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50,
-	0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77,
-	0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

vendor/modules.txt

@@ -59,6 +59,10 @@ github.com/ceph/go-ceph/rbd
 github.com/cespare/xxhash/v2
 # github.com/container-storage-interface/spec v1.3.0
 github.com/container-storage-interface/spec/lib/go/csi
+# github.com/csi-addons/replication-lib-utils v0.2.0
+github.com/csi-addons/replication-lib-utils/protosanitizer
+# github.com/csi-addons/spec v0.1.0
+github.com/csi-addons/spec/lib/go/replication
 # github.com/davecgh/go-spew v1.1.1
 github.com/davecgh/go-spew/spew
 # github.com/docker/distribution v2.7.1+incompatible
@@ -89,7 +93,7 @@ github.com/golang/protobuf/ptypes/timestamp
 github.com/golang/protobuf/ptypes/wrappers
 # github.com/golang/snappy v0.0.1
 github.com/golang/snappy
-# github.com/google/go-cmp v0.5.5
+# github.com/google/go-cmp v0.5.2
 github.com/google/go-cmp/cmp
 github.com/google/go-cmp/cmp/internal/diff
 github.com/google/go-cmp/cmp/internal/flags
@@ -158,10 +162,6 @@ github.com/imdario/mergo
 github.com/jmespath/go-jmespath
 # github.com/json-iterator/go v1.1.10
 github.com/json-iterator/go
-# github.com/kube-storage/replication-lib-utils v0.1.0
-github.com/kube-storage/replication-lib-utils/protosanitizer
-# github.com/kube-storage/spec v0.1.0
-github.com/kube-storage/spec/lib/go/replication
 # github.com/kubernetes-csi/csi-lib-utils v0.7.0
 github.com/kubernetes-csi/csi-lib-utils/connection
 github.com/kubernetes-csi/csi-lib-utils/metrics
@@ -374,7 +374,7 @@ google.golang.org/grpc/serviceconfig
 google.golang.org/grpc/stats
 google.golang.org/grpc/status
 google.golang.org/grpc/tap
-# google.golang.org/protobuf v1.26.0
+# google.golang.org/protobuf v1.25.0
 google.golang.org/protobuf/encoding/prototext
 google.golang.org/protobuf/encoding/protowire
 google.golang.org/protobuf/internal/descfmt
@@ -385,12 +385,13 @@ google.golang.org/protobuf/internal/encoding/messageset
 google.golang.org/protobuf/internal/encoding/tag
 google.golang.org/protobuf/internal/encoding/text
 google.golang.org/protobuf/internal/errors
+google.golang.org/protobuf/internal/fieldsort
 google.golang.org/protobuf/internal/filedesc
 google.golang.org/protobuf/internal/filetype
 google.golang.org/protobuf/internal/flags
 google.golang.org/protobuf/internal/genid
 google.golang.org/protobuf/internal/impl
-google.golang.org/protobuf/internal/order
+google.golang.org/protobuf/internal/mapsort
 google.golang.org/protobuf/internal/pragma
 google.golang.org/protobuf/internal/set
 google.golang.org/protobuf/internal/strs