.github/dependabot.yml

@@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-
-  # Maintain dependencies for Golang
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/renovate.json

@@ -0,0 +1,20 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "postUpdateOptions": ["gomodTidy"],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
+    },
+    {
+      "groupName": "all deps",
+      "separateMajorMinor": true,
+      "groupSlug": "all",
+      "packagePatterns": [
+        "*"
+      ]
+    }
+  ]
+}

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -3,20 +3,19 @@ on:
  push:
     branches:
     - master
-    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -32,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v2
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -1,78 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "codeql"
-
-on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-  push:
-    branches: [ master, v3 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master, v3 ]
-  schedule:
-    - cron: '34 1 * * 0'
-
-jobs:
-  analyze:
-    name: analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: analyze
-      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,27 +0,0 @@
-name: "dependabot-automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: merge
-        id: merge
-        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -3,20 +3,19 @@ on:
   pull_request:
     branches:
     - master
-    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -32,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v2
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.gitignore

@@ -34,5 +34,5 @@ _cgo_export.*
 *~
 *.swp
 *.swo
-/protoc-gen-go-micro
+/protoc-gen-micro
 

README.md

@@ -1,4 +1,4 @@
-# `protoc-gen-go-micro`
+# `protoc-gen-micro`
 protobuf plugin to generate helper code for micro framework
 
 A generic **code**/script/data generator based on [Protobuf](https://developers.google.com/protocol-buffers/).
@@ -10,17 +10,16 @@ This project is a generator plugin for the Google Protocol Buffers compiler (`pr
 ## Usage
 
 ```console
-$> protoc --go_micro_out=debug=true,components="micro|http":. input.proto
+$> protoc --micro_out=debug=true,components="micro|http":. input.proto
 ```
 
 | Option                | Default Value | Accepted Values           | Description
 |-----------------------|---------------|---------------------------|-----------------------
-| `tag_path`            | `.`           | `any local path`          | path contains generated protobuf code that needs to be tagged
 | `debug`               | *false*       | `true` or `false`         | if *true*, `protoc` will generate a more verbose output
-| `components`          | `micro`       | `micro rpc http chi gorilla client server` | some values can't coexists like gorilla/chi or rpc/http, values must be concatinated with pipe symbol
+| `components`          | `micro`       | `micro rpc http chi gorilla` | some values cant coexists like gorilla/chi or rpc/http, values must be concatinated with pipe symbol
 
 ## Install
 
 * Install the **go** compiler and tools from https://golang.org/doc/install
-* Install **protoc-gen-go**: `go install google.golang.org/protobuf/cmd/protoc-gen-go`
-* Install **protoc-gen-go-micro**: `go install go.unistack.org/protoc-gen-go-micro/v4`
+* Install **protoc-gen-go**: `go get google.golang.org/protobuf/cmd/protoc-gen-go`
+* Install **protoc-gen-micro**: `go get github.com/unistack-org/protoc-gen-micro/v3`

ast.go

@@ -1,170 +0,0 @@
-package main
-
-import (
-	"go/ast"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/fatih/structtag"
-	tag_options "go.unistack.org/micro-proto/v4/tag"
-	"google.golang.org/protobuf/compiler/protogen"
-	"google.golang.org/protobuf/proto"
-)
-
-var astFields = make(map[string]map[string]map[string]*structtag.Tags) // map proto file with proto message ast struct
-
-func (g *Generator) astFill(file *protogen.File, message *protogen.Message) error {
-	for _, field := range message.Fields {
-		if field.Desc.Options() == nil {
-			continue
-		}
-		if !proto.HasExtension(field.Desc.Options(), tag_options.E_Tags) {
-			continue
-		}
-
-		opts := proto.GetExtension(field.Desc.Options(), tag_options.E_Tags)
-		if opts != nil {
-			fpath := filepath.Join(g.tagPath, file.GeneratedFilenamePrefix+".pb.go")
-			mp, ok := astFields[fpath]
-			if !ok {
-				mp = make(map[string]map[string]*structtag.Tags)
-			}
-			nmp, ok := mp[message.GoIdent.GoName]
-			if !ok {
-				nmp = make(map[string]*structtag.Tags)
-			}
-			tags, err := structtag.Parse(opts.(string))
-			if err != nil {
-				return err
-			}
-			nmp[field.GoName] = tags
-			mp[message.GoIdent.GoName] = nmp
-			astFields[fpath] = mp
-		}
-	}
-	for _, nmessage := range message.Messages {
-		if err := g.astFill(file, nmessage); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (g *Generator) astGenerate(plugin *protogen.Plugin) error {
-	if g.tagPath == "" {
-		return nil
-	}
-
-	for _, file := range plugin.Files {
-		if !file.Generate {
-			continue
-		}
-		for _, message := range file.Messages {
-			if err := g.astFill(file, message); err != nil {
-				return err
-			}
-		}
-	}
-
-	for file, mp := range astFields {
-		fset := token.NewFileSet()
-		pf, err := parser.ParseFile(fset, file, nil, parser.AllErrors|parser.ParseComments)
-		if err != nil {
-			return err
-		}
-
-		r := retag{}
-		f := func(n ast.Node) ast.Visitor {
-			if r.err != nil {
-				return nil
-			}
-
-			if v, ok := n.(*ast.TypeSpec); ok {
-				r.fields = mp[v.Name.Name]
-				return r
-			}
-
-			return nil
-		}
-
-		ast.Walk(structVisitor{f}, pf)
-
-		if r.err != nil {
-			return err
-		}
-
-		fp, err := os.OpenFile(file, os.O_WRONLY|os.O_TRUNC, os.FileMode(0644))
-		if err != nil {
-			return err
-		}
-		if err = format.Node(fp, fset, pf); err != nil {
-			fp.Close()
-			return err
-		}
-		if err = fp.Close(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type retag struct {
-	err    error
-	fields map[string]*structtag.Tags
-}
-
-func (v retag) Visit(n ast.Node) ast.Visitor {
-	if v.err != nil {
-		return nil
-	}
-	if f, ok := n.(*ast.Field); ok {
-		if len(f.Names) == 0 {
-			return nil
-		}
-
-		newTags := v.fields[f.Names[0].String()]
-		if newTags == nil {
-			return nil
-		}
-		if f.Tag == nil {
-			f.Tag = &ast.BasicLit{
-				Kind: token.STRING,
-			}
-		}
-
-		oldTags, err := structtag.Parse(strings.Trim(f.Tag.Value, "`"))
-		if err != nil {
-			v.err = err
-			return nil
-		}
-		for _, t := range newTags.Tags() {
-			oldTags.Set(t)
-		}
-
-		f.Tag.Value = "`" + oldTags.String() + "`"
-
-		return nil
-	}
-
-	return v
-}
-
-type structVisitor struct {
-	visitor func(n ast.Node) ast.Visitor
-}
-
-func (v structVisitor) Visit(n ast.Node) ast.Visitor {
-	if tp, ok := n.(*ast.TypeSpec); ok {
-		if _, ok := tp.Type.(*ast.StructType); ok {
-			ast.Walk(v.visitor(n), n)
-			return nil // This will ensure this struct is no longer traversed
-		}
-	}
-	return v
-}

chi.go

@@ -4,7 +4,9 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-var chiPackageFiles map[protogen.GoPackageName]struct{}
+var (
+	chiPackageFiles map[protogen.GoPackageName]struct{}
+)
 
 func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error {
 	chiPackageFiles = make(map[protogen.GoPackageName]struct{})
@@ -28,9 +30,7 @@ func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error
 		}
 		gfile := plugin.NewGeneratedFile(gname, path)
 
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// protoc-gen-go-micro version: " + versionComment)
-		gfile.P()
+		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
@@ -41,6 +41,7 @@ func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error
 		gfile.Import(stringsPackage)
 		gfile.Import(chiPackage)
 		gfile.Import(chiMiddlewarePackage)
