proto: drop dependence on v2 protoimpl.ExtensionFieldsV2

The v2 protoimpl.ExtensionFieldsV2 is now just an alias
to an unnamed map, which simplifies our implementation.
Also, we can drop all synchronization since we now eagerly
unmarshal extension fields.

Change-Id: I4baa31e3d610d04d702686a489ebdb5e246276ab
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172437
Reviewed-by: Damien Neil <dneil@google.com>

go.mod

@@ -1,3 +1,3 @@
 module github.com/golang/protobuf
 
-require github.com/golang/protobuf/v2 v2.0.0-20190409211845-4ec39c766335
+require github.com/golang/protobuf/v2 v2.0.0-20190416222953-ab61d41ec93f

go.sum

@@ -1,8 +1,7 @@
 github.com/golang/protobuf v1.2.1-0.20190322195920-d94fb84e04b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.1-0.20190326022002-be03c15fcaa2/go.mod h1:rZ4veVXHB1S2+o7TKqD9Isxml062IeDutnCDtFPUlCc=
-github.com/golang/protobuf/v2 v2.0.0-20190322201422-f503c300f70e h1:JQRqkjZt61BlBnTP2OpISUfb5I1LGJcqYHfFGERMmlg=
 github.com/golang/protobuf/v2 v2.0.0-20190322201422-f503c300f70e/go.mod h1:25ZALhydMFaBRgPH58a8zpFe9YXMAMjOYWtB6pNPcoo=
-github.com/golang/protobuf/v2 v2.0.0-20190409211845-4ec39c766335 h1:dtT6y87fe34KJUI0FyKXi08Y1XZIU5NgxDl6yojsYdI=
-github.com/golang/protobuf/v2 v2.0.0-20190409211845-4ec39c766335/go.mod h1:baUT2weUsA1MR7ocRtLXLmi2B1s4VrUT3S6tO8AYzMw=
+github.com/golang/protobuf/v2 v2.0.0-20190416222953-ab61d41ec93f h1:/ykGaIiod920llcsrLlxw+U2sJkPdzwWF+zABcffzHc=
+github.com/golang/protobuf/v2 v2.0.0-20190416222953-ab61d41ec93f/go.mod h1:baUT2weUsA1MR7ocRtLXLmi2B1s4VrUT3S6tO8AYzMw=
 github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42 h1:q3pnF5JFBNRz8sRD+IRj7Y6DMyYGTNqnZ9axTbSfoNI=
 github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

proto/clone.go

@@ -85,10 +85,8 @@ func mergeStruct(out, in reflect.Value) {
 
 	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 		emOut, _ := extendable(out.Addr().Interface())
-		if emIn.HasInit() {
-			emIn.Lock()
+		if emIn != nil {
 			mergeExtension(emOut, emIn)
-			emIn.Unlock()
 		}
 	}
 
@@ -208,7 +206,7 @@ func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
 	}
 }
 
