diff --git a/api/annotations.pb.go b/api/annotations.pb.go index 0ba293f..c374195 100644 --- a/api/annotations.pb.go +++ b/api/annotations.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/annotations.proto package api diff --git a/api/annotations_pb2.py b/api/annotations_pb2.py index a36cb98..d54eafa 100644 --- a/api/annotations_pb2.py +++ b/api/annotations_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: api/annotations.proto -# Protobuf Python Version: 4.25.3 +# Protobuf Python Version: 6.33.4 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 6, + 33, + 4, + '', + 'api/annotations.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -22,7 +32,7 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x61pi/annotat _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'api.annotations_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - _globals['DESCRIPTOR']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None _globals['DESCRIPTOR']._serialized_options = b'\n\tmicro.apiB\020AnnotationsProtoP\001Z&go.unistack.org/micro-proto/v3/api;api\242\002\004MAPI' # @@protoc_insertion_point(module_scope) diff --git a/api/client.pb.go b/api/client.pb.go index bd71d48..9c64a61 100644 --- a/api/client.pb.go +++ b/api/client.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/client.proto package api diff --git a/api/field_behavior.pb.go b/api/field_behavior.pb.go index 7f966a3..4c91f78 100644 --- a/api/field_behavior.pb.go +++ b/api/field_behavior.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/field_behavior.proto package api diff --git a/api/http.pb.go b/api/http.pb.go index 568a41f..46e190a 100644 --- a/api/http.pb.go +++ b/api/http.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/http.proto package api diff --git a/api/httpbody.pb.go b/api/httpbody.pb.go index 9f4216f..c674c3b 100644 --- a/api/httpbody.pb.go +++ b/api/httpbody.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/httpbody.proto package api diff --git a/api/micro.pb.go b/api/micro.pb.go index 76a6ab5..0d6b3be 100644 --- a/api/micro.pb.go +++ b/api/micro.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: api/micro.proto package api diff --git a/codec/frame.pb.go b/codec/frame.pb.go index b70c889..4dab1f2 100644 --- a/codec/frame.pb.go +++ b/codec/frame.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: codec/frame.proto package codec diff --git a/errors/errors.pb.go b/errors/errors.pb.go index 4b748b0..0c16854 100644 --- a/errors/errors.pb.go +++ b/errors/errors.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: errors/errors.proto package errors diff --git a/generate.go b/generate.go index 98bc32f..556c67c 100644 --- a/generate.go +++ b/generate.go @@ -14,4 +14,4 @@ package main //go:generate protoc -I. -I./tag --go_out=paths=source_relative:. ./tag/tag.proto //go:generate protoc -I. -I./tag --go_out=paths=source_relative:. ./errors/errors.proto //go:generate protoc -I. -I./tag --go_out=paths=source_relative:. ./codec/frame.proto -//go:generate protoc -I. -I./graphql --go_out=paths=source_relative:. ./graphql/graphql.proto +////go:generate protoc -I. -I./graphql --go_out=paths=source_relative:. ./graphql/graphql.proto diff --git a/graphql/graphql.pb.go b/graphql/graphql.pb.go deleted file mode 100644 index 2062c6d..0000000 --- a/graphql/graphql.pb.go +++ /dev/null @@ -1,635 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.26.0 -// protoc v4.25.3 -// source: graphql/graphql.proto - -package graphql - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - descriptorpb "google.golang.org/protobuf/types/descriptorpb" - reflect "reflect" - sync "sync" -) - -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 Type int32 - -const ( - Type_DEFAULT Type = 0 - Type_MUTATION Type = 1 - Type_QUERY Type = 2 -) - -// Enum value maps for Type. -var ( - Type_name = map[int32]string{ - 0: "DEFAULT", - 1: "MUTATION", - 2: "QUERY", - } - Type_value = map[string]int32{ - "DEFAULT": 0, - "MUTATION": 1, - "QUERY": 2, - } -) - -func (x Type) Enum() *Type { - p := new(Type) - *p = x - return p -} - -func (x Type) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (Type) Descriptor() protoreflect.EnumDescriptor { - return file_graphql_graphql_proto_enumTypes[0].Descriptor() -} - -func (Type) Type() protoreflect.EnumType { - return &file_graphql_graphql_proto_enumTypes[0] -} - -func (x Type) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use Type.Descriptor instead. -func (Type) EnumDescriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{0} -} - -type Upstream int32 - -const ( - Upstream_UPSTREAM_UNSPECIFIED Upstream = 0 - Upstream_UPSTREAM_SERVER Upstream = 1 - Upstream_UPSTREAM_CLIENT Upstream = 2 -) - -// Enum value maps for Upstream. -var ( - Upstream_name = map[int32]string{ - 0: "UPSTREAM_UNSPECIFIED", - 1: "UPSTREAM_SERVER", - 2: "UPSTREAM_CLIENT", - } - Upstream_value = map[string]int32{ - "UPSTREAM_UNSPECIFIED": 0, - "UPSTREAM_SERVER": 1, - "UPSTREAM_CLIENT": 2, - } -) - -func (x Upstream) Enum() *Upstream { - p := new(Upstream) - *p = x - return p -} - -func (x Upstream) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (Upstream) Descriptor() protoreflect.EnumDescriptor { - return file_graphql_graphql_proto_enumTypes[1].Descriptor() -} - -func (Upstream) Type() protoreflect.EnumType { - return &file_graphql_graphql_proto_enumTypes[1] -} - -func (x Upstream) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use Upstream.Descriptor instead. -func (Upstream) EnumDescriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{1} -} - -type Oneof struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Ignore bool `protobuf:"varint,4,opt,name=ignore,proto3" json:"ignore,omitempty"` - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` -} - -func (x *Oneof) Reset() { - *x = Oneof{} - if protoimpl.UnsafeEnabled { - mi := &file_graphql_graphql_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Oneof) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Oneof) ProtoMessage() {} - -func (x *Oneof) ProtoReflect() protoreflect.Message { - mi := &file_graphql_graphql_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 Oneof.ProtoReflect.Descriptor instead. -func (*Oneof) Descriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{0} -} - -func (x *Oneof) GetIgnore() bool { - if x != nil { - return x.Ignore - } - return false -} - -func (x *Oneof) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -type Field struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Required bool `protobuf:"varint,1,opt,name=required,proto3" json:"required,omitempty"` - Params string `protobuf:"bytes,2,opt,name=params,proto3" json:"params,omitempty"` - Dirs string `protobuf:"bytes,3,opt,name=dirs,proto3" json:"dirs,omitempty"` - Ignore bool `protobuf:"varint,4,opt,name=ignore,proto3" json:"ignore,omitempty"` - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` -} - -func (x *Field) Reset() { - *x = Field{} - if protoimpl.UnsafeEnabled { - mi := &file_graphql_graphql_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Field) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Field) ProtoMessage() {} - -func (x *Field) ProtoReflect() protoreflect.Message { - mi := &file_graphql_graphql_proto_msgTypes[1] - 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 Field.ProtoReflect.Descriptor instead. -func (*Field) Descriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{1} -} - -func (x *Field) GetRequired() bool { - if x != nil { - return x.Required - } - return false -} - -func (x *Field) GetParams() string { - if x != nil { - return x.Params - } - return "" -} - -func (x *Field) GetDirs() string { - if x != nil { - return x.Dirs - } - return "" -} - -func (x *Field) GetIgnore() bool { - if x != nil { - return x.Ignore - } - return false -} - -func (x *Field) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -type Rpc struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Type Type `protobuf:"varint,1,opt,name=type,proto3,enum=micro.graphql.Type" json:"type,omitempty"` - Ignore bool `protobuf:"varint,2,opt,name=ignore,proto3" json:"ignore,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` -} - -func (x *Rpc) Reset() { - *x = Rpc{} - if protoimpl.UnsafeEnabled { - mi := &file_graphql_graphql_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Rpc) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Rpc) ProtoMessage() {} - -func (x *Rpc) ProtoReflect() protoreflect.Message { - mi := &file_graphql_graphql_proto_msgTypes[2] - 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 Rpc.ProtoReflect.Descriptor instead. -func (*Rpc) Descriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{2} -} - -func (x *Rpc) GetType() Type { - if x != nil { - return x.Type - } - return Type_DEFAULT -} - -func (x *Rpc) GetIgnore() bool { - if x != nil { - return x.Ignore - } - return false -} - -func (x *Rpc) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -type Svc struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Type Type `protobuf:"varint,1,opt,name=type,proto3,enum=micro.graphql.Type" json:"type,omitempty"` - Ignore bool `protobuf:"varint,2,opt,name=ignore,proto3" json:"ignore,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Upstream Upstream `protobuf:"varint,4,opt,name=upstream,proto3,enum=micro.graphql.Upstream" json:"upstream,omitempty"` -} - -func (x *Svc) Reset() { - *x = Svc{} - if protoimpl.UnsafeEnabled { - mi := &file_graphql_graphql_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Svc) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Svc) ProtoMessage() {} - -func (x *Svc) ProtoReflect() protoreflect.Message { - mi := &file_graphql_graphql_proto_msgTypes[3] - 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 Svc.ProtoReflect.Descriptor instead. -func (*Svc) Descriptor() ([]byte, []int) { - return file_graphql_graphql_proto_rawDescGZIP(), []int{3} -} - -func (x *Svc) GetType() Type { - if x != nil { - return x.Type - } - return Type_DEFAULT -} - -func (x *Svc) GetIgnore() bool { - if x != nil { - return x.Ignore - } - return false -} - -func (x *Svc) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *Svc) GetUpstream() Upstream { - if x != nil { - return x.Upstream - } - return Upstream_UPSTREAM_UNSPECIFIED -} - -var file_graphql_graphql_proto_extTypes = []protoimpl.ExtensionInfo{ - { - ExtendedType: (*descriptorpb.MethodOptions)(nil), - ExtensionType: (*Rpc)(nil), - Field: 65030, - Name: "micro.graphql.rpc", - Tag: "bytes,65030,opt,name=rpc", - Filename: "graphql/graphql.proto", - }, - { - ExtendedType: (*descriptorpb.ServiceOptions)(nil), - ExtensionType: (*Svc)(nil), - Field: 65030, - Name: "micro.graphql.svc", - Tag: "bytes,65030,opt,name=svc", - Filename: "graphql/graphql.proto", - }, - { - ExtendedType: (*descriptorpb.FieldOptions)(nil), - ExtensionType: (*Field)(nil), - Field: 65030, - Name: "micro.graphql.field", - Tag: "bytes,65030,opt,name=field", - Filename: "graphql/graphql.proto", - }, - { - ExtendedType: (*descriptorpb.OneofOptions)(nil), - ExtensionType: (*Oneof)(nil), - Field: 65030, - Name: "micro.graphql.oneof", - Tag: "bytes,65030,opt,name=oneof", - Filename: "graphql/graphql.proto", - }, -} - -// Extension fields to descriptorpb.MethodOptions. -var ( - // optional micro.graphql.Rpc rpc = 65030; - E_Rpc = &file_graphql_graphql_proto_extTypes[0] -) - -// Extension fields to descriptorpb.ServiceOptions. -var ( - // optional micro.graphql.Svc svc = 65030; - E_Svc = &file_graphql_graphql_proto_extTypes[1] -) - -// Extension fields to descriptorpb.FieldOptions. -var ( - // optional micro.graphql.Field field = 65030; - E_Field = &file_graphql_graphql_proto_extTypes[2] -) - -// Extension fields to descriptorpb.OneofOptions. -var ( - // optional micro.graphql.Oneof oneof = 65030; - E_Oneof = &file_graphql_graphql_proto_extTypes[3] -) - -var File_graphql_graphql_proto protoreflect.FileDescriptor - -var file_graphql_graphql_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, - 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x33, 0x0a, 0x05, 0x4f, 0x6e, 0x65, 0x6f, - 0x66, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x06, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x7b, 0x0a, - 0x05, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, - 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, - 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x69, - 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x69, 0x72, 0x73, 0x12, 0x16, - 0x0a, 0x06, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x03, 0x52, 0x70, - 0x63, 0x12, 0x27, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x13, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, - 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x67, - 0x6e, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x67, 0x6e, 0x6f, - 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x8f, 0x01, 0x0a, 0x03, 0x53, 0x76, 0x63, 0x12, 0x27, - 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x6d, - 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x54, 0x79, 0x70, - 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x67, 0x6e, 0x6f, 0x72, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x17, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x08, - 0x75, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2a, 0x2c, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x0c, 0x0a, - 0x08, 0x4d, 0x55, 0x54, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x51, - 0x55, 0x45, 0x52, 0x59, 0x10, 0x02, 0x2a, 0x4e, 0x0a, 0x08, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, - 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x14, 0x55, 0x50, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x55, - 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, - 0x55, 0x50, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x10, - 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x50, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x43, 0x4c, - 0x49, 0x45, 0x4e, 0x54, 0x10, 0x02, 0x3a, 0x46, 0x0a, 0x03, 0x72, 0x70, 0x63, 0x12, 0x1e, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0xfc, - 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x52, 0x70, 0x63, 0x52, 0x03, 0x72, 0x70, 0x63, 0x3a, 0x47, - 0x0a, 0x03, 0x73, 0x76, 0x63, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0xfc, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x53, - 0x76, 0x63, 0x52, 0x03, 0x73, 0x76, 0x63, 0x3a, 0x4b, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, - 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, - 0x86, 0xfc, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x05, 0x66, - 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x4b, 0x0a, 0x05, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x12, 0x1d, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x86, 0xfc, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x67, 0x72, 0x61, - 0x70, 0x68, 0x71, 0x6c, 0x2e, 0x4f, 0x6e, 0x65, 0x6f, 0x66, 0x52, 0x05, 0x6f, 0x6e, 0x65, 0x6f, - 0x66, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, - 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2f, 0x76, 0x33, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x71, 0x6c, 0x3b, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x71, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_graphql_graphql_proto_rawDescOnce sync.Once - file_graphql_graphql_proto_rawDescData = file_graphql_graphql_proto_rawDesc -) - -func file_graphql_graphql_proto_rawDescGZIP() []byte { - file_graphql_graphql_proto_rawDescOnce.Do(func() { - file_graphql_graphql_proto_rawDescData = protoimpl.X.CompressGZIP(file_graphql_graphql_proto_rawDescData) - }) - return file_graphql_graphql_proto_rawDescData -} - -var file_graphql_graphql_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_graphql_graphql_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_graphql_graphql_proto_goTypes = []interface{}{ - (Type)(0), // 0: micro.graphql.Type - (Upstream)(0), // 1: micro.graphql.Upstream - (*Oneof)(nil), // 2: micro.graphql.Oneof - (*Field)(nil), // 3: micro.graphql.Field - (*Rpc)(nil), // 4: micro.graphql.Rpc - (*Svc)(nil), // 5: micro.graphql.Svc - (*descriptorpb.MethodOptions)(nil), // 6: google.protobuf.MethodOptions - (*descriptorpb.ServiceOptions)(nil), // 7: google.protobuf.ServiceOptions - (*descriptorpb.FieldOptions)(nil), // 8: google.protobuf.FieldOptions - (*descriptorpb.OneofOptions)(nil), // 9: google.protobuf.OneofOptions -} -var file_graphql_graphql_proto_depIdxs = []int32{ - 0, // 0: micro.graphql.Rpc.type:type_name -> micro.graphql.Type - 0, // 1: micro.graphql.Svc.type:type_name -> micro.graphql.Type - 1, // 2: micro.graphql.Svc.upstream:type_name -> micro.graphql.Upstream - 6, // 3: micro.graphql.rpc:extendee -> google.protobuf.MethodOptions - 7, // 4: micro.graphql.svc:extendee -> google.protobuf.ServiceOptions - 8, // 5: micro.graphql.field:extendee -> google.protobuf.FieldOptions - 9, // 6: micro.graphql.oneof:extendee -> google.protobuf.OneofOptions - 4, // 7: micro.graphql.rpc:type_name -> micro.graphql.Rpc - 5, // 8: micro.graphql.svc:type_name -> micro.graphql.Svc - 3, // 9: micro.graphql.field:type_name -> micro.graphql.Field - 2, // 10: micro.graphql.oneof:type_name -> micro.graphql.Oneof - 11, // [11:11] is the sub-list for method output_type - 11, // [11:11] is the sub-list for method input_type - 7, // [7:11] is the sub-list for extension type_name - 3, // [3:7] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name -} - -func init() { file_graphql_graphql_proto_init() } -func file_graphql_graphql_proto_init() { - if File_graphql_graphql_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_graphql_graphql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Oneof); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_graphql_graphql_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Field); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_graphql_graphql_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Rpc); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_graphql_graphql_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Svc); 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_graphql_graphql_proto_rawDesc, - NumEnums: 2, - NumMessages: 4, - NumExtensions: 4, - NumServices: 0, - }, - GoTypes: file_graphql_graphql_proto_goTypes, - DependencyIndexes: file_graphql_graphql_proto_depIdxs, - EnumInfos: file_graphql_graphql_proto_enumTypes, - MessageInfos: file_graphql_graphql_proto_msgTypes, - ExtensionInfos: file_graphql_graphql_proto_extTypes, - }.Build() - File_graphql_graphql_proto = out.File - file_graphql_graphql_proto_rawDesc = nil - file_graphql_graphql_proto_goTypes = nil - file_graphql_graphql_proto_depIdxs = nil -} diff --git a/graphql/graphql.proto b/graphql/graphql.proto deleted file mode 100644 index aeca384..0000000 --- a/graphql/graphql.proto +++ /dev/null @@ -1,63 +0,0 @@ -syntax = "proto3"; - -package micro.graphql; - -option go_package = "go.unistack.org/micro-proto/v3/graphql;graphql"; - -import "google/protobuf/descriptor.proto"; - -// TODO: Email protobuf-global-extension-registry@google.com to get an extension ID. - -extend google.protobuf.MethodOptions { - Rpc rpc = 65030; -} - -extend google.protobuf.ServiceOptions { - Svc svc = 65030; -} - -extend google.protobuf.FieldOptions { - Field field = 65030; -} - -extend google.protobuf.OneofOptions { - Oneof oneof = 65030; -} - -message Oneof { - bool ignore = 4; - string name = 5; -} - -message Field { - bool required = 1; - string params = 2; - string dirs = 3; - bool ignore = 4; - string name = 5; -} - -message Rpc { - Type type = 1; - bool ignore = 2; - string name = 3; -} - -message Svc { - Type type = 1; - bool ignore = 2; - string name = 3; - Upstream upstream = 4; -} - -enum Type { - DEFAULT = 0; - MUTATION = 1; - QUERY = 2; -} - -enum Upstream { - UPSTREAM_UNSPECIFIED = 0; - UPSTREAM_SERVER = 1; - UPSTREAM_CLIENT = 2; -} \ No newline at end of file diff --git a/graphql/types.go b/graphql/types.go deleted file mode 100644 index 5ffa407..0000000 --- a/graphql/types.go +++ /dev/null @@ -1,171 +0,0 @@ -package graphql - -import ( - "context" - "encoding/json" - "fmt" - "io" - "strconv" - - "github.com/golang/protobuf/ptypes" - "github.com/golang/protobuf/ptypes/any" -) - -type DummyResolver struct{} - -func (r *DummyResolver) Dummy(ctx context.Context) (*bool, error) { return nil, nil } - -func MarshalBytes(b []byte) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = fmt.Fprintf(w, "%q", string(b)) - }) -} - -func UnmarshalBytes(v interface{}) ([]byte, error) { - switch v := v.(type) { - case string: - return []byte(v), nil - case *string: - return []byte(*v), nil - case []byte: - return v, nil - case json.RawMessage: - return []byte(v), nil - default: - return nil, fmt.Errorf("%T is not []byte", v) - } -} - -func MarshalAny(any any.Any) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - d := &ptypes.DynamicAny{} - if err := ptypes.UnmarshalAny(&any, d); err != nil { - panic("unable to unmarshal any: " + err.Error()) - } - - if err := json.NewEncoder(w).Encode(d.Message); err != nil { - panic("unable to encode json: " + err.Error()) - } - }) -} - -func UnmarshalAny(v interface{}) (any.Any, error) { - switch v := v.(type) { - case []byte: - return any.Any{}, nil // TODO add an unmarshal mechanism - case json.RawMessage: - return any.Any{}, nil - default: - return any.Any{}, fmt.Errorf("%T is not json.RawMessage", v) - } -} - -func MarshalInt32(any int32) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = w.Write([]byte(strconv.Itoa(int(any)))) - }) -} - -func UnmarshalInt32(v interface{}) (int32, error) { - switch v := v.(type) { - case int: - return int32(v), nil - case int32: - return v, nil - case json.Number: - i, err := v.Int64() - return int32(i), err - default: - return 0, fmt.Errorf("%T is not int32", v) - } -} - -func MarshalInt64(any int64) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = w.Write([]byte(strconv.Itoa(int(any)))) - }) -} - -func UnmarshalInt64(v interface{}) (int64, error) { - switch v := v.(type) { - case int: - return int64(v), nil - case int64: - return v, nil - case json.Number: - i, err := v.Int64() - return i, err - default: - return 0, fmt.Errorf("%T is not int32", v) - } -} - -func MarshalUint32(any uint32) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = w.Write([]byte(strconv.Itoa(int(any)))) - }) -} - -func UnmarshalUint32(v interface{}) (uint32, error) { - switch v := v.(type) { - case int: - return uint32(v), nil - case uint32: - return v, nil - case json.Number: - i, err := v.Int64() - return uint32(i), err - default: - return 0, fmt.Errorf("%T is not int32", v) - } -} - -func MarshalUint64(any uint64) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = w.Write([]byte(strconv.Itoa(int(any)))) - }) -} - -func UnmarshalUint64(v interface{}) (uint64, error) { - switch v := v.(type) { - case int: - return uint64(v), nil - case uint64: - return v, nil // TODO add an unmarshal mechanism - case json.Number: - i, err := v.Int64() - return uint64(i), err - default: - return 0, fmt.Errorf("%T is not uint64", v) - } -} - -func MarshalFloat32(any float32) ContextMarshaler { - return WriterFunc(func(w io.Writer) { - _, _ = w.Write([]byte(strconv.Itoa(int(any)))) - }) -} - -func UnmarshalFloat32(v interface{}) (float32, error) { - switch v := v.(type) { - case int: - return float32(v), nil - case float32: - return v, nil - case json.Number: - f, err := v.Float64() - return float32(f), err - default: - return 0, fmt.Errorf("%T is not float32", v) - } -} - -type ContextMarshaler interface { - MarshalGQLContext(ctx context.Context, w io.Writer) error -} - -type WriterFunc func(ctx context.Context, writer io.Writer) error - -func (f WriterFunc) MarshalGQLContext(ctx context.Context, w io.Writer) error { - return f(ctx, w) -} diff --git a/openapiv2/annotations.pb.go b/openapiv2/annotations.pb.go index e947844..5efc044 100644 --- a/openapiv2/annotations.pb.go +++ b/openapiv2/annotations.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: openapiv2/annotations.proto package openapiv2 diff --git a/openapiv2/openapiv2.pb.go b/openapiv2/openapiv2.pb.go index c89ef79..61fa651 100644 --- a/openapiv2/openapiv2.pb.go +++ b/openapiv2/openapiv2.pb.go @@ -17,7 +17,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: openapiv2/openapiv2.proto package openapiv2 diff --git a/openapiv3/annotations.pb.go b/openapiv3/annotations.pb.go index 721b383..e209cb2 100644 --- a/openapiv3/annotations.pb.go +++ b/openapiv3/annotations.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: openapiv3/annotations.proto package openapiv3 diff --git a/openapiv3/openapiv3.pb.go b/openapiv3/openapiv3.pb.go index fb4e031..7cffc83 100644 --- a/openapiv3/openapiv3.pb.go +++ b/openapiv3/openapiv3.pb.go @@ -17,7 +17,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: openapiv3/openapiv3.proto package openapiv3 diff --git a/tag/tag.pb.go b/tag/tag.pb.go index 4475232..ee62c28 100644 --- a/tag/tag.pb.go +++ b/tag/tag.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v4.25.3 +// protoc v6.33.4 // source: tag/tag.proto package tag