Update APIs to use new Google cloud paths.

common/proto/google/descutil/util_test.pb_test.go

Index: common/proto/google/descutil/util_test.pb_test.go
diff --git a/common/proto/google/descriptor/util_test.pb_test.go b/common/proto/google/descutil/util_test.pb_test.go
similarity index 74%
rename from common/proto/google/descriptor/util_test.pb_test.go
rename to common/proto/google/descutil/util_test.pb_test.go
index 50894133291b42af7b444f2b3b82b604cb5d0bf5..f4090d026348b529e277e2a7a24c00d6f05fb126 100644
--- a/common/proto/google/descriptor/util_test.pb_test.go
+++ b/common/proto/google/descutil/util_test.pb_test.go
@@ -1,8 +1,20 @@
 // Code generated by protoc-gen-go.
-// source: github.com/luci/luci-go/common/proto/google/descriptor/util_test.proto
+// source: github.com/luci/luci-go/common/proto/google/descutil/util_test.proto
 // DO NOT EDIT!
 
-package descriptor
+/*
+Package descutil is a generated protocol buffer package.
+
+It is generated from these files:
+	github.com/luci/luci-go/common/proto/google/descutil/util_test.proto
+
+It has these top-level messages:
+	M1
+	M2
+	M3
+	NestedMessageParent
+*/
+package descutil
 
 import prpc "github.com/luci/luci-go/grpc/prpc"
 
@@ -20,6 +32,12 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
 // Enum comment.
 // next line.
 type E1 int32