+		gfile.Import(microApiPackage)
 
 		gfile.P("type routeKey struct{}")
 
@@ -49,17 +50,17 @@ func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error
 		gfile.P("return value, ok")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func RegisterHandlers(r *", chiPackage.Ident("Mux"), ", h interface{}, eps []", microServerHttpPackage.Ident("EndpointMetadata"), ") error {")
+		gfile.P("func RegisterHandlers(r *", chiPackage.Ident("Mux"), ", h interface{}, eps []*", microApiPackage.Ident("Endpoint"), ") error {")
 		gfile.P("v := ", reflectPackage.Ident("ValueOf"), "(h)")
 		gfile.P("if v.NumMethod() < 1 {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("handler has no methods: %T", h)`)
 		gfile.P("}")
 		gfile.P("for _, ep := range eps {")
 		gfile.P(`idx := `, stringsPackage.Ident("Index"), `(ep.Name, ".")`)
-		gfile.P(`if idx < 1 || len(ep.Name) <= idx {`)
-		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid endpoint name: %s", ep.Name)`)
+		gfile.P("if idx < 1 || len(ep.Name) <= idx {")
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid `, microApiPackage.Ident("Endpoint"), ` name: %s", ep.Name)`)
 		gfile.P("}")
-		gfile.P(`name := ep.Name[idx+1:]`)
+		gfile.P("name := ep.Name[idx+1:]")
 		gfile.P("m := v.MethodByName(name)")
 		gfile.P("if !m.IsValid() || m.IsZero() {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler, method %s not found", name)`)
@@ -68,7 +69,9 @@ func (g *Generator) chiGenerate(component string, plugin *protogen.Plugin) error
 		gfile.P("if !ok {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler: %#+v", m.Interface())`)
 		gfile.P("}")
-		gfile.P("r.With(", chiMiddlewarePackage.Ident("WithValue"), `(routeKey{}, ep.Name)).MethodFunc(ep.Method, ep.Path, rh)`)
+		gfile.P("for _, method := range ep.Method {")
+		gfile.P("r.With(", chiMiddlewarePackage.Ident("WithValue"), "(routeKey{}, ep.Name)).MethodFunc(method, ep.Path[0], rh)")
+		gfile.P("}")
 		gfile.P("}")
 		gfile.P("return nil")
 		gfile.P("}")

example/example.proto

@@ -1,44 +0,0 @@
-syntax = "proto3";
-
-package example;
-
-option go_package = "github.com/unistack-org/protoc-gen-go-micro/v4/example;examplepb";
-
-import "tag/tag.proto";
-import "api/annotations.proto";
-import "openapiv2/annotations.proto";
-import "google/protobuf/wrappers.proto";
-
-service Example {
-	rpc Call(CallReq) returns (CallRsp) {
-		option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "Call";
-        responses: {
-          key: "default";
-          value: {
-            description: "Error response";
-            schema: {
-              json_schema: {
-                ref: ".example.Error";
-              }
-            }
-          }
-        }
-    };
-		option (micro.api.http) = { post: "/v1/example/call/{name}"; body: "*"; };
-		option (micro.api.micro_method) = { timeout: "5s"; };
-  };
-};
-
-message CallReq {
-  string name = 1 [(micro.tag.tags) = "xml:\",attr\"" ];
-  string req = 2;
-};
-
-message CallRsp {
-  string rsp = 2;
-};
-
-message Error {
-	string msg = 1;
-};

fiealaligment.go

@@ -1,24 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	"golang.org/x/tools/go/analysis/passes/fieldalignment"
-	"golang.org/x/tools/go/analysis/singlechecker"
-	"google.golang.org/protobuf/compiler/protogen"
-)
-
-func (g *Generator) fieldAlign(plugin *protogen.Plugin) error {
-	if !g.fieldaligment {
-		return nil
-	}
-
-	log.Printf("%v\n", []string{"fieldalignment", "-fix", g.tagPath})
-	origArgs := os.Args
-	os.Args = []string{"fieldalignment", "-fix", g.tagPath}
-	singlechecker.Main(fieldalignment.Analyzer)
-	os.Args = origArgs
-
-	return nil
-}

go.mod

@@ -1,18 +1,11 @@
-module go.unistack.org/protoc-gen-go-micro/v4
+module github.com/unistack-org/protoc-gen-micro/v3
 
-go 1.19
+go 1.16
 
 require (
-	github.com/fatih/structtag v1.2.0
-	go.unistack.org/micro-proto/v4 v4.0.1
-	golang.org/x/tools v0.11.0
-	google.golang.org/protobuf v1.31.0
+	github.com/unistack-org/micro-proto v0.0.2-0.20210227213711-77c7563bd01e
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.26.0
 )
 
-require (
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+//replace github.com/unistack-org/micro-proto => ../micro-proto

go.sum

@@ -1,121 +1,51 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
-github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-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/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
-github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.unistack.org/micro-proto/v4 v4.0.1 h1:2RKHgtCOOcAFgKsnngGK5bqM/6MWXOjVCdw03dbuoF8=
-go.unistack.org/micro-proto/v4 v4.0.1/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
+github.com/unistack-org/micro-proto v0.0.2-0.20210227213711-77c7563bd01e h1:hQJ3V0QggeFdU5967wO5v6oWnaK42wUnG4UU4zWcyu4=
+github.com/unistack-org/micro-proto v0.0.2-0.20210227213711-77c7563bd01e/go.mod h1:GYO53DWmeldRIo90cAdQx8bLr/WJMxW62W4ja74p1Ac=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -123,16 +53,10 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -143,17 +67,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

gorilla.go

@@ -4,7 +4,9 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-var gorillaPackageFiles map[protogen.GoPackageName]struct{}
+var (
+	gorillaPackageFiles map[protogen.GoPackageName]struct{}
+)
 
 func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) error {
 	gorillaPackageFiles = make(map[protogen.GoPackageName]struct{})
@@ -28,9 +30,7 @@ func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) e
 		}
 		gfile := plugin.NewGeneratedFile(gname, path)
 
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// protoc-gen-go-micro version: " + versionComment)
-		gfile.P()
+		gfile.P("// Code generated by protoc-gen-micro")
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
@@ -38,19 +38,20 @@ func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) e
 		gfile.Import(httpPackage)
 		gfile.Import(reflectPackage)
 		gfile.Import(stringsPackage)
+		gfile.Import(microApiPackage)
 		gfile.Import(gorillaMuxPackage)
 
