diff --git a/codec/frame.proto b/codec/frame.proto index f364bc53..69dc556a 100644 --- a/codec/frame.proto +++ b/codec/frame.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package micro.codec; option cc_enable_arenas = true; -option go_package = "github.com/unistack-org/micro/v3/codec;codec"; +option go_package = "go.unistack.org/micro/v3/codec;codec"; option java_multiple_files = true; option java_outer_classname = "MicroCodec"; option java_package = "micro.codec"; diff --git a/go.mod b/go.mod index e5971e37..e07fa95a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/imdario/mergo v0.3.12 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4 - github.com/unistack-org/micro-proto v0.0.9 + go.unistack.org/micro-proto/v3 v3.1.0 golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) diff --git a/go.sum b/go.sum index 012f9562..e3e7fe0d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/ef-ds/deque v1.0.4 h1:iFAZNmveMT9WERAkqLJ+oaABF9AcVQ5AjXem/hroniI= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= -github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -11,14 +9,10 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/silas/dag v0.0.0-20210121180416-41cf55125c34 h1:vBfVmA5mZhsQa2jr1FOL9nfA37N/jnbBmi5XUfviVTI= -github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4 h1:fOH64AB0C3ixGf9emky61STvPJL3smxJg+1Zwx1oCdg= github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc= -github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= +go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b h1:eB48h3HiRycXNy8E0Gf5e0hv7YT6Kt14L/D73G1fuwo= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/meter/generate.go b/meter/generate.go index 875ed1a1..01112682 100644 --- a/meter/generate.go +++ b/meter/generate.go @@ -1,12 +1,12 @@ package meter -//go:generate sh -c "protoc -I./handler -I../ -I$(go list -f '{{ .Dir }}' -m github.com/unistack-org/micro-proto) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./handler handler/handler.proto" +//go:generate sh -c "protoc -I./handler -I../ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./handler handler/handler.proto" import ( // import required packages - _ "github.com/unistack-org/micro-proto/api" + _ "go.unistack.org/micro-proto/v3/api" // import required packages - _ "github.com/unistack-org/micro-proto/openapiv2" + _ "go.unistack.org/micro-proto/v3/openapiv3" ) diff --git a/meter/handler/handler.proto b/meter/handler/handler.proto index d6d153e0..b3f69d6b 100644 --- a/meter/handler/handler.proto +++ b/meter/handler/handler.proto @@ -1,24 +1,20 @@ syntax = "proto3"; package micro.meter.handler; -option go_package = "github.com/unistack-org/micro/v3/meter/handler;handler"; +option go_package = "go.unistack.org/micro/v3/meter/handler;handler"; import "api/annotations.proto"; -import "openapiv2/annotations.proto"; +import "openapiv3/annotations.proto"; import "codec/frame.proto"; service Meter { rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Metrics"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; diff --git a/meter/handler/handler_micro.pb.go b/meter/handler/handler_micro.pb.go index b638b17a..3b25bb29 100644 --- a/meter/handler/handler_micro.pb.go +++ b/meter/handler/handler_micro.pb.go @@ -1,12 +1,11 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: handler.proto package handler import ( context "context" - api "go.unistack.org/micro/v3/api" codec "go.unistack.org/micro/v3/codec" ) diff --git a/meter/handler/handler_micro_http.pb.go b/meter/handler/handler_micro_http.pb.go index 68902ddb..d8f40189 100644 --- a/meter/handler/handler_micro_http.pb.go +++ b/meter/handler/handler_micro_http.pb.go @@ -1,12 +1,11 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: handler.proto package handler import ( context "context" - api "go.unistack.org/micro/v3/api" codec "go.unistack.org/micro/v3/codec" server "go.unistack.org/micro/v3/server" diff --git a/server/generate.go b/server/generate.go index 11499a70..9773d417 100644 --- a/server/generate.go +++ b/server/generate.go @@ -1,12 +1,12 @@ package server -//go:generate sh -c "protoc -I./health -I../ -I$(go list -f '{{ .Dir }}' -m github.com/unistack-org/micro-proto) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./health health/health.proto" +//go:generate sh -c "protoc -I./health -I../ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./health health/health.proto" import ( // import required packages - _ "github.com/unistack-org/micro-proto/api" + _ "go.unistack.org/micro-proto/v3/api" // import required packages - _ "github.com/unistack-org/micro-proto/openapiv2" + _ "go.unistack.org/micro-proto/v3/openapiv3" ) diff --git a/server/health/health.proto b/server/health/health.proto index af42b028..6fd46bca 100644 --- a/server/health/health.proto +++ b/server/health/health.proto @@ -1,24 +1,20 @@ syntax = "proto3"; package micro.server.health; -option go_package = "github.com/unistack-org/micro/v3/server/health;health"; +option go_package = "go.unistack.org/micro/v3/server/health;health"; import "api/annotations.proto"; -import "openapiv2/annotations.proto"; +import "openapiv3/annotations.proto"; import "codec/frame.proto"; service Health { rpc Live(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Live"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; @@ -26,16 +22,12 @@ service Health { option (micro.api.http) = { get: "/live"; }; }; rpc Ready(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Ready"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; @@ -43,16 +35,12 @@ service Health { option (micro.api.http) = { get: "/ready"; }; }; rpc Version(micro.codec.Frame) returns (micro.codec.Frame) { - option (micro.openapiv2.openapiv2_operation) = { + option (micro.openapiv3.openapiv3_operation) = { operation_id: "Version"; responses: { - response_code: { - name: "default"; - value: { - json_reference: { - description: "Error response"; - _ref: "micro.codec.Frame"; - }; + default: { + reference: { + _ref: "micro.codec.Frame"; }; }; }; diff --git a/server/health/health_micro.pb.go b/server/health/health_micro.pb.go index b6cedfc0..c72c2ec3 100644 --- a/server/health/health_micro.pb.go +++ b/server/health/health_micro.pb.go @@ -1,12 +1,11 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: health.proto package health import ( context "context" - api "go.unistack.org/micro/v3/api" codec "go.unistack.org/micro/v3/codec" ) diff --git a/server/health/health_micro_http.pb.go b/server/health/health_micro_http.pb.go index 86f00817..0d23fd14 100644 --- a/server/health/health_micro_http.pb.go +++ b/server/health/health_micro_http.pb.go @@ -1,12 +1,11 @@ // Code generated by protoc-gen-go-micro. DO NOT EDIT. -// protoc-gen-go-micro version: v3.4.2 +// protoc-gen-go-micro version: v3.5.2 // source: health.proto package health import ( context "context" - api "go.unistack.org/micro/v3/api" codec "go.unistack.org/micro/v3/codec" server "go.unistack.org/micro/v3/server"