From 28f918b741c001f0178893566377a73134aeec2c Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 28 Feb 2022 00:21:28 +0300 Subject: [PATCH] add errors proto Signed-off-by: Vasiliy Tolstov --- api/annotations.pb.go | 2 +- api/client.pb.go | 2 +- api/field_behavior.pb.go | 2 +- api/http.pb.go | 2 +- api/httpbody.pb.go | 2 +- api/micro.pb.go | 2 +- errors/errors.pb.go | 189 ++++++++++++++++++++++++++++++++++++ errors/errors.proto | 31 ++++++ generate.go | 1 + openapiv2/annotations.pb.go | 2 +- openapiv2/openapiv2.pb.go | 2 +- openapiv3/annotations.pb.go | 2 +- openapiv3/openapiv3.pb.go | 2 +- tag/tag.pb.go | 2 +- 14 files changed, 232 insertions(+), 11 deletions(-) create mode 100644 errors/errors.pb.go create mode 100644 errors/errors.proto diff --git a/api/annotations.pb.go b/api/annotations.pb.go index ed43bd3..36e9d33 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 v3.19.3 +// protoc v3.19.4 // source: api/annotations.proto package api diff --git a/api/client.pb.go b/api/client.pb.go index 7a92d36..e4ad52a 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 v3.19.3 +// protoc v3.19.4 // source: api/client.proto package api diff --git a/api/field_behavior.pb.go b/api/field_behavior.pb.go index c223592..cdbfde4 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 v3.19.3 +// protoc v3.19.4 // source: api/field_behavior.proto package api diff --git a/api/http.pb.go b/api/http.pb.go index 1dbc8e2..2f84021 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 v3.19.3 +// protoc v3.19.4 // source: api/http.proto package api diff --git a/api/httpbody.pb.go b/api/httpbody.pb.go index 4e0f4c3..6cd67be 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 v3.19.3 +// protoc v3.19.4 // source: api/httpbody.proto package api diff --git a/api/micro.pb.go b/api/micro.pb.go index d529f48..06cbf93 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 v3.19.3 +// protoc v3.19.4 // source: api/micro.proto package api diff --git a/errors/errors.pb.go b/errors/errors.pb.go new file mode 100644 index 0000000..463c9ac --- /dev/null +++ b/errors/errors.pb.go @@ -0,0 +1,189 @@ +// Copyright 2021 Unistack LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.26.0 +// protoc v3.19.4 +// source: errors/errors.proto + +package errors + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + 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 Error struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Detail string `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` + Code uint32 `protobuf:"varint,4,opt,name=code,proto3" json:"code,omitempty"` +} + +func (x *Error) Reset() { + *x = Error{} + if protoimpl.UnsafeEnabled { + mi := &file_errors_errors_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Error) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Error) ProtoMessage() {} + +func (x *Error) ProtoReflect() protoreflect.Message { + mi := &file_errors_errors_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 Error.ProtoReflect.Descriptor instead. +func (*Error) Descriptor() ([]byte, []int) { + return file_errors_errors_proto_rawDescGZIP(), []int{0} +} + +func (x *Error) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *Error) GetDetail() string { + if x != nil { + return x.Detail + } + return "" +} + +func (x *Error) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *Error) GetCode() uint32 { + if x != nil { + return x.Code + } + return 0 +} + +var File_errors_errors_proto protoreflect.FileDescriptor + +var file_errors_errors_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x2f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x73, 0x22, 0x5b, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, + 0x74, 0x61, 0x69, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x42, 0x58, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, + 0x42, 0x0b, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x50, 0x01, 0x5a, + 0x2c, 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, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x3b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0xf8, 0x01, 0x01, + 0xa2, 0x02, 0x07, 0x4d, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, +} + +var ( + file_errors_errors_proto_rawDescOnce sync.Once + file_errors_errors_proto_rawDescData = file_errors_errors_proto_rawDesc +) + +func file_errors_errors_proto_rawDescGZIP() []byte { + file_errors_errors_proto_rawDescOnce.Do(func() { + file_errors_errors_proto_rawDescData = protoimpl.X.CompressGZIP(file_errors_errors_proto_rawDescData) + }) + return file_errors_errors_proto_rawDescData +} + +var file_errors_errors_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_errors_errors_proto_goTypes = []interface{}{ + (*Error)(nil), // 0: micro.errors.Error +} +var file_errors_errors_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_errors_errors_proto_init() } +func file_errors_errors_proto_init() { + if File_errors_errors_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_errors_errors_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Error); 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_errors_errors_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_errors_errors_proto_goTypes, + DependencyIndexes: file_errors_errors_proto_depIdxs, + MessageInfos: file_errors_errors_proto_msgTypes, + }.Build() + File_errors_errors_proto = out.File + file_errors_errors_proto_rawDesc = nil + file_errors_errors_proto_goTypes = nil + file_errors_errors_proto_depIdxs = nil +} diff --git a/errors/errors.proto b/errors/errors.proto new file mode 100644 index 0000000..b030fd2 --- /dev/null +++ b/errors/errors.proto @@ -0,0 +1,31 @@ +// Copyright 2021 Unistack LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package micro.errors; + +option cc_enable_arenas = true; +option go_package = "go.unistack.org/micro-proto/v3/errors;errors"; +option java_multiple_files = true; +option java_outer_classname = "MicroErrors"; +option java_package = "micro.errors"; +option objc_class_prefix = "MERRORS"; + +message Error { + string id = 1; + string detail = 2; + string status = 3; + uint32 code = 4; +} diff --git a/generate.go b/generate.go index 0f397c3..ea35616 100644 --- a/generate.go +++ b/generate.go @@ -11,3 +11,4 @@ package main //go:generate protoc -I. -I./openapiv3 --go_out=paths=source_relative:. ./openapiv3/annotations.proto //go:generate protoc -I. -I./openapiv3 --go_out=paths=source_relative:. ./openapiv3/openapiv3.proto //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 diff --git a/openapiv2/annotations.pb.go b/openapiv2/annotations.pb.go index 960d04b..eac9827 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 v3.19.3 +// protoc v3.19.4 // source: openapiv2/annotations.proto package openapiv2 diff --git a/openapiv2/openapiv2.pb.go b/openapiv2/openapiv2.pb.go index 5025055..d8ffc1a 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 v3.19.3 +// protoc v3.19.4 // source: openapiv2/openapiv2.proto package openapiv2 diff --git a/openapiv3/annotations.pb.go b/openapiv3/annotations.pb.go index 80bcb26..fce9b2b 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 v3.19.3 +// protoc v3.19.4 // source: openapiv3/annotations.proto package openapiv3 diff --git a/openapiv3/openapiv3.pb.go b/openapiv3/openapiv3.pb.go index c520ceb..5246acb 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 v3.19.3 +// protoc v3.19.4 // source: openapiv3/openapiv3.proto package openapiv3 diff --git a/tag/tag.pb.go b/tag/tag.pb.go index 0e49947..77da407 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 v3.19.3 +// protoc v3.19.4 // source: tag/tag.proto package tag