-		gfile.P("func RegisterHandlers(r *", gorillaMuxPackage.Ident("Router"), ", h interface{}, eps []", microServerHttpPackage.Ident("EndpointMetadata"), ") error {")
+		gfile.P("func RegisterHandlers(r *", gorillaMuxPackage.Ident("Router"), ", h interface{}, eps []*", microApiPackage.Ident("Endpoint"), ") error {")
 		gfile.P("v := ", reflectPackage.Ident("ValueOf"), "(h)")
 		gfile.P("if v.NumMethod() < 1 {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("handler has no methods: %T", h)`)
 		gfile.P("}")
 		gfile.P("for _, ep := range eps {")
 		gfile.P(`idx := `, stringsPackage.Ident("Index"), `(ep.Name, ".")`)
-		gfile.P(`if idx < 1 || len(ep.Name) <= idx {`)
-		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid endpoint name: %s", ep.Name)`)
+		gfile.P("if idx < 1 || len(ep.Name) <= idx {")
+		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid `, microApiPackage.Ident("Endpoint"), ` name: %s", ep.Name)`)
 		gfile.P("}")
-		gfile.P(`name := ep.Name[idx+1:]`)
+		gfile.P("name := ep.Name[idx+1:]")
 		gfile.P("m := v.MethodByName(name)")
 		gfile.P("if !m.IsValid() || m.IsZero() {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler, method %s not found", name)`)
@@ -59,7 +60,7 @@ func (g *Generator) gorillaGenerate(component string, plugin *protogen.Plugin) e
 		gfile.P("if !ok {")
 		gfile.P(`return `, fmtPackage.Ident("Errorf"), `("invalid handler: %#+v", m.Interface())`)
 		gfile.P("}")
-		gfile.P(`r.HandleFunc(ep.Path, rh).Methods(ep.Method).Name(ep.Name)`)
+		gfile.P("r.HandleFunc(ep.Path[0], rh).Methods(ep.Method...).Name(ep.Name)")
 		gfile.P("}")
 		gfile.P("return nil")
 		gfile.P("}")

http.go

@@ -4,7 +4,7 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin, genClient bool, genServer bool) error {
+func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin) error {
 	for _, file := range plugin.Files {
 		if !file.Generate {
 			continue
@@ -20,34 +20,23 @@ func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin, genC
 		}
 		gfile := plugin.NewGeneratedFile(gname, path)
 
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// protoc-gen-go-micro version: " + versionComment)
-		gfile.P("// source: ", file.Proto.GetName())
-		gfile.P()
+		gfile.P("// Code generated by protoc-gen-micro")
+		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
 		gfile.Import(contextPackage)
-
-		if genClient {
-			gfile.Import(microClientPackage)
-			gfile.Import(microClientHttpPackage)
-		}
-		if genServer {
-			gfile.Import(microServerPackage)
-		}
+		gfile.Import(microApiPackage)
+		gfile.Import(microClientPackage)
+		gfile.Import(microClientHttpPackage)
+		gfile.Import(microServerPackage)
 
 		for _, service := range file.Services {
-			g.generateServiceEndpoints(gfile, service, component)
-			if genClient {
-				g.generateServiceClient(gfile, file, service)
-				g.generateServiceClientMethods(gfile, service, component)
-			}
-			if genServer {
-				g.generateServiceServer(gfile, file, service)
-				g.generateServiceServerMethods(gfile, service)
-				g.generateServiceRegister(gfile, file, service, component)
-			}
+			generateServiceClient(gfile, service)
+			generateServiceClientMethods(gfile, service, true)
+			generateServiceServer(gfile, service)
+			generateServiceServerMethods(gfile, service)
+			generateServiceRegister(gfile, service)
 		}
 	}
 

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
 	"strings"
 
 	"google.golang.org/protobuf/compiler/protogen"
@@ -11,27 +10,14 @@ import (
 )
 
 var (
-	flagSet           = flag.NewFlagSet(os.Args[0], flag.ExitOnError)
-	flagDebug         = flagSet.Bool("debug", false, "debug output")
-	flagStandalone    = flagSet.Bool("standalone", false, "generate file to standalone dir")
-	flagFieldaligment = flagSet.Bool("fieldaligment", false, "align struct fields in generated code")
-	flagComponents    = flagSet.String("components", "micro|rpc|http|client|server|openapiv3", "specify components to generate")
-	flagTagPath       = flagSet.String("tag_path", "", "tag rewriting dir")
-	flagOpenapiFile   = flagSet.String("openapi_file", "apidocs.swagger.json", "openapi file name")
-	flagReflection    = flagSet.Bool("reflection", false, "enable server reflection support")
-	flagHelp          = flagSet.Bool("help", false, "display help message")
+	flagDebug      = flag.Bool("debug", false, "")
+	flagStandalone = flag.Bool("standalone", false, "")
+	flagComponents = flag.String("components", "micro|rpc", "")
 )
 
 func main() {
 	opts := &protogen.Options{
-		ParamFunc: flagSet.Set,
-	}
-
-	flagSet.Parse(os.Args[1:])
-
-	if *flagHelp {
-		flagSet.PrintDefaults()
-		return
+		ParamFunc: flag.CommandLine.Set,
 	}
 
 	g := &Generator{}
@@ -40,71 +26,32 @@ func main() {
 }
 
 type Generator struct {
-	components    string
-	standalone    bool
-	debug         bool
-	fieldaligment bool
-	tagPath       string
-	openapiFile   string
-	reflection    bool
-	plugin        *protogen.Plugin
+	components string
+	standalone bool
+	debug      bool
 }
 
 func (g *Generator) Generate(plugin *protogen.Plugin) error {
 	var err error
 
-	g.plugin = plugin
 	g.standalone = *flagStandalone
 	g.debug = *flagDebug
 	g.components = *flagComponents
-	g.fieldaligment = *flagFieldaligment
-	g.tagPath = *flagTagPath
-	g.openapiFile = *flagOpenapiFile
-	g.reflection = *flagReflection
 	plugin.SupportedFeatures = uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
 
-	var genClient bool
-	var genServer bool
-	var genNone bool
-
-	if strings.Contains(g.components, "server") {
-		genServer = true
-	}
-	if strings.Contains(g.components, "client") {
-		genClient = true
-	}
-	if strings.Contains(g.components, "none") {
-		genNone = true
-	}
-	if strings.Contains(g.components, "rpc") || strings.Contains(g.components, "http") {
-		if !genServer && !genClient && !genNone {
-			genServer = true
-			genClient = true
-		}
-	}
-
 	// Protoc passes a slice of File structs for us to process
 	for _, component := range strings.Split(g.components, "|") {
 		switch component {
-		case "server", "client":
-			continue
 		case "micro":
-			err = g.microGenerate(component, plugin, genClient, genServer)
-			if err == nil {
-				err = g.writeErrors(plugin)
-			}
+			err = g.microGenerate(component, plugin)
 		case "http":
-			err = g.httpGenerate(component, plugin, genClient, genServer)
-		case "grpc", "drpc", "rpc":
-			err = g.rpcGenerate(component, plugin, genClient, genServer)
+			err = g.httpGenerate(component, plugin)
+		case "grpc", "rpc":
+			err = g.rpcGenerate("rpc", plugin)
 		case "gorilla":
 			err = g.gorillaGenerate(component, plugin)
 		case "chi":
 			err = g.chiGenerate(component, plugin)
-		case "openapiv3":
-			err = g.openapiv3Generate(component, plugin)
-		case "none":
-			break
 		default:
 			err = fmt.Errorf("unknown component: %s", component)
 		}
@@ -116,15 +63,5 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
 
 	}
 
-	if err = g.astGenerate(plugin); err != nil {
-		plugin.Error(err)
-		return err
-	}
-
-	if err = g.fieldAlign(plugin); err != nil {
-		plugin.Error(err)
-		return err
-	}
-
 	return nil
 }

micro.go

@@ -1,12 +1,10 @@
 package main
 
 import (
-	"fmt"
-
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-func (g *Generator) microGenerate(component string, plugin *protogen.Plugin, genClient bool, genServer bool) error {
+func (g *Generator) microGenerate(component string, plugin *protogen.Plugin) error {
 	for _, file := range plugin.Files {
 		if !file.Generate {
 			continue
@@ -23,46 +21,25 @@ func (g *Generator) microGenerate(component string, plugin *protogen.Plugin, gen
 		}
 		gfile := plugin.NewGeneratedFile(gname, path)
 
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// versions:")
-		gfile.P("// - protoc-gen-go-micro " + versionComment)
-		gfile.P("// - protoc              ", protocVersion(plugin))
-		gfile.P("// source: ", file.Desc.Path())
-		gfile.P()
+		gfile.P("// Code generated by protoc-gen-micro")
+		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
 		gfile.Import(contextPackage)
+		gfile.Import(microApiPackage)
+		gfile.Import(microClientPackage)
 
-		if genClient {
-			gfile.Import(microClientPackage)
-		}
 		// generate services
 		for _, service := range file.Services {
-			g.generateServiceName(gfile, service)
-			if genClient {
-				g.generateServiceClientInterface(gfile, service)
-				g.generateServiceClientStreamInterface(gfile, service)
-			}
-			if genServer {
-				g.generateServiceServerInterface(gfile, service)
-				g.generateServiceServerStreamInterface(gfile, service)
-			}
+			generateServiceEndpoints(gfile, service)
+			generateServiceClientInterface(gfile, service)
+			generateServiceClientStreamInterface(gfile, service)
+			generateServiceServerInterface(gfile, service)
+			generateServiceServerStreamInterface(gfile, service)
 		}
 
 	}
 
 	return nil
 }
-
-func protocVersion(plugin *protogen.Plugin) string {
-	v := plugin.Request.GetCompilerVersion()
-	if v == nil {
-		return "(unknown)"
-	}
-	var suffix string
-	if s := v.GetSuffix(); s != "" {
-		suffix = "-" + s
-	}
-	return fmt.Sprintf("v%d.%d.%d%s", v.GetMajor(), v.GetMinor(), v.GetPatch(), suffix)
-}

openapiv3_util.go

@@ -1,39 +0,0 @@
-package main
-
-import v3 "go.unistack.org/micro-proto/v4/openapiv3"
-
-func getMediaType(eopt interface{}) string {
-	ctype := "application/json"
-
-	if eopt == nil {
-		return ctype
-	}
-
-	if eopt == v3.E_Openapiv3Operation.InterfaceOf(v3.E_Openapiv3Operation.Zero()) {
-		return ctype
-	}
-
-	opt, ok := eopt.(*v3.Operation)
-	if !ok || opt.RequestBody == nil {
-		return ctype
-	}
-
-	if opt.GetRequestBody() == nil {
-		return ctype
-	}
-
-	if opt.GetRequestBody().GetRequestBody() == nil {
-		return ctype
-	}
-
-	c := opt.GetRequestBody().GetRequestBody().GetContent()
-	if c == nil {
-		return ctype
-	}
-
-	for _, prop := range c.GetAdditionalProperties() {
-		ctype = prop.Name
-	}
-
-	return ctype
-}

rpc.go

@@ -4,7 +4,7 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin, genClient bool, genServer bool) error {
+func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin) error {
 	for _, file := range plugin.Files {
 		if !file.Generate {
 			continue
@@ -20,34 +20,22 @@ func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin, genCl
 		}
 		gfile := plugin.NewGeneratedFile(gname, path)
 
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// protoc-gen-go-micro version: " + versionComment)
-		gfile.P("// source: ", file.Proto.GetName())
-		gfile.P()
+		gfile.P("// Code generated by protoc-gen-micro")
+		gfile.P("// source: ", *file.Proto.Name)
 		gfile.P("package ", file.GoPackageName)
 		gfile.P()
 
 		gfile.Import(contextPackage)
+		gfile.Import(microApiPackage)
+		gfile.Import(microClientPackage)
+		gfile.Import(microServerPackage)
 
-		if genClient {
-			gfile.Import(microClientPackage)
-		}
-		if genServer {
-			gfile.Import(microServerPackage)
-		}
 		for _, service := range file.Services {
-			if genClient {
-				g.generateServiceClient(gfile, file, service)
-				g.generateServiceClientMethods(gfile, service, component)
-			}
-			if genServer {
-				g.generateServiceServer(gfile, file, service)
-				g.generateServiceServerMethods(gfile, service)
-				g.generateServiceRegister(gfile, file, service, component)
-			}
-			if component == "grpc" && g.reflection {
-				g.generateServiceDesc(gfile, file, service)
-			}
+			generateServiceClient(gfile, service)
+			generateServiceClientMethods(gfile, service, false)
+			generateServiceServer(gfile, service)
+			generateServiceServerMethods(gfile, service)
+			generateServiceRegister(gfile, service)
 		}
 	}
 

util.go

@@ -2,38 +2,21 @@ package main
 
 import (
 	"fmt"
-	"log"
-	"net/http"
-	"strconv"
 	"strings"
-	"time"
 
-	api_options "go.unistack.org/micro-proto/v4/api"
-	v2 "go.unistack.org/micro-proto/v4/openapiv2"
-	v3 "go.unistack.org/micro-proto/v4/openapiv3"
+	api_options "github.com/unistack-org/micro-proto/api"
+	openapiv2_options "github.com/unistack-org/micro-proto/openapiv2"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
 )
 
-var httpMethodMap = map[string]string{
-	http.MethodGet:     "MethodGet",
-	http.MethodHead:    "MethodHead",
-	http.MethodPost:    "MethodPost",
-	http.MethodPut:     "MethodPut",
-	http.MethodPatch:   "MethodPatch",
-	http.MethodDelete:  "MethodDelete",
-	http.MethodConnect: "MethodConnect",
-	http.MethodOptions: "MethodOptions",
-	http.MethodTrace:   "MethodTrace",
-}
-
 func unexport(s string) string {
 	return strings.ToLower(s[:1]) + s[1:]
 }
 
-func (g *Generator) generateServiceClient(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service) {
-	serviceName := getServiceName(service)
-	// if rule, ok := getMicroApiService(service); ok {
+func generateServiceClient(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
+	//if rule, ok := getMicroApiService(service); ok {
 	//		gfile.P("// client wrappers ", strings.Join(rule.ClientWrappers, ", "))
 	//	}
 	gfile.P("type ", unexport(serviceName), "Client struct {")
@@ -41,192 +24,52 @@ func (g *Generator) generateServiceClient(gfile *protogen.GeneratedFile, file *p
 	gfile.P("name string")
 	gfile.P("}")
 
-	if g.standalone {
-		gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", file.GoImportPath.Ident(serviceName), "Client {")
-	} else {
-		gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", serviceName, "Client {")
-	}
+	gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", serviceName, "Client {")
 	gfile.P("return &", unexport(serviceName), "Client{c: c, name: name}")
 	gfile.P("}")
 	gfile.P()
 }
 
-func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, component string) {
-	serviceName := getServiceName(service)
+func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, http bool) {
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
-		if component == "drpc" {
-			methodName = fmt.Sprintf("%s.%s", method.Parent.Desc.FullName(), method.Desc.Name())
-		}
-		g.generateClientFuncSignature(gfile, serviceName, method)
+		generateClientFuncSignature(gfile, serviceName, method)
 
-		if component == "http" && method.Desc.Options() != nil {
-			if proto.HasExtension(method.Desc.Options(), v2.E_Openapiv2Operation) {
-				opts := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
+		if http && method.Desc.Options() != nil {
+			if proto.HasExtension(method.Desc.Options(), openapiv2_options.E_Openapiv2Operation) {
+				opts := proto.GetExtension(method.Desc.Options(), openapiv2_options.E_Openapiv2Operation)
 				if opts != nil {
-					r := opts.(*v2.Operation)
-					if r.Responses == nil {
-						goto labelMethod
-					}
-					gfile.P("errmap := make(map[string]interface{}, ", len(r.Responses.ResponseCode), ")")
-					for _, rsp := range r.Responses.ResponseCode {
-						if schema := rsp.Value.GetJsonReference(); schema != nil {
-							xref := schema.XRef
-							if strings.HasPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".") {
-								xref = strings.TrimPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".")
-							}
-							if xref[0] == '.' {
-								xref = xref[1:]
-							}
-							switch xref {
-							case "micro.codec.Frame":
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, microCodecPackage.Ident("Frame"), "{}")
-							case "micro.errors.Error":
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, microErrorsPackage.Ident("Error"), "{}")
-							default:
-								ident, err := g.getGoIdentByXref(strings.TrimPrefix(schema.XRef, "."))
-								if err != nil {
-									log.Printf("cant find message by ref %s\n", schema.XRef)
-									continue
-								}
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, gfile.QualifiedGoIdent(ident), "{}")
+					r := opts.(*openapiv2_options.Operation)
+					gfile.P("errmap := make(map[string]interface{}, ", len(r.Responses), ")")
+					for code, response := range r.Responses {
+						if response.Schema != nil && response.Schema.JsonSchema != nil {
+							ref := response.Schema.JsonSchema.Ref
+							if strings.HasPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".") {
+								ref = strings.TrimPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".")
 							}
+							gfile.P(`errmap["`, code, `"] = &`, ref, "{}")
 						}
 					}
 				}
+
 				gfile.P("opts = append(opts,")
 				gfile.P(microClientHttpPackage.Ident("ErrorMap"), "(errmap),")
 				gfile.P(")")
 			}
-			if proto.HasExtension(method.Desc.Options(), v3.E_Openapiv3Operation) {
-				opts := proto.GetExtension(method.Desc.Options(), v3.E_Openapiv3Operation)
-				if opts != nil {
-					r := opts.(*v3.Operation)
-					if r.Responses == nil {
-						goto labelMethod
-					}
-					resps := r.Responses.ResponseOrReference
-					if r.Responses.GetDefault() != nil {
-						resps = append(resps, &v3.NamedResponseOrReference{Name: "default", Value: r.Responses.GetDefault()})
-					}
-					gfile.P("errmap := make(map[string]interface{}, ", len(resps), ")")
-					for _, rsp := range resps {
-						if schema := rsp.Value.GetReference(); schema != nil {
-							xref := schema.XRef
-							if strings.HasPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".") {
-								xref = strings.TrimPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".")
-							}
-							if xref[0] == '.' {
-								xref = xref[1:]
-							}
-							switch xref {
-							case "micro.codec.Frame":
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, microCodecPackage.Ident("Frame"), "{}")
-							case "micro.errors.Error":
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, microErrorsPackage.Ident("Error"), "{}")
-							default:
-								ident, err := g.getGoIdentByXref(strings.TrimPrefix(schema.XRef, "."))
-								if err != nil {
-									log.Printf("cant find message by ref %s\n", schema.XRef)
-									continue
-								}
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, gfile.QualifiedGoIdent(ident), "{}")
-							}
-						}
-					}
-				}
-				gfile.P("opts = append(opts,")
-				gfile.P(microClientHttpPackage.Ident("ErrorMap"), "(errmap),")
-				gfile.P(")")
-			}
-
-		labelMethod:
 			if proto.HasExtension(method.Desc.Options(), api_options.E_Http) {
 				gfile.P("opts = append(opts,")
 				endpoints, _ := generateEndpoints(method)
 				path, method, body := getEndpoint(endpoints[0])
-				if vmethod, ok := httpMethodMap[method]; ok {
-					gfile.P(microClientHttpPackage.Ident("Method"), `(`, httpPackage.Ident(vmethod), `),`)
-				} else {
-					gfile.P(microClientHttpPackage.Ident("Method"), `("`, method, `"),`)
-				}
+				gfile.P(microClientHttpPackage.Ident("Method"), `("`, method, `"),`)
 				gfile.P(microClientHttpPackage.Ident("Path"), `("`, path, `"),`)
-				if body != "" {
-					gfile.P(microClientHttpPackage.Ident("Body"), `("`, body, `"),`)
-				}
-				gfile.P(")")
-			}
-
-			parameters := make(map[string]map[string]string)
-			// Build a list of header parameters.
-			e2opt := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
-			if e2opt != nil && e2opt != v2.E_Openapiv2Operation.InterfaceOf(v2.E_Openapiv2Operation.Zero()) {
-				opt := e2opt.(*v2.Operation)
-				for _, paramOrRef := range opt.Parameters {
-					parameter := paramOrRef.GetParameter()
-					// NonBodyParameter()
-					if parameter == nil {
-						continue
-					}
-					nonBodyParameter := parameter.GetNonBodyParameter()
-					if nonBodyParameter == nil {
-						continue
-					}
-					headerParameter := nonBodyParameter.GetHeaderParameterSubSchema()
-					if headerParameter.In != "header" && headerParameter.In != "cookie" {
-						continue
-					}
-					in, ok := parameters[headerParameter.In]
-					if !ok {
-						in = make(map[string]string)
-						parameters[headerParameter.In] = in
-					}
-					in[headerParameter.Name] = fmt.Sprintf("%v", headerParameter.Required)
-				}
-			}
-			e3opt := proto.GetExtension(method.Desc.Options(), v3.E_Openapiv3Operation)
-			if e3opt != nil && e3opt != v3.E_Openapiv3Operation.InterfaceOf(v3.E_Openapiv3Operation.Zero()) {
-				opt := e3opt.(*v3.Operation)
-				for _, paramOrRef := range opt.Parameters {
-
-					parameter := paramOrRef.GetParameter()
-					if parameter == nil {
-						continue
-					}
-					if parameter.In != "header" && parameter.In != "cookie" {
-						continue
-					}
-					in, ok := parameters[parameter.In]
-					if !ok {
-						in = make(map[string]string)
-						parameters[parameter.In] = in
-					}
-					in[parameter.Name] = fmt.Sprintf("%v", parameter.Required)
-				}
-			}
-
-			if len(parameters) > 0 {
-				gfile.P("opts = append(opts,")
-				for pk, pv := range parameters {
-					params := make([]string, 0, len(pv)/2)
-					for k, v := range pv {
-						params = append(params, k, v)
-					}
-					gfile.P(microClientHttpPackage.Ident(strings.Title(pk)), `("`, strings.Join(params, `" ,"`), `"),`)
-				}
+				gfile.P(microClientHttpPackage.Ident("Body"), `("`, body, `"),`)
 				gfile.P(")")
 			}
 		}
-
 		if rule, ok := getMicroApiMethod(method); ok {
-			if rule.Timeout != "" {
-				td, err := time.ParseDuration(rule.Timeout)
-				if err != nil {
-					log.Printf("parse duration error %s\n", err.Error())
-				} else {
-					gfile.P("td := ", timePackage.Ident("Duration"), "(", td.Nanoseconds(), ")")
-					gfile.P("opts = append(opts, ", microClientPackage.Ident("WithRequestTimeout"), "(td))")
-				}
+			if rule.Timeout > 0 {
+				gfile.P("opts = append(opts, ", microClientPackage.Ident("WithRequestTimeout"), "(", timePackage.Ident("Second"), "*", rule.Timeout, "))")
 			}
 		}
 
@@ -263,7 +106,7 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile,
 		}
 
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") CloseAndRecv() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error) {")
+			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") RecvAndClose() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error) {")
 			gfile.P("msg := &", gfile.QualifiedGoIdent(method.Output.GoIdent), "{}")
 			gfile.P("err := s.RecvMsg(msg)")
 			gfile.P("if err == nil {")
@@ -281,10 +124,6 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile,
 		gfile.P("return s.stream.Close()")
 		gfile.P("}")
 		gfile.P()
-		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") CloseSend() error {")
-		gfile.P("return s.stream.CloseSend()")
-		gfile.P("}")
-		gfile.P()
 		gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Context() ", contextPackage.Ident("Context"), " {")
 		gfile.P("return s.stream.Context()")
 		gfile.P("}")
@@ -299,11 +138,6 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile,
 		gfile.P()
 
 		if method.Desc.IsStreamingClient() {
-			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Header() ", microMetadataPackage.Ident("Metadata"), "{")
-			gfile.P("return s.stream.Response().Header()")
-			gfile.P("}")
-			gfile.P()
-
 			gfile.P("func (s *", unexport(serviceName), "Client", method.GoName, ") Send(msg *", gfile.QualifiedGoIdent(method.Input.GoIdent), ") error {")
 			gfile.P("return s.stream.Send(msg)")
 			gfile.P("}")
@@ -323,33 +157,23 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile,
 	}
 }
 
-func (g *Generator) generateServiceServer(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceServer(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	gfile.P("type ", unexport(serviceName), "Server struct {")
-	if g.standalone {
-		gfile.P(file.GoImportPath.Ident(serviceName), "Server")
-	} else {
-		gfile.P(serviceName, "Server")
-	}
+	gfile.P(serviceName, "Server")
 	gfile.P("}")
 	gfile.P()
 }
 
-func (g *Generator) generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		generateServerFuncSignature(gfile, serviceName, method, true)
 		if rule, ok := getMicroApiMethod(method); ok {
-			if rule.Timeout != "" {
-				td, err := time.ParseDuration(rule.Timeout)
-				if err != nil {
-					log.Printf("parse duration error %s\n", err.Error())
-				} else {
-					gfile.P("var cancel ", contextPackage.Ident("CancelFunc"))
-					gfile.P("td := ", timePackage.Ident("Duration"), "(", td.Nanoseconds(), ")")
-					gfile.P("ctx, cancel = ", contextPackage.Ident("WithTimeout"), "(ctx, ", "td", ")")
-					gfile.P("defer cancel()")
-				}
+			if rule.Timeout > 0 {
+				gfile.P("var cancel ", contextPackage.Ident("CancelFunc"))
+				gfile.P("ctx, cancel = ", contextPackage.Ident("WithTimeout"), "(ctx, ", timePackage.Ident("Second"), "*", rule.Timeout, ")")
+				gfile.P("defer cancel()")
 			}
 		}
 		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
@@ -363,64 +187,6 @@ func (g *Generator) generateServiceServerMethods(gfile *protogen.GeneratedFile,
 				gfile.P("return h.", serviceName, "Server.", method.GoName, "(ctx, &", unexport(serviceName), method.GoName, "Stream{stream})")
 			}
 		} else {
-			parameters := make(map[string]map[string]string)
-			// Build a list of header parameters.
-			e2opt := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
-			if e2opt != nil && e2opt != v2.E_Openapiv2Operation.InterfaceOf(v2.E_Openapiv2Operation.Zero()) {
-				opt := e2opt.(*v2.Operation)
-				for _, paramOrRef := range opt.Parameters {
-					parameter := paramOrRef.GetParameter()
-					// NonBodyParameter()
-					if parameter == nil {
-						continue
-					}
-					nonBodyParameter := parameter.GetNonBodyParameter()
-					if nonBodyParameter == nil {
-						continue
-					}
-					headerParameter := nonBodyParameter.GetHeaderParameterSubSchema()
-					if headerParameter.In != "header" && headerParameter.In != "cookie" {
-						continue
-					}
-					in, ok := parameters[headerParameter.In]
-					if !ok {
-						in = make(map[string]string)
-						parameters[headerParameter.In] = in
-					}
-					in[headerParameter.Name] = fmt.Sprintf("%v", headerParameter.Required)
-				}
-			}
-			e3opt := proto.GetExtension(method.Desc.Options(), v3.E_Openapiv3Operation)
-			if e3opt != nil && e3opt != v3.E_Openapiv3Operation.InterfaceOf(v3.E_Openapiv3Operation.Zero()) {
-				opt := e3opt.(*v3.Operation)
-				for _, paramOrRef := range opt.Parameters {
-					parameter := paramOrRef.GetParameter()
-					if parameter == nil {
-						continue
-					}
-					if parameter.In != "header" && parameter.In != "cookie" {
-						continue
-					}
-					in, ok := parameters[parameter.In]
-					if !ok {
-						in = make(map[string]string)
-						parameters[parameter.In] = in
-					}
-					in[parameter.Name] = fmt.Sprintf("%v", parameter.Required)
-				}
-			}
-
-			if len(parameters) > 0 {
-				gfile.P(microServerHttpPackage.Ident("FillRequest"), `(ctx, req, `)
-				for pk, pv := range parameters {
-					params := make([]string, 0, len(pv)/2)
-					for k, v := range pv {
-						params = append(params, k, v)
-					}
-					gfile.P(microServerHttpPackage.Ident(strings.Title(pk)), `("`, strings.Join(params, `" ,"`), `"),`)
-				}
-				gfile.P(")")
-			}
 			gfile.P("return h.", serviceName, "Server.", method.GoName, "(ctx, req, rsp)")
 		}
 		gfile.P("}")
@@ -485,13 +251,9 @@ func (g *Generator) generateServiceServerMethods(gfile *protogen.GeneratedFile,
 	}
 }
 
-func (g *Generator) generateServiceRegister(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service, component string) {
-	serviceName := getServiceName(service)
-	if g.standalone {
-		gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", file.GoImportPath.Ident(serviceName), "Server, opts ...", microOptionsPackage.Ident("Option"), ") error {")
-	} else {
-		gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microOptionsPackage.Ident("Option"), ") error {")
-	}
+func generateServiceRegister(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
+	gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {")
 	gfile.P("type ", unexport(serviceName), " interface {")
 	for _, method := range service.Methods {
 		generateServerSignature(gfile, serviceName, method, true)
@@ -501,15 +263,10 @@ func (g *Generator) generateServiceRegister(gfile *protogen.GeneratedFile, file
 	gfile.P(unexport(serviceName))
 	gfile.P("}")
 	gfile.P("h := &", unexport(serviceName), "Server{sh}")
-	gfile.P("var nopts []", microOptionsPackage.Ident("Option"))
-	if component == "http" {
-		//	if g.standalone {
-		//		gfile.P("nopts = append(nopts, ", microServerHttpPackage.Ident("HandlerEndpoints"), "(", file.GoImportPath.Ident(serviceName), "ServerEndpoints))")
-		//	} else {
-		gfile.P("nopts = append(nopts, ", microServerHttpPackage.Ident("HandlerEndpoints"), "(", serviceName, "ServerEndpoints))")
-		//	}
-	}
-	gfile.P("return s.Handle(&", serviceName, "{h}, append(nopts, opts...)...)")
+	gfile.P("for _, endpoint := range New", serviceName, "Endpoints() {")
+	gfile.P("opts = append(opts, ", microApiPackage.Ident("WithEndpoint"), "(endpoint))")
+	gfile.P("}")
+	gfile.P("return s.Handle(s.NewHandler(&", serviceName, "{h}, opts...))")
 	gfile.P("}")
 }
 
@@ -557,7 +314,7 @@ func generateServerSignature(gfile *protogen.GeneratedFile, serviceName string,
 	gfile.P(args...)
 }
 
-func (g *Generator) generateClientFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
+func generateClientFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
 	args := append([]interface{}{},
 		"func (c *",
 		unexport(serviceName),
@@ -568,11 +325,11 @@ func (g *Generator) generateClientFuncSignature(gfile *protogen.GeneratedFile, s
 	if !method.Desc.IsStreamingClient() {
 		args = append(args, "req *", gfile.QualifiedGoIdent(method.Input.GoIdent), ", ")
 	}
-	args = append(args, "opts ...", microOptionsPackage.Ident("Option"), ") (")
+	args = append(args, "opts ...", microClientPackage.Ident("CallOption"), ") (")
 	if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 		args = append(args, "*", gfile.QualifiedGoIdent(method.Output.GoIdent))
 	} else {
-		args = append(args, gfile.QualifiedGoIdent(protogen.GoIdent{GoName: serviceName + "_" + method.GoName + "Client", GoImportPath: method.Output.GoIdent.GoImportPath}))
+		args = append(args, serviceName, "_", method.GoName, "Client")
 	}
 	args = append(args, ", error) {")
 	gfile.P(args...)
@@ -586,7 +343,7 @@ func generateClientSignature(gfile *protogen.GeneratedFile, serviceName string,
 	if !method.Desc.IsStreamingClient() {
 		args = append(args, "req *", gfile.QualifiedGoIdent(method.Input.GoIdent), ", ")
 	}
-	args = append(args, "opts ...", microOptionsPackage.Ident("Option"), ") (")
+	args = append(args, "opts ...", microClientPackage.Ident("CallOption"), ") (")
 	if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 		args = append(args, "*", gfile.QualifiedGoIdent(method.Output.GoIdent))
 	} else {
@@ -596,8 +353,8 @@ func generateClientSignature(gfile *protogen.GeneratedFile, serviceName string,
 	gfile.P(args...)
 }
 
-func (g *Generator) generateServiceClientInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceClientInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	gfile.P("type ", serviceName, "Client interface {")
 	for _, method := range service.Methods {
 		generateClientSignature(gfile, serviceName, method)
@@ -606,8 +363,8 @@ func (g *Generator) generateServiceClientInterface(gfile *protogen.GeneratedFile
 	gfile.P()
 }
 
-func (g *Generator) generateServiceServerInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceServerInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	gfile.P("type ", serviceName, "Server interface {")
 	for _, method := range service.Methods {
 		generateServerSignature(gfile, serviceName, method, false)
@@ -616,8 +373,8 @@ func (g *Generator) generateServiceServerInterface(gfile *protogen.GeneratedFile
 	gfile.P()
 }
 
-func (g *Generator) generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 			continue
@@ -628,12 +385,10 @@ func (g *Generator) generateServiceClientStreamInterface(gfile *protogen.Generat
 		gfile.P("SendMsg(msg interface{}) error")
 		gfile.P("RecvMsg(msg interface{}) error")
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			gfile.P("CloseAndRecv() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error)")
-			gfile.P("CloseSend() error")
+			gfile.P("RecvAndClose() (*", gfile.QualifiedGoIdent(method.Output.GoIdent), ", error)")
 		}
 		gfile.P("Close() error")
 		if method.Desc.IsStreamingClient() {
-			gfile.P("Header() ", microMetadataPackage.Ident("Metadata"))
 			gfile.P("Send(msg *", gfile.QualifiedGoIdent(method.Input.GoIdent), ") error")
 		}
 		if method.Desc.IsStreamingServer() {
@@ -644,8 +399,8 @@ func (g *Generator) generateServiceClientStreamInterface(gfile *protogen.Generat
 	}
 }
 
-func (g *Generator) generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
+func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 			continue
@@ -657,7 +412,6 @@ func (g *Generator) generateServiceServerStreamInterface(gfile *protogen.Generat
 		gfile.P("RecvMsg(msg interface{}) error")
 		if method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
 			gfile.P("SendAndClose(msg *", gfile.QualifiedGoIdent(method.Output.GoIdent), ") error")
-			//	gfile.P("CloseSend() error")
 		}
 		gfile.P("Close() error")
 		if method.Desc.IsStreamingClient() {
@@ -671,6 +425,28 @@ func (g *Generator) generateServiceServerStreamInterface(gfile *protogen.Generat
 	}
 }
 
+func generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.Service) {
+	serviceName := service.GoName
+	gfile.P("func New", serviceName, "Endpoints() []*", microApiPackage.Ident("Endpoint"), " {")
+	gfile.P("return []*", microApiPackage.Ident("Endpoint"), "{")
+	for _, method := range service.Methods {
+		if method.Desc.Options() == nil {
+			continue
+		}
+		if proto.HasExtension(method.Desc.Options(), api_options.E_Http) {
+			endpoints, streaming := generateEndpoints(method)
+			for _, endpoint := range endpoints {
+				gfile.P("&", microApiPackage.Ident("Endpoint"), "{")
+				generateEndpoint(gfile, serviceName, method.GoName, endpoint, streaming)
+				gfile.P("},")
+			}
+		}
+	}
+	gfile.P("}")
+	gfile.P("}")
+	gfile.P()
+}
+
 func generateEndpoints(method *protogen.Method) ([]*api_options.HttpRule, bool) {
 	if method.Desc.Options() == nil {
 		return nil, false
@@ -763,272 +539,14 @@ func generateEndpoint(gfile *protogen.GeneratedFile, serviceName string, methodN
 	path, meth, body := getEndpoint(rule)
 	gfile.P("Name:", fmt.Sprintf(`"%s.%s",`, serviceName, methodName))
 	gfile.P("Path:", fmt.Sprintf(`[]string{"%s"},`, path))
-	//if vmethod, ok := httpMethodMap[meth]; ok {
-	//	gfile.P("Method:", `[]string{`, httpPackage.Ident(vmethod), `},`)
-	//} else {
 	gfile.P("Method:", fmt.Sprintf(`[]string{"%s"},`, meth))
-	//	}
-	if len(rule.GetGet()) == 0 && body != "" {
+	if len(rule.GetGet()) == 0 {
 		gfile.P("Body:", fmt.Sprintf(`"%s",`, body))
 	}
 	if streaming {
 		gfile.P("Stream: true,")
 	}
 	gfile.P(`Handler: "rpc",`)
-}
-
-func (g *Generator) getGoIdentByXref(xref string) (protogen.GoIdent, error) {
-	idx := strings.LastIndex(xref, ".")
-	pkg := xref[:idx]
-	msg := xref[idx+1:]
-	for _, file := range g.plugin.Files {
-		if strings.Compare(pkg, *(file.Proto.Package)) != 0 {
-			continue
-		}
-		if ident, err := getGoIdentByMessage(file.Messages, msg); err == nil {
-			return ident, nil
-		}
-	}
-	return protogen.GoIdent{}, fmt.Errorf("not found")
-}
-
-func (g *Generator) getMessageByXref(xref string) (*protogen.Message, error) {
-	idx := strings.LastIndex(xref, ".")
-	pkg := xref[:idx]
-	msg := xref[idx+1:]
-	for _, file := range g.plugin.Files {
-		if strings.Compare(pkg, *(file.Proto.Package)) != 0 {
-			continue
-		}
-		if pmsg, err := getProtoMessage(file.Messages, msg); err == nil {
-			return pmsg, nil
-		}
-	}
-	return nil, fmt.Errorf("not found")
-}
-
-func getProtoMessage(messages []*protogen.Message, msg string) (*protogen.Message, error) {
-	for _, message := range messages {
-		if strings.Compare(msg, message.GoIdent.GoName) == 0 {
-			return message, nil
-		}
-		if len(message.Messages) > 0 {
-			if pmsg, err := getProtoMessage(message.Messages, msg); err == nil {
-				return pmsg, nil
-			}
-		}
-	}
-	return nil, fmt.Errorf("not found")
-}
-
-func getGoIdentByMessage(messages []*protogen.Message, msg string) (protogen.GoIdent, error) {
-	for _, message := range messages {
-		if strings.Compare(msg, message.GoIdent.GoName) == 0 {
-			return message.GoIdent, nil
-		}
-		if len(message.Messages) > 0 {
-			if ident, err := getGoIdentByMessage(message.Messages, msg); err == nil {
-				return ident, nil
-			}
-		}
-	}
-	return protogen.GoIdent{}, fmt.Errorf("not found")
-}
-
-func (g *Generator) generateServiceDesc(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service) {
-	serviceName := getServiceName(service)
-
-	gfile.P("// ", serviceName, "_ServiceDesc", " is the ", grpcPackage.Ident("ServiceDesc"), " for ", serviceName, " service.")
-	gfile.P("// It's only intended for direct use with ", grpcPackage.Ident("RegisterService"), ",")
-	gfile.P("// and not to be introspected or modified (even as a copy)")
-	gfile.P("var ", serviceName, "_ServiceDesc", " = ", grpcPackage.Ident("ServiceDesc"), " {")
-	gfile.P("ServiceName: ", strconv.Quote(string(service.Desc.FullName())), ",")
-	gfile.P("HandlerType: (*", serviceName, "Server)(nil),")
-	gfile.P("Methods: []", grpcPackage.Ident("MethodDesc"), "{")
-	for _, method := range service.Methods {
-		if method.Desc.IsStreamingClient() || method.Desc.IsStreamingServer() {
-			continue
-		}
-		gfile.P("{")
-		gfile.P("MethodName: ", strconv.Quote(string(method.Desc.Name())), ",")
-		gfile.P("Handler: ", method.GoName, ",")
-		gfile.P("},")
-	}
-	gfile.P("},")
-	gfile.P("Streams: []", grpcPackage.Ident("StreamDesc"), "{")
-	for _, method := range service.Methods {
-		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
-			continue
-		}
-		gfile.P("{")
-		gfile.P("StreamName: ", strconv.Quote(string(method.Desc.Name())), ",")
-		gfile.P("Handler: ", method.GoName, ",")
-		if method.Desc.IsStreamingServer() {
-			gfile.P("ServerStreams: true,")
-		}
-		if method.Desc.IsStreamingClient() {
-			gfile.P("ClientStreams: true,")
-		}
-		gfile.P("},")
-	}
-	gfile.P("},")
-	gfile.P("Metadata: \"", file.Desc.Path(), "\",")
-	gfile.P("}")
-	gfile.P()
-}
-
-func (g *Generator) generateServiceName(gfile *protogen.GeneratedFile, service *protogen.Service) {
-	serviceName := getServiceName(service)
-	gfile.P("var (")
-	gfile.P(serviceName, "Name", "=", `"`, serviceName, `"`)
-	gfile.P(")")
-}
-
-func (g *Generator) generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.Service, component string) {
-	if component != "http" {
-		return
-	}
-	serviceName := getServiceName(service)
-
-	gfile.P("var (")
-	gfile.P(serviceName, "ServerEndpoints = []", microServerHttpPackage.Ident("EndpointMetadata"), "{")
-
-	for _, method := range service.Methods {
-		if proto.HasExtension(method.Desc.Options(), api_options.E_Http) {
-			if endpoints, streaming := generateEndpoints(method); endpoints != nil {
-				for _, ep := range endpoints {
-					epath, emethod, ebody := getEndpoint(ep)
-					gfile.P("{")
-					gfile.P(`Name: "`, serviceName+"."+method.GoName, `",`)
-					gfile.P(`Path: "`, epath, `",`)
-					gfile.P(`Method: "`, emethod, `",`)
-					gfile.P(`Body: "`, ebody, `",`)
-					gfile.P(`Stream: `, streaming, `,`)
-					gfile.P("},")
-				}
-			}
-		}
-	}
-
-	gfile.P("}")
-	gfile.P(")")
-}
-
-func getServiceName(s *protogen.Service) string {
-	if strings.HasSuffix(s.GoName, "Service") {
-		return s.GoName
-	}
-	return s.GoName + "Service"
-}
-
-func (g *Generator) writeErrors(plugin *protogen.Plugin) error {
-	errorsMap := make(map[string]struct{})
-
-	for _, file := range plugin.Files {
-		for _, service := range file.Services {
-			for _, method := range service.Methods {
-				if method.Desc.Options() != nil {
-					if proto.HasExtension(method.Desc.Options(), v2.E_Openapiv2Operation) {
-						opts := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
-						if opts != nil {
-							r := opts.(*v2.Operation)
-							if r.Responses == nil {
-								continue
-							}
-
-							for _, rsp := range r.Responses.ResponseCode {
-								if schema := rsp.Value.GetJsonReference(); schema != nil {
-									xref := schema.XRef
-									if xref[0] == '.' {
-										xref = xref[1:]
-									}
-									errorsMap[xref] = struct{}{}
-								}
-							}
-						}
-					}
-					if proto.HasExtension(method.Desc.Options(), v3.E_Openapiv3Operation) {
-						opts := proto.GetExtension(method.Desc.Options(), v3.E_Openapiv3Operation)
-						if opts != nil {
-							r := opts.(*v3.Operation)
-							if r.Responses == nil {
-								continue
-							}
-							resps := r.Responses.ResponseOrReference
-							if r.Responses.GetDefault() != nil {
-								resps = append(resps, &v3.NamedResponseOrReference{Name: "default", Value: r.Responses.GetDefault()})
-							}
-							for _, rsp := range resps {
-								if schema := rsp.Value.GetReference(); schema != nil {
-									xref := schema.XRef
-									if xref[0] == '.' {
-										xref = xref[1:]
-									}
-									errorsMap[xref] = struct{}{}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	var gfile *protogen.GeneratedFile
-	var importPath protogen.GoImportPath
-
-	if len(errorsMap) > 0 {
-
-		var packageName string
-
-		for _, file := range plugin.Files {
-			if !file.Generate {
-				continue
-			}
-			if len(file.Services) == 0 {
-				continue
-			}
-			packageName = string(file.GoPackageName)
-			importPath = file.GoImportPath
-			break
-		}
-
-		if g.standalone {
-			importPath = "."
-		}
-
-		gfile = plugin.NewGeneratedFile("micro_errors.pb.go", importPath)
-
-		gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
-		gfile.P("// protoc-gen-go-micro version: " + versionComment)
-		gfile.P()
-		gfile.P("package ", packageName)
-		gfile.P()
-
-		gfile.Import(protojsonPackage)
-
-		gfile.P("var (")
-		gfile.P("marshaler = ", protojsonPackage.Ident("MarshalOptions"), "{}")
-		gfile.P(")")
-	}
-
-	for xref := range errorsMap {
-		msg, err := g.getMessageByXref(xref)
-		if err != nil {
-			return err
-		}
-
-		for _, field := range msg.Fields {
-			if field.GoName == "Error" {
-				return fmt.Errorf("failed generate Error() string interface for %s message %s already have Error field", field.Location.SourceFile, msg.Desc.Name())
-			}
-		}
-		gfile.P(`func (m *`, msg.GoIdent.GoName, `) Error() string {`)
-		gfile.P(`buf, _ := marshaler.Marshal(m)`)
-		gfile.P("return string(buf)")
-		gfile.P(`}`)
-		// log.Printf("xref %#+v %v\n", msg.GoIdent.GoName, err)
-	}
-
-	return nil
+
+	return
 }

variables.go

@@ -11,17 +11,10 @@ var (
 	gorillaMuxPackage      = protogen.GoImportPath("github.com/gorilla/mux")
 	chiPackage             = protogen.GoImportPath("github.com/go-chi/chi/v5")
 	chiMiddlewarePackage   = protogen.GoImportPath("github.com/go-chi/chi/v5/middleware")
-	microMetadataPackage   = protogen.GoImportPath("go.unistack.org/micro/v4/metadata")
-	microClientPackage     = protogen.GoImportPath("go.unistack.org/micro/v4/client")
-	microServerPackage     = protogen.GoImportPath("go.unistack.org/micro/v4/server")
-	microClientHttpPackage = protogen.GoImportPath("go.unistack.org/micro-client-http/v4")
-	microServerHttpPackage = protogen.GoImportPath("go.unistack.org/micro-server-http/v4")
-	microCodecPackage      = protogen.GoImportPath("go.unistack.org/micro-proto/v4/codec")
-	microErrorsPackage     = protogen.GoImportPath("go.unistack.org/micro/v4/errors")
-	microOptionsPackage    = protogen.GoImportPath("go.unistack.org/micro/v4/options")
-	grpcPackage            = protogen.GoImportPath("google.golang.org/grpc")
-	protojsonPackage       = protogen.GoImportPath("google.golang.org/protobuf/encoding/protojson")
+	microApiPackage        = protogen.GoImportPath("github.com/unistack-org/micro/v3/api")
+	microClientPackage     = protogen.GoImportPath("github.com/unistack-org/micro/v3/client")
+	microServerPackage     = protogen.GoImportPath("github.com/unistack-org/micro/v3/server")
+	microClientHttpPackage = protogen.GoImportPath("github.com/unistack-org/micro-client-http/v3")
 	timePackage            = protogen.GoImportPath("time")
 	deprecationComment     = "// Deprecated: Do not use."
-	versionComment         = "v4.0.2"
 )