@@ -45,7 +63,7 @@ var E1_value = map[string]int32{
 func (x E1) String() string {
 	return proto.EnumName(E1_name, int32(x))
 }
-func (E1) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (E1) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 type NestedMessageParent_NestedEnum int32
 
@@ -67,7 +85,7 @@ func (x NestedMessageParent_NestedEnum) String() string {
 	return proto.EnumName(NestedMessageParent_NestedEnum_name, int32(x))
 }
 func (NestedMessageParent_NestedEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{3, 0}
+	return fileDescriptor0, []int{3, 0}
 }
 
 // M1
@@ -81,7 +99,7 @@ type M1 struct {
 func (m *M1) Reset()                    { *m = M1{} }
 func (m *M1) String() string            { return proto.CompactTextString(m) }
 func (*M1) ProtoMessage()               {}
-func (*M1) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
+func (*M1) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 // M2
 // next line.
@@ -91,13 +109,13 @@ type M2 struct {
 	F1 []*M1 `protobuf:"bytes,1,rep,name=f1" json:"f1,omitempty"`
 	// f2
 	// next line.
-	F2 E1 `protobuf:"varint,2,opt,name=f2,enum=pkg.E1" json:"f2,omitempty"`
+	F2 E1 `protobuf:"varint,2,opt,name=f2,enum=descutil.E1" json:"f2,omitempty"`
 }
 
 func (m *M2) Reset()                    { *m = M2{} }
 func (m *M2) String() string            { return proto.CompactTextString(m) }
 func (*M2) ProtoMessage()               {}
-func (*M2) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
+func (*M2) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *M2) GetF1() []*M1 {
 	if m != nil {
@@ -129,7 +147,7 @@ type M3 struct {
 func (m *M3) Reset()                    { *m = M3{} }
 func (m *M3) String() string            { return proto.CompactTextString(m) }
 func (*M3) ProtoMessage()               {}
-func (*M3) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
+func (*M3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 type isM3_O1 interface {
 	isM3_O1()
@@ -307,7 +325,7 @@ type NestedMessageParent struct {
 func (m *NestedMessageParent) Reset()                    { *m = NestedMessageParent{} }
 func (m *NestedMessageParent) String() string            { return proto.CompactTextString(m) }
 func (*NestedMessageParent) ProtoMessage()               {}
-func (*NestedMessageParent) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (*NestedMessageParent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
 type NestedMessageParent_NestedMessage struct {
 	F1 int32 `protobuf:"varint,1,opt,name=f1" json:"f1,omitempty"`
@@ -318,17 +336,17 @@ func (m *NestedMessageParent_NestedMessage) Reset()         { *m = NestedMessage
 func (m *NestedMessageParent_NestedMessage) String() string { return proto.CompactTextString(m) }
 func (*NestedMessageParent_NestedMessage) ProtoMessage()    {}
 func (*NestedMessageParent_NestedMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor1, []int{3, 0}
+	return fileDescriptor0, []int{3, 0}
 }
 
 func init() {
-	proto.RegisterType((*M1)(nil), "pkg.M1")
-	proto.RegisterType((*M2)(nil), "pkg.M2")
-	proto.RegisterType((*M3)(nil), "pkg.M3")
-	proto.RegisterType((*NestedMessageParent)(nil), "pkg.NestedMessageParent")
-	proto.RegisterType((*NestedMessageParent_NestedMessage)(nil), "pkg.NestedMessageParent.NestedMessage")
-	proto.RegisterEnum("pkg.E1", E1_name, E1_value)
-	proto.RegisterEnum("pkg.NestedMessageParent_NestedEnum", NestedMessageParent_NestedEnum_name, NestedMessageParent_NestedEnum_value)
+	proto.RegisterType((*M1)(nil), "descutil.M1")
+	proto.RegisterType((*M2)(nil), "descutil.M2")
+	proto.RegisterType((*M3)(nil), "descutil.M3")
+	proto.RegisterType((*NestedMessageParent)(nil), "descutil.NestedMessageParent")
+	proto.RegisterType((*NestedMessageParent_NestedMessage)(nil), "descutil.NestedMessageParent.NestedMessage")
+	proto.RegisterEnum("descutil.E1", E1_name, E1_value)
+	proto.RegisterEnum("descutil.NestedMessageParent_NestedEnum", NestedMessageParent_NestedEnum_name, NestedMessageParent_NestedEnum_value)
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -355,7 +373,7 @@ func NewS1PRPCClient(client *prpc.Client) S1Client {
 
 func (c *s1PRPCClient) R1(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := c.client.Call(ctx, "pkg.S1", "R1", in, out, opts...)
+	err := c.client.Call(ctx, "descutil.S1", "R1", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -372,7 +390,7 @@ func NewS1Client(cc *grpc.ClientConn) S1Client {
 
 func (c *s1Client) R1(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := grpc.Invoke(ctx, "/pkg.S1/R1", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/descutil.S1/R1", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -400,7 +418,7 @@ func _S1_R1_Handler(srv interface{}, ctx context.Context, dec func(interface{})
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pkg.S1/R1",
+		FullMethod: "/descutil.S1/R1",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(S1Server).R1(ctx, req.(*M1))
@@ -409,7 +427,7 @@ func _S1_R1_Handler(srv interface{}, ctx context.Context, dec func(interface{})
 }
 
 var _S1_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pkg.S1",
+	ServiceName: "descutil.S1",
 	HandlerType: (*S1Server)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -418,7 +436,7 @@ var _S1_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: fileDescriptor1,
+	Metadata: fileDescriptor0,
 }
 
 // Client API for S2 service
@@ -439,7 +457,7 @@ func NewS2PRPCClient(client *prpc.Client) S2Client {
 
 func (c *s2PRPCClient) R1(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := c.client.Call(ctx, "pkg.S2", "R1", in, out, opts...)
+	err := c.client.Call(ctx, "descutil.S2", "R1", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -448,7 +466,7 @@ func (c *s2PRPCClient) R1(ctx context.Context, in *M1, opts ...grpc.CallOption)
 
 func (c *s2PRPCClient) R2(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := c.client.Call(ctx, "pkg.S2", "R2", in, out, opts...)
+	err := c.client.Call(ctx, "descutil.S2", "R2", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -465,7 +483,7 @@ func NewS2Client(cc *grpc.ClientConn) S2Client {
 
 func (c *s2Client) R1(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := grpc.Invoke(ctx, "/pkg.S2/R1", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/descutil.S2/R1", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -474,7 +492,7 @@ func (c *s2Client) R1(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2
 
 func (c *s2Client) R2(ctx context.Context, in *M1, opts ...grpc.CallOption) (*M2, error) {
 	out := new(M2)
-	err := grpc.Invoke(ctx, "/pkg.S2/R2", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/descutil.S2/R2", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -504,7 +522,7 @@ func _S2_R1_Handler(srv interface{}, ctx context.Context, dec func(interface{})
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pkg.S2/R1",
+		FullMethod: "/descutil.S2/R1",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(S2Server).R1(ctx, req.(*M1))
@@ -522,7 +540,7 @@ func _S2_R2_Handler(srv interface{}, ctx context.Context, dec func(interface{})
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/pkg.S2/R2",
+		FullMethod: "/descutil.S2/R2",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(S2Server).R2(ctx, req.(*M1))
@@ -531,7 +549,7 @@ func _S2_R2_Handler(srv interface{}, ctx context.Context, dec func(interface{})
 }
 
 var _S2_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "pkg.S2",
+	ServiceName: "descutil.S2",
 	HandlerType: (*S2Server)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -544,33 +562,33 @@ var _S2_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: fileDescriptor1,
+	Metadata: fileDescriptor0,
 }
 
 func init() {
-	proto.RegisterFile("github.com/luci/luci-go/common/proto/google/descriptor/util_test.proto", fileDescriptor1)
-}
-
-var fileDescriptor1 = []byte{
-	// 308 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x91, 0xcb, 0x4b, 0xec, 0x30,
-	0x14, 0x87, 0xa7, 0x99, 0xc7, 0xe5, 0x46, 0x1c, 0x4a, 0x14, 0x0c, 0x83, 0x88, 0x74, 0x35, 0x08,
-	0x36, 0x26, 0xf3, 0xc0, 0xb5, 0x50, 0x71, 0x53, 0x95, 0x11, 0xdc, 0xca, 0x4c, 0x1b, 0x63, 0xb1,
-	0x6d, 0x4a, 0x9b, 0x82, 0x7f, 0xbe, 0xe9, 0x69, 0xad, 0x0f, 0x74, 0x93, 0x26, 0xdf, 0x77, 0x7e,
-	0xe5, 0x9c, 0x04, 0x5f, 0xab, 0xc4, 0xbc, 0xd4, 0x3b, 0x3f, 0xd2, 0x19, 0x4b, 0xeb, 0x28, 0x81,
-	0xe5, 0x5c, 0x69, 0x66, 0x41, 0xa6, 0x73, 0x56, 0x94, 0xda, 0x68, 0xa6, 0xb4, 0x56, 0xa9, 0x64,
-	0xb1, 0xac, 0xa2, 0x32, 0x29, 0x8c, 0x2e, 0x59, 0x6d, 0x92, 0xf4, 0xc9, 0xc8, 0xca, 0xf8, 0x50,
-	0x41, 0x86, 0xc5, 0xab, 0xf2, 0x0e, 0x31, 0x0a, 0x39, 0x99, 0x62, 0xf4, 0xcc, 0xa9, 0x73, 0xea,
-	0xcc, 0xff, 0x6f, 0xec, 0xce, 0x5b, 0x5b, 0x2a, 0xc8, 0x51, 0x47, 0x87, 0xf3, 0x3d, 0xf1, 0xcf,
-	0xb7, 0xd5, 0x7e, 0xc8, 0x1b, 0x0d, 0x42, 0x50, 0x64, 0xcb, 0xa7, 0x9d, 0x08, 0x1a, 0x21, 0xbc,
-	0x37, 0x9b, 0x5b, 0x10, 0xb7, 0xff, 0xdb, 0xf8, 0x66, 0x00, 0x01, 0xb7, 0x0f, 0xb4, 0x44, 0x00,
-	0x59, 0xd0, 0x21, 0x10, 0xc7, 0x92, 0x36, 0xb5, 0xa4, 0xa3, 0x9e, 0x2c, 0xa1, 0xab, 0x15, 0x1d,
-	0x77, 0x5d, 0xad, 0xe0, 0xbc, 0xa6, 0x93, 0xa6, 0xc2, 0x9e, 0xd7, 0x57, 0x23, 0x8c, 0xee, 0x38,
-	0xac, 0xc2, 0x8b, 0xf1, 0xc1, 0xad, 0x1d, 0x4d, 0xc6, 0xa1, 0xac, 0xaa, 0xad, 0x92, 0xf7, 0xdb,
-	0x52, 0xe6, 0x66, 0xc6, 0xf0, 0xfe, 0x37, 0xfc, 0x65, 0xd2, 0x31, 0x74, 0x36, 0xfd, 0xec, 0x0c,
-	0x26, 0x38, 0xc6, 0xb8, 0x0d, 0x04, 0x79, 0x9d, 0x91, 0x09, 0x46, 0x8f, 0x17, 0xee, 0x00, 0xbe,
-	0xdc, 0x75, 0xce, 0xec, 0x6d, 0x05, 0xfc, 0x27, 0x15, 0x27, 0x18, 0x3d, 0x70, 0x42, 0x31, 0xda,
-	0x70, 0xf2, 0x71, 0x4f, 0xb3, 0x6e, 0x23, 0xbc, 0x81, 0xb8, 0xb4, 0x5e, 0xfc, 0xed, 0xc1, 0x88,
-	0xdf, 0xcc, 0x6e, 0x02, 0x2f, 0xb5, 0x78, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x45, 0x97, 0x30,
-	0xf3, 0x01, 0x00, 0x00,
+	proto.RegisterFile("github.com/luci/luci-go/common/proto/google/descutil/util_test.proto", fileDescriptor0)
+}
+
+var fileDescriptor0 = []byte{
+	// 309 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4b, 0xfb, 0x30,
+	0x18, 0xc6, 0xd7, 0xec, 0x07, 0xdf, 0x6f, 0xd4, 0x51, 0xa2, 0x87, 0x30, 0x76, 0x90, 0x9c, 0x86,
+	0x60, 0x63, 0xd2, 0x6d, 0x67, 0x11, 0x0b, 0x1e, 0xac, 0xca, 0x04, 0xaf, 0xb2, 0xb5, 0xb1, 0x16,
+	0xda, 0x46, 0xd6, 0x14, 0xfc, 0xf3, 0x4d, 0xdf, 0x6e, 0xb5, 0xf3, 0x20, 0x5e, 0xde, 0xf6, 0xfd,
+	0x3c, 0xcf, 0x13, 0xde, 0x37, 0xc1, 0xb7, 0x49, 0x6a, 0xde, 0xab, 0x8d, 0x17, 0xe9, 0x9c, 0x67,
+	0x55, 0x94, 0x42, 0xb9, 0x4c, 0x34, 0xb7, 0x20, 0xd7, 0x05, 0xff, 0xd8, 0x6a, 0xa3, 0x79, 0xa2,
+	0x75, 0x92, 0x29, 0x1e, 0xab, 0x32, 0xaa, 0x4c, 0x9a, 0xf1, 0xba, 0xbc, 0x1a, 0x55, 0x1a, 0x0f,
+	0x74, 0xf2, 0x6f, 0xaf, 0xb0, 0x33, 0x8c, 0x42, 0x41, 0xc6, 0x18, 0xbd, 0x09, 0xea, 0x9c, 0x3b,
+	0xb3, 0xff, 0x2b, 0xfb, 0xc7, 0xae, 0x2d, 0x95, 0x64, 0xba, 0xa3, 0xfd, 0xd9, 0x91, 0x3c, 0xf6,
+	0xf6, 0x11, 0x2f, 0x14, 0xb5, 0x07, 0x54, 0x49, 0x91, 0xcd, 0x8c, 0xbb, 0x6a, 0x50, 0xab, 0x92,
+	0x7d, 0xda, 0x13, 0x7c, 0xe2, 0xb6, 0xe7, 0x0e, 0xef, 0x7a, 0x90, 0x72, 0xdb, 0x54, 0x43, 0x24,
+	0x10, 0x9f, 0xf6, 0x81, 0x38, 0x96, 0x34, 0xa9, 0x39, 0x1d, 0xb4, 0x64, 0x0e, 0xf3, 0x2d, 0xe8,
+	0x70, 0x37, 0xdf, 0x02, 0xfa, 0x25, 0x1d, 0xd5, 0x0e, 0xdb, 0x2f, 0x6f, 0x06, 0x18, 0x3d, 0x0a,
+	0xa8, 0x92, 0xc5, 0xf8, 0xf4, 0xc1, 0x6e, 0xaa, 0xe2, 0x50, 0x95, 0xe5, 0x3a, 0x51, 0x4f, 0xeb,
+	0xad, 0x2a, 0xcc, 0x84, 0xe3, 0x93, 0x03, 0xdc, 0xd9, 0x79, 0x08, 0x93, 0x8d, 0xbf, 0x27, 0x83,
+	0x0d, 0xa6, 0x18, 0x37, 0x81, 0xa0, 0xa8, 0x72, 0x32, 0xc2, 0xe8, 0xe5, 0xca, 0xed, 0xc1, 0x57,
+	0xb8, 0xce, 0x85, 0xbd, 0xb7, 0x40, 0xfc, 0xa4, 0x72, 0x86, 0xd1, 0xb3, 0x20, 0x0c, 0xa3, 0x95,
+	0x20, 0x07, 0x37, 0x36, 0xe9, 0x76, 0x92, 0xf5, 0xe4, 0xbd, 0x75, 0xca, 0xbf, 0x38, 0xc1, 0x23,
+	0x7f, 0xf7, 0x6c, 0x46, 0xf0, 0xac, 0xfe, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x09, 0xb9, 0x09,
+	0x37, 0x1e, 0x02, 0x00, 0x00,
 }