-func mergeExtension(out, in extensionFields) {
+func mergeExtension(out, in *extensionMap) {
 	in.Range(func(extNum protoreflect.FieldNumber, eIn Extension) bool {
 		eOut := Extension{Desc: eIn.Desc}
 		if eIn.Value != nil {

proto/equal.go

@@ -13,7 +13,6 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
 )
 
 /*
@@ -94,8 +93,8 @@ func equalStruct(v1, v2 reflect.Value) bool {
 
 	if em1 := v1.FieldByName("XXX_InternalExtensions"); em1.IsValid() {
 		em2 := v2.FieldByName("XXX_InternalExtensions")
-		m1 := protoimpl.X.ExtensionFieldsOf(em1.Addr().Interface())
-		m2 := protoimpl.X.ExtensionFieldsOf(em2.Addr().Interface())
+		m1 := extensionFieldsOf(em1.Addr().Interface())
+		m2 := extensionFieldsOf(em2.Addr().Interface())
 		if !equalExtensions(v1.Type(), m1, m2) {
 			return false
 		}
@@ -103,8 +102,8 @@ func equalStruct(v1, v2 reflect.Value) bool {
 
 	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
 		em2 := v2.FieldByName("XXX_extensions")
-		m1 := protoimpl.X.ExtensionFieldsOf(em1.Addr().Interface())
-		m2 := protoimpl.X.ExtensionFieldsOf(em2.Addr().Interface())
+		m1 := extensionFieldsOf(em1.Addr().Interface())
+		m2 := extensionFieldsOf(em2.Addr().Interface())
 		if !equalExtensions(v1.Type(), m1, m2) {
 			return false
 		}
@@ -207,7 +206,7 @@ func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
 	return false
 }
 
-func equalExtensions(base reflect.Type, em1, em2 extensionFields) bool {
+func equalExtensions(base reflect.Type, em1, em2 *extensionMap) bool {
 	if em1.Len() != em2.Len() {
 		return false
 	}

proto/extensions.go

@@ -23,7 +23,43 @@ import (
 // ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
 var ErrMissingExtension = errors.New("proto: missing extension")
 
-func extendable(p interface{}) (extensionFields, error) {
+func extensionFieldsOf(p interface{}) *extensionMap {
+	if p, ok := p.(*map[int32]Extension); ok {
+		return (*extensionMap)(p)
+	}
+	panic(fmt.Sprintf("invalid extension fields type: %T", p))
+}
+
+type extensionMap map[int32]Extension
+
+func (m extensionMap) Len() int {
+	return len(m)
+}
+func (m extensionMap) Has(n protoreflect.FieldNumber) bool {
+	_, ok := m[int32(n)]
+	return ok
+}
+func (m extensionMap) Get(n protoreflect.FieldNumber) Extension {
+	return m[int32(n)]
+}
+func (m *extensionMap) Set(n protoreflect.FieldNumber, x Extension) {
+	if *m == nil {
+		*m = make(map[int32]Extension)
+	}
+	(*m)[int32(n)] = x
+}
+func (m *extensionMap) Clear(n protoreflect.FieldNumber) {
+	delete(*m, int32(n))
+}
+func (m extensionMap) Range(f func(protoreflect.FieldNumber, Extension) bool) {
+	for n, x := range m {
+		if !f(protoreflect.FieldNumber(n), x) {
+			return
+		}
+	}
+}
+
+func extendable(p interface{}) (*extensionMap, error) {
 	type extendableProto interface {
 		Message
 		ExtensionRangeArray() []ExtensionRange
@@ -33,10 +69,10 @@ func extendable(p interface{}) (extensionFields, error) {
 		if v.Kind() == reflect.Ptr && !v.IsNil() {
 			v = v.Elem()
 			if v := v.FieldByName("XXX_InternalExtensions"); v.IsValid() {
-				return protoimpl.X.ExtensionFieldsOf(v.Addr().Interface()), nil
+				return extensionFieldsOf(v.Addr().Interface()), nil
 			}
 			if v := v.FieldByName("XXX_extensions"); v.IsValid() {
-				return protoimpl.X.ExtensionFieldsOf(v.Addr().Interface()), nil
+				return extensionFieldsOf(v.Addr().Interface()), nil
 			}
 		}
 	}
@@ -51,7 +87,7 @@ type (
 	ExtensionRange         = protoiface.ExtensionRangeV1
 	ExtensionDesc          = protoiface.ExtensionDescV1
 	Extension              = protoimpl.ExtensionFieldV1
-	XXX_InternalExtensions = protoimpl.ExtensionFieldsV1
+	XXX_InternalExtensions = protoimpl.ExtensionFields
 )
 
 func isRepeatedExtension(ed *ExtensionDesc) bool {
@@ -139,11 +175,9 @@ func HasExtension(pb Message, extension *ExtensionDesc) bool {
 	if err != nil {
 		return false
 	}
-	if !epb.HasInit() {
+	if epb == nil {
 		return false
 	}
-	epb.Lock()
-	defer epb.Unlock()
 	return epb.Has(protoreflect.FieldNumber(extension.Field))
 }
 
@@ -177,11 +211,9 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 		return nil, err
 	}
 
-	if !epb.HasInit() {
+	if epb == nil {
 		return defaultExtensionValue(pb, extension)
 	}
-	epb.Lock()
-	defer epb.Unlock()
 	if !epb.Has(protoreflect.FieldNumber(extension.Field)) {
 		// defaultExtensionValue returns the default value or
 		// ErrMissingExtension if there is no default.
@@ -319,11 +351,9 @@ func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
 	}
 	registeredExtensions := RegisteredExtensions(pb)
 
-	if !epb.HasInit() {
+	if epb == nil {
 		return nil, nil
 	}
-	epb.Lock()
-	defer epb.Unlock()
 	extensions := make([]*ExtensionDesc, 0, epb.Len())
 	epb.Range(func(extid protoreflect.FieldNumber, e Extension) bool {
 		desc := e.Desc

proto/lib.go

@@ -15,25 +15,9 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
 	"github.com/golang/protobuf/v2/runtime/protoiface"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
 )
 
-type extensionFields = interface {
-	Len() int
-	Has(protoreflect.FieldNumber) bool
-	Get(protoreflect.FieldNumber) protoimpl.ExtensionFieldV1
-	Set(protoreflect.FieldNumber, protoimpl.ExtensionFieldV1)
-	Clear(protoreflect.FieldNumber)
-	Range(f func(protoreflect.FieldNumber, protoimpl.ExtensionFieldV1) bool)
-
-	// HasInit and Locker are used by v1 GetExtension to provide
-	// an artificial degree of concurrent safety.
-	HasInit() bool
-	sync.Locker
-}
-
 // requiredNotSetError is an error type returned by either Marshal or Unmarshal.
 // Marshal reports this when a required field is not initialized.
 // Unmarshal reports this when a required field is missing from the wire data.

proto/message_set.go

@@ -12,7 +12,6 @@ import (
 	"errors"
 
 	"github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
 )
 
 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
@@ -118,7 +117,7 @@ func skipVarint(buf []byte) []byte {
 // unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
 // It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
 func unmarshalMessageSet(buf []byte, exts interface{}) error {
-	m := protoimpl.X.ExtensionFieldsOf(exts)
+	m := extensionFieldsOf(exts)
 
 	ms := new(messageSet)
 	if err := Unmarshal(buf, ms); err != nil {

proto/table_marshal.go

@@ -17,7 +17,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
 )
 
 // a sizer takes a pointer to a field and the size of its tag, computes the size of
@@ -2366,12 +2365,10 @@ func makeOneOfMarshaler(fi *marshalFieldInfo, f *reflect.StructField) (sizer, ma
 
 // sizeExtensions computes the size of encoded data for a XXX_InternalExtensions field.
 func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
-	m := protoimpl.X.ExtensionFieldsOf(ext)
-	if !m.HasInit() {
+	m := extensionFieldsOf(ext)
+	if m == nil {
 		return 0
 	}
-	m.Lock()
-	defer m.Unlock()
 
 	n := 0
 	m.Range(func(_ protoreflect.FieldNumber, e Extension) bool {
@@ -2395,12 +2392,10 @@ func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
 
 // appendExtensions marshals a XXX_InternalExtensions field to the end of byte slice b.
 func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
-	m := protoimpl.X.ExtensionFieldsOf(ext)
-	if !m.HasInit() {
+	m := extensionFieldsOf(ext)
+	if m == nil {
 		return b, nil
 	}
-	m.Lock()
-	defer m.Unlock()
 
 	var err error
 	var nerr nonFatal
@@ -2475,12 +2470,10 @@ func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, de
 // sizeMessageSet computes the size of encoded data for a XXX_InternalExtensions field
 // in message set format (above).
 func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
-	m := protoimpl.X.ExtensionFieldsOf(ext)
-	if !m.HasInit() {
+	m := extensionFieldsOf(ext)
+	if m == nil {
 		return 0
 	}
-	m.Lock()
-	defer m.Unlock()
 
 	n := 0
 	m.Range(func(id protoreflect.FieldNumber, e Extension) bool {
@@ -2511,12 +2504,10 @@ func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
 // appendMessageSet marshals a XXX_InternalExtensions field in message set format (above)
 // to the end of byte slice b.
 func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
-	m := protoimpl.X.ExtensionFieldsOf(ext)
-	if !m.HasInit() {
+	m := extensionFieldsOf(ext)
+	if m == nil {
 		return b, nil
 	}
-	m.Lock()
-	defer m.Unlock()
 
 	var err error
 	var nerr nonFatal

proto/table_merge.go

@@ -117,10 +117,8 @@ func (mi *mergeInfo) merge(dst, src pointer) {
 	in := src.asPointerTo(mi.typ).Elem()
 	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 		emOut, _ := extendable(out.Addr().Interface())
-		if emIn.HasInit() {
-			emIn.Lock()
+		if emIn != nil {
 			mergeExtension(emOut, emIn)
-			emIn.Unlock()
 		}
 	}
 

proto/table_unmarshal.go

@@ -17,7 +17,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
 )
 
 // Unmarshal is the entry point from the generated .pb.go files.
@@ -188,21 +187,21 @@ func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {
 		// Keep unrecognized data around.
 		// maybe in extensions, maybe in the unrecognized field.
 		z := m.offset(u.unrecognized).toBytes()
-		var emap extensionFields
+		var emap *extensionMap
 		var e Extension
 		for _, r := range u.extensionRanges {
 			if uint64(r.Start) <= tag && tag <= uint64(r.End) {
 				hasExtensions = true
 				if u.extensions.IsValid() {
 					mp := m.offset(u.extensions).toExtensions()
-					emap = protoimpl.X.ExtensionFieldsOf(mp)
+					emap = extensionFieldsOf(mp)
 					e = emap.Get(protoreflect.FieldNumber(tag))
 					z = &e.Raw
 					break
 				}
 				if u.oldExtensions.IsValid() {
 					p := m.offset(u.oldExtensions).toOldExtensions()
-					emap = protoimpl.X.ExtensionFieldsOf(p)
+					emap = extensionFieldsOf(p)
 					e = emap.Get(protoreflect.FieldNumber(tag))
 					z = &e.Raw
 					break

proto/text.go

@@ -658,17 +658,15 @@ func (tm *textMarshaler) writeExtensions(w *textWriter, pv reflect.Value) error
 	// Order the extensions by ID.
 	// This isn't strictly necessary, but it will give us
 	// canonical output, which will also make testing easier.
-	if !ep.HasInit() {
+	if ep == nil {
 		return nil
 	}
-	ep.Lock()
 	ids := make([]protoreflect.FieldNumber, 0, ep.Len())
 	ep.Range(func(id protoreflect.FieldNumber, _ Extension) bool {
 		ids = append(ids, id)
 		return true
 	})
 	sort.Sort(fieldNumSlice(ids))
-	ep.Unlock()
 
 	for _, extNum := range ids {
 		ext := ep.Get(extNum)

protoc-gen-go/descriptor/descriptor.pb.go

@@ -154,7 +154,7 @@ type GeneratedCodeInfo_Annotation = descriptor.GeneratedCodeInfo_Annotation
 
 var File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc = []byte{
 	0x0a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72,
@@ -170,33 +170,33 @@ var xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_prot
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescData = file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_data)
+func file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc_data
+	return file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_init() }
-func xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_init() {
+func init() { file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_init() }
+func file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_init() {
 	if File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs = nil
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_rawDesc = nil
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_goTypes = nil
+	file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_depIdxs = nil
 }

protoc-gen-go/plugin/plugin.pb.go

@@ -22,7 +22,7 @@ type CodeGeneratorResponse_File = plugin.CodeGeneratorResponse_File
 
 var File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc = []byte{
 	0x0a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x6f, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69,
@@ -37,33 +37,33 @@ var xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDes
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescData = file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_data)
+func file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc_data
+	return file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_init() }
-func xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_init() {
+func init() { file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_init() }
+func file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_init() {
 	if File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs = nil
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_rawDesc = nil
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_goTypes = nil
+	file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_depIdxs = nil
 }

ptypes/any/any.pb.go

@@ -19,7 +19,7 @@ type Any = known.Any
 
 var File_github_com_golang_protobuf_ptypes_any_any_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc = []byte{
 	0x0a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
@@ -32,33 +32,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc = []byte{
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescData = file_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_any_any_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_any_any_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_any_any_proto_init() }
+func file_github_com_golang_protobuf_ptypes_any_any_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_any_any_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_any_any_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_any_any_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_any_any_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_any_any_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs = nil
 }

ptypes/duration/duration.pb.go

@@ -19,7 +19,7 @@ type Duration = known.Duration
 
 var File_github_com_golang_protobuf_ptypes_duration_duration_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc = []byte{
 	0x0a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x64, 0x75, 0x72,
@@ -33,33 +33,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc =
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescData = file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_duration_duration_proto_init() }
+func file_github_com_golang_protobuf_ptypes_duration_duration_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_duration_duration_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_duration_duration_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs = nil
 }

ptypes/empty/empty.pb.go

@@ -19,7 +19,7 @@ type Empty = known.Empty
 
 var File_github_com_golang_protobuf_ptypes_empty_empty_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc = []byte{
 	0x0a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e,
@@ -32,33 +32,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc = []byt
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescData = file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_empty_empty_proto_init() }
+func file_github_com_golang_protobuf_ptypes_empty_empty_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_empty_empty_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_empty_empty_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs = nil
 }

ptypes/struct/struct.pb.go

@@ -34,7 +34,7 @@ type ListValue = known.ListValue
 
 var File_github_com_golang_protobuf_ptypes_struct_struct_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc = []byte{
 	0x0a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63,
@@ -48,33 +48,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc = []b
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescData = file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_struct_struct_proto_init() }
+func file_github_com_golang_protobuf_ptypes_struct_struct_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_struct_struct_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_struct_struct_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs = nil
 }

ptypes/timestamp/timestamp.pb.go

@@ -19,7 +19,7 @@ type Timestamp = known.Timestamp
 
 var File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc = []byte{
 	0x0a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2f, 0x74, 0x69,
@@ -34,33 +34,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescData = file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_init() }
+func file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs = nil
 }

ptypes/wrappers/wrappers.pb.go

@@ -27,7 +27,7 @@ type BytesValue = known.BytesValue
 
 var File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto protoreflect.FileDescriptor
 
-var xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc = []byte{
+var file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc = []byte{
 	0x0a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6c,
 	0x61, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x74, 0x79,
 	0x70, 0x65, 0x73, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2f, 0x77, 0x72, 0x61,
@@ -41,33 +41,33 @@ var xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc =
 }
 
 var (
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_once sync.Once
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_data = xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescOnce sync.Once
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescData = file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc
 )
 
-func xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescGZIP() []byte {
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_once.Do(func() {
-		xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_data = protoimpl.X.CompressGZIP(xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_data)
+func file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescGZIP() []byte {
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescOnce.Do(func() {
+		file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescData)
 	})
-	return xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc_data
+	return file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDescData
 }
 
-var xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes = []interface{}{}
-var xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs = []int32{}
+var file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes = []interface{}{}
+var file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs = []int32{}
 
-func init() { xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_init() }
-func xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_init() {
+func init() { file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_init() }
+func file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_init() {
 	if File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto != nil {
 		return
 	}
 	File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto = protoimpl.FileBuilder{
-		RawDescriptor:     xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc,
-		GoTypes:           xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes,
-		DependencyIndexes: xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs,
+		RawDescriptor:     file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc,
+		GoTypes:           file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes,
+		DependencyIndexes: file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs,
 		FilesRegistry:     protoregistry.GlobalFiles,
 		TypesRegistry:     protoregistry.GlobalTypes,
 	}.Init()
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc = nil
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes = nil
-	xxx_File_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs = nil
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_rawDesc = nil
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes = nil
+	file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs = nil
 }