all: fix interactions with latest v2 API
Change test.bash to pass -tags=protolegacy instead of proto1_legacy.
Regenerate .pb.go files.
Change-Id: Ifd0633c20c5860de765fcef5d0eb6c5bf3e3f183
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/190979
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/protoc-gen-go/descriptor/descriptor.pb.go b/protoc-gen-go/descriptor/descriptor.pb.go
index c2fb216..ec6c93d 100644
--- a/protoc-gen-go/descriptor/descriptor.pb.go
+++ b/protoc-gen-go/descriptor/descriptor.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
package descriptor
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/descriptor.proto
+// Symbols defined in public import of google/protobuf/descriptor.proto.
type FieldDescriptorProto_Type = descriptorpb.FieldDescriptorProto_Type
@@ -188,11 +192,11 @@
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{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_protoc_gen_go_descriptor_descriptor_proto_init() }
diff --git a/protoc-gen-go/plugin/plugin.pb.go b/protoc-gen-go/plugin/plugin.pb.go
index 28c5093..d62cfe4 100644
--- a/protoc-gen-go/plugin/plugin.pb.go
+++ b/protoc-gen-go/plugin/plugin.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/protoc-gen-go/plugin/plugin.proto
package plugin_go
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/compiler/plugin.proto
+// Symbols defined in public import of google/protobuf/compiler/plugin.proto.
type Version = pluginpb.Version
type CodeGeneratorRequest = pluginpb.CodeGeneratorRequest
@@ -55,11 +59,11 @@
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{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_protoc_gen_go_plugin_plugin_proto_init() }
diff --git a/ptypes/any/any.pb.go b/ptypes/any/any.pb.go
index 96dc8e3..95ad90e 100644
--- a/ptypes/any/any.pb.go
+++ b/ptypes/any/any.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/any/any.proto
package any
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/any.proto
+// Symbols defined in public import of google/protobuf/any.proto.
type Any = anypb.Any
@@ -50,11 +54,11 @@
var file_github_com_golang_protobuf_ptypes_any_any_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_any_any_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_any_any_proto_init() }
diff --git a/ptypes/duration/duration.pb.go b/ptypes/duration/duration.pb.go
index ea23997..4c075ac 100644
--- a/ptypes/duration/duration.pb.go
+++ b/ptypes/duration/duration.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/duration/duration.proto
package duration
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/duration.proto
+// Symbols defined in public import of google/protobuf/duration.proto.
type Duration = durationpb.Duration
@@ -51,11 +55,11 @@
var file_github_com_golang_protobuf_ptypes_duration_duration_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_duration_duration_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_duration_duration_proto_init() }
diff --git a/ptypes/empty/empty.pb.go b/ptypes/empty/empty.pb.go
index b8022dc..50b25ce 100644
--- a/ptypes/empty/empty.pb.go
+++ b/ptypes/empty/empty.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/empty/empty.proto
package empty
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/empty.proto
+// Symbols defined in public import of google/protobuf/empty.proto.
type Empty = emptypb.Empty
@@ -50,11 +54,11 @@
var file_github_com_golang_protobuf_ptypes_empty_empty_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_empty_empty_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_empty_empty_proto_init() }
diff --git a/ptypes/struct/struct.pb.go b/ptypes/struct/struct.pb.go
index fae4ea1..017152f 100644
--- a/ptypes/struct/struct.pb.go
+++ b/ptypes/struct/struct.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/struct/struct.proto
package structpb
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/struct.proto
+// Symbols defined in public import of google/protobuf/struct.proto.
type NullValue = structpb.NullValue
@@ -66,11 +70,11 @@
var file_github_com_golang_protobuf_ptypes_struct_struct_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_struct_struct_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_struct_struct_proto_init() }
diff --git a/ptypes/timestamp/timestamp.pb.go b/ptypes/timestamp/timestamp.pb.go
index 4100c26..bf572a3 100644
--- a/ptypes/timestamp/timestamp.pb.go
+++ b/ptypes/timestamp/timestamp.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
package timestamp
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/timestamp.proto
+// Symbols defined in public import of google/protobuf/timestamp.proto.
type Timestamp = timestamppb.Timestamp
@@ -52,11 +56,11 @@
var file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_timestamp_timestamp_proto_init() }
diff --git a/ptypes/wrappers/wrappers.pb.go b/ptypes/wrappers/wrappers.pb.go
index faeefe7..9b504a6 100644
--- a/ptypes/wrappers/wrappers.pb.go
+++ b/ptypes/wrappers/wrappers.pb.go
@@ -1,4 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.19.0-devel
+// protoc (unknown)
+// go v1.12.5
// source: github.com/golang/protobuf/ptypes/wrappers/wrappers.proto
package wrappers
@@ -12,13 +16,13 @@
)
const (
- // Verify that runtime/protoimpl is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 0)
// Verify that this generated code is sufficiently up-to-date.
- _ = protoimpl.EnforceVersion(0 - protoimpl.MinVersion)
+ _ = protoimpl.EnforceVersion(19 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 19)
)
-// Symbols defined in public import of google/protobuf/wrappers.proto
+// Symbols defined in public import of google/protobuf/wrappers.proto.
type DoubleValue = wrapperspb.DoubleValue
type FloatValue = wrapperspb.FloatValue
@@ -59,11 +63,11 @@
var file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_goTypes = []interface{}{}
var file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_depIdxs = []int32{
- 0, // starting offset of method output_type sub-list
- 0, // starting offset of method input_type sub-list
- 0, // starting offset of extension type_name sub-list
- 0, // starting offset of extension extendee sub-list
- 0, // starting offset of field type_name sub-list
+ 0, // [0:0] is the sub-list for method output_type
+ 0, // [0:0] is the sub-list for method input_type
+ 0, // [0:0] is the sub-list for extension type_name
+ 0, // [0:0] is the sub-list for extension extendee
+ 0, // [0:0] is the sub-list for field type_name
}
func init() { file_github_com_golang_protobuf_ptypes_wrappers_wrappers_proto_init() }
diff --git a/test.bash b/test.bash
index bab98bc..8145020 100755
--- a/test.bash
+++ b/test.bash
@@ -10,8 +10,8 @@
FAIL="\x1b[31mFAIL"
RESET="\x1b[0m"
-echo -e "${BOLD}go test -tags proto1_legacy ./...${RESET}"
-RET_TEST0=$(go test -tags proto1_legacy ./... | egrep -v "^(ok|[?])\s+")
+echo -e "${BOLD}go test -tags protolegacy ./...${RESET}"
+RET_TEST0=$(go test -tags protolegacy ./... | egrep -v "^(ok|[?])\s+")
if [[ ! -z "$RET_TEST0" ]]; then echo "$RET_TEST0"; echo; fi
echo -e "${BOLD}go test -tags use_golang_protobuf_v1 ./...${RESET}"
