From 436a197c11fbafe8f356f6e8bd2cc0e01bfc4324 Mon Sep 17 00:00:00 2001 From: Jonathan Bluett-Duncan Date: Fri, 15 Mar 2024 18:15:25 +0000 Subject: [PATCH] Migrate github.com/golang/protobuf to google.golang.org/protobuf --- ghttp/handlers.go | 2 +- ghttp/protobuf/simple_message.pb.go | 177 ++++++++++++++++++++++------ ghttp/protobuf/simple_message.proto | 2 + ghttp/test_server_test.go | 2 +- go.mod | 3 +- go.sum | 5 +- 6 files changed, 149 insertions(+), 42 deletions(-) diff --git a/ghttp/handlers.go b/ghttp/handlers.go index b2d1c2c46..3e7b66971 100644 --- a/ghttp/handlers.go +++ b/ghttp/handlers.go @@ -11,11 +11,11 @@ import ( "reflect" "strings" - "github.com/golang/protobuf/proto" "github.com/onsi/gomega" . "github.com/onsi/gomega" "github.com/onsi/gomega/internal/gutil" "github.com/onsi/gomega/types" + "google.golang.org/protobuf/proto" ) type GHTTPWithGomega struct { diff --git a/ghttp/protobuf/simple_message.pb.go b/ghttp/protobuf/simple_message.pb.go index c55a48448..5ea008f5a 100644 --- a/ghttp/protobuf/simple_message.pb.go +++ b/ghttp/protobuf/simple_message.pb.go @@ -1,55 +1,162 @@ -// Code generated by protoc-gen-go. -// source: simple_message.proto -// DO NOT EDIT! +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.33.0 +// protoc v5.26.0 +// source: ghttp/protobuf/simple_message.proto -/* -Package protobuf is a generated protocol buffer package. - -It is generated from these files: - simple_message.proto - -It has these top-level messages: - SimpleMessage -*/ package protobuf -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) type SimpleMessage struct { - Description *string `protobuf:"bytes,1,req,name=description" json:"description,omitempty"` - Id *int32 `protobuf:"varint,2,req,name=id" json:"id,omitempty"` - Metadata *string `protobuf:"bytes,3,opt,name=metadata" json:"metadata,omitempty"` - XXX_unrecognized []byte `json:"-"` + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Description *string `protobuf:"bytes,1,req,name=description" json:"description,omitempty"` + Id *int32 `protobuf:"varint,2,req,name=id" json:"id,omitempty"` + Metadata *string `protobuf:"bytes,3,opt,name=metadata" json:"metadata,omitempty"` } -func (m *SimpleMessage) Reset() { *m = SimpleMessage{} } -func (m *SimpleMessage) String() string { return proto.CompactTextString(m) } -func (*SimpleMessage) ProtoMessage() {} +func (x *SimpleMessage) Reset() { + *x = SimpleMessage{} + if protoimpl.UnsafeEnabled { + mi := &file_ghttp_protobuf_simple_message_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SimpleMessage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SimpleMessage) ProtoMessage() {} + +func (x *SimpleMessage) ProtoReflect() protoreflect.Message { + mi := &file_ghttp_protobuf_simple_message_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SimpleMessage.ProtoReflect.Descriptor instead. +func (*SimpleMessage) Descriptor() ([]byte, []int) { + return file_ghttp_protobuf_simple_message_proto_rawDescGZIP(), []int{0} +} -func (m *SimpleMessage) GetDescription() string { - if m != nil && m.Description != nil { - return *m.Description +func (x *SimpleMessage) GetDescription() string { + if x != nil && x.Description != nil { + return *x.Description } return "" } -func (m *SimpleMessage) GetId() int32 { - if m != nil && m.Id != nil { - return *m.Id +func (x *SimpleMessage) GetId() int32 { + if x != nil && x.Id != nil { + return *x.Id } return 0 } -func (m *SimpleMessage) GetMetadata() string { - if m != nil && m.Metadata != nil { - return *m.Metadata +func (x *SimpleMessage) GetMetadata() string { + if x != nil && x.Metadata != nil { + return *x.Metadata } return "" } + +var File_ghttp_protobuf_simple_message_proto protoreflect.FileDescriptor + +var file_ghttp_protobuf_simple_message_proto_rawDesc = []byte{ + 0x0a, 0x23, 0x67, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x22, + 0x5d, 0x0a, 0x0d, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x02, 0x28, 0x05, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x0d, + 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, +} + +var ( + file_ghttp_protobuf_simple_message_proto_rawDescOnce sync.Once + file_ghttp_protobuf_simple_message_proto_rawDescData = file_ghttp_protobuf_simple_message_proto_rawDesc +) + +func file_ghttp_protobuf_simple_message_proto_rawDescGZIP() []byte { + file_ghttp_protobuf_simple_message_proto_rawDescOnce.Do(func() { + file_ghttp_protobuf_simple_message_proto_rawDescData = protoimpl.X.CompressGZIP(file_ghttp_protobuf_simple_message_proto_rawDescData) + }) + return file_ghttp_protobuf_simple_message_proto_rawDescData +} + +var file_ghttp_protobuf_simple_message_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ghttp_protobuf_simple_message_proto_goTypes = []interface{}{ + (*SimpleMessage)(nil), // 0: protobuf.SimpleMessage +} +var file_ghttp_protobuf_simple_message_proto_depIdxs = []int32{ + 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_ghttp_protobuf_simple_message_proto_init() } +func file_ghttp_protobuf_simple_message_proto_init() { + if File_ghttp_protobuf_simple_message_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_ghttp_protobuf_simple_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SimpleMessage); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_ghttp_protobuf_simple_message_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_ghttp_protobuf_simple_message_proto_goTypes, + DependencyIndexes: file_ghttp_protobuf_simple_message_proto_depIdxs, + MessageInfos: file_ghttp_protobuf_simple_message_proto_msgTypes, + }.Build() + File_ghttp_protobuf_simple_message_proto = out.File + file_ghttp_protobuf_simple_message_proto_rawDesc = nil + file_ghttp_protobuf_simple_message_proto_goTypes = nil + file_ghttp_protobuf_simple_message_proto_depIdxs = nil +} diff --git a/ghttp/protobuf/simple_message.proto b/ghttp/protobuf/simple_message.proto index 35b7145c2..dc367d5d3 100644 --- a/ghttp/protobuf/simple_message.proto +++ b/ghttp/protobuf/simple_message.proto @@ -2,6 +2,8 @@ syntax = "proto2"; package protobuf; +option go_package = "./;protobuf"; + message SimpleMessage { required string description = 1; required int32 id = 2; diff --git a/ghttp/test_server_test.go b/ghttp/test_server_test.go index 1b1342f49..abd9678bd 100644 --- a/ghttp/test_server_test.go +++ b/ghttp/test_server_test.go @@ -7,10 +7,10 @@ import ( "net/url" "regexp" - "github.com/golang/protobuf/proto" "github.com/onsi/gomega/gbytes" "github.com/onsi/gomega/ghttp/protobuf" "github.com/onsi/gomega/internal/gutil" + "google.golang.org/protobuf/proto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/go.mod b/go.mod index e7940b5b5..208ba71ea 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/onsi/gomega go 1.20 require ( - github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.6.0 github.com/onsi/ginkgo/v2 v2.15.0 golang.org/x/net v0.20.0 + google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -17,5 +17,4 @@ require ( golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.16.1 // indirect - google.golang.org/protobuf v1.28.0 // indirect ) diff --git a/go.sum b/go.sum index c399b35e6..6c81425f4 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,6 @@ github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -35,9 +33,10 @@ golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=