.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,24 +0,0 @@
----
-name: Bug report
-about: For reporting bugs in go-micro
-title: "[BUG]"
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-
-1. What are you trying to do?
-2. What did you expect to happen?
-3. What happens instead?
-
-**How to reproduce the bug:**
-
-If possible, please include a minimal code snippet here.
-
-**Environment:**
-Go Version: please paste `go version` output here
-```
-please paste `go env` output here
-```

.github/ISSUE_TEMPLATE/feature-request---enhancement.md

@@ -1,17 +0,0 @@
----
-name: Feature request / Enhancement
-about: If you have a need not served by go-micro
-title: "[FEATURE]"
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -1,14 +0,0 @@
----
-name: Question
-about: Ask a question about go-micro
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Before asking, please check if your question has already been answered: 
-
-1. Check the documentation - https://micro.mu/docs/
-2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
-3. Search existing issues

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +0,0 @@
-## Pull Request template
-Please, go through these steps before clicking submit on this PR.
-
-1. Give a descriptive title to your PR.
-2. Provide a description of your changes.
-3. Make sure you have some relevant tests.
-4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
-
-**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

.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/workflows/build.yml

@@ -1,46 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        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.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -1,75 +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 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  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 repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      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@v1
-
-    # ℹ️ 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: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-automerge.yml

@@ -1,66 +0,0 @@
-name: "prautomerge"
-
-on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  Dependabot-Automerge:
-    runs-on: ubuntu-latest
-    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
-    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
-    # dont work with multiple workflows when last returns success
-    if: >-
-      github.event.workflow_run.conclusion == 'success'
-      && github.actor == 'dependabot[bot]'
-      && github.event.sender.login == 'dependabot[bot]'
-      && github.event.sender.type == 'Bot'
-      && (github.event.workflow_run.event == 'pull_request'
-          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
-    steps:
-      - name: Approve Changes and Merge changes if label 'dependencies' is set
-        uses: actions/github-script@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            console.log(context.payload.workflow_run);
-            
-            var labelNames = await github.paginate(
-              github.issues.listLabelsOnIssue,
-              {
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                issue_number: context.payload.workflow_run.pull_requests[0].number,
-              },
-              (response) => response.data.map(
-                (label) => label.name
-              )
-            );
-
-            console.log(labelNames);
-
-            if (labelNames.includes('dependencies')) {
-              console.log('Found label');
-
-              await github.pulls.createReview({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-                event: 'APPROVE'
-              });
-              console.log('Approved PR');
-
-              await github.pulls.merge({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-              });
-
-              console.log('Merged PR');
-            }

.github/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        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.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

api/annotations.pb.go

@@ -38,9 +38,9 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.MethodOptions)(nil),
 		ExtensionType: (*HttpRule)(nil),
-		Field:         65535654,
+		Field:         72295728,
 		Name:          "micro.api.http",
-		Tag:           "bytes,65535654,opt,name=http",
+		Tag:           "bytes,72295728,opt,name=http",
 		Filename:      "api/annotations.proto",
 	},
 	{
@@ -65,7 +65,7 @@ var file_api_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
 var (
 	// See `HttpRule`.
 	//
-	// optional micro.api.HttpRule http = 65535654;
+	// optional micro.api.HttpRule http = 72295728;
 	E_Http = &file_api_annotations_proto_extTypes[0]
 	// See `MicroMethod`.
 	//
@@ -92,8 +92,8 @@ var file_api_annotations_proto_rawDesc = []byte{
 	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x4a, 0x0a, 0x04, 0x68, 0x74, 0x74, 0x70, 0x12, 0x1e, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xa6, 0xfd,
+	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xb0, 0xca,
-	0x9f, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61,
+	0xbc, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x74, 0x74,
 	0x70, 0x3a, 0x5c, 0x0a, 0x0c, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f,
 	0x64, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,

api/annotations.proto

@@ -28,7 +28,7 @@ option objc_class_prefix = "MAPI";
 
 extend google.protobuf.MethodOptions {
   // See `HttpRule`.
-  HttpRule http = 65535654;
+  HttpRule http = 72295728;
 }
 
 extend google.protobuf.MethodOptions {

api/field_behavior.pb.go

@@ -127,9 +127,9 @@ var file_api_field_behavior_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.FieldOptions)(nil),
 		ExtensionType: ([]FieldBehavior)(nil),
-		Field:         651052,
+		Field:         1052,
 		Name:          "micro.api.field_behavior",
-		Tag:           "varint,651052,rep,name=field_behavior,enum=micro.api.FieldBehavior",
+		Tag:           "varint,1052,rep,name=field_behavior,enum=micro.api.FieldBehavior",
 		Filename:      "api/field_behavior.proto",
 	},
 }
@@ -149,7 +149,7 @@ var (
 	//     [(google.api.field_behavior) = OUTPUT_ONLY,
 	//      (google.api.field_behavior) = IMMUTABLE];
 	//
-	// repeated micro.api.FieldBehavior field_behavior = 651052;
+	// repeated micro.api.FieldBehavior field_behavior = 1052;
 	E_FieldBehavior = &file_api_field_behavior_proto_extTypes[0]
 )
 
@@ -169,19 +169,19 @@ var file_api_field_behavior_proto_rawDesc = []byte{
 	0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x50, 0x55, 0x54, 0x5f,
 	0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x49, 0x4d, 0x4d, 0x55, 0x54, 0x41,
 	0x42, 0x4c, 0x45, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x55, 0x4e, 0x4f, 0x52, 0x44, 0x45, 0x52,
-	0x45, 0x44, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x10, 0x06, 0x3a, 0x60, 0x0a, 0x0e, 0x66, 0x69, 0x65,
+	0x45, 0x44, 0x5f, 0x4c, 0x49, 0x53, 0x54, 0x10, 0x06, 0x3a, 0x5f, 0x0a, 0x0e, 0x66, 0x69, 0x65,
 	0x6c, 0x64, 0x5f, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x1d, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69,
-	0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xac, 0xde, 0x27, 0x20, 0x03,
+	0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x9c, 0x08, 0x20, 0x03, 0x28,
-	0x28, 0x0e, 0x32, 0x18, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x46,
+	0x0e, 0x32, 0x18, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x46, 0x69,
-	0x69, 0x65, 0x6c, 0x64, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0d, 0x66, 0x69,
+	0x65, 0x6c, 0x64, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0d, 0x66, 0x69, 0x65,
-	0x65, 0x6c, 0x64, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x55, 0x0a, 0x09, 0x6d,
+	0x6c, 0x64, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x42, 0x55, 0x0a, 0x09, 0x6d, 0x69,
-	0x69, 0x63, 0x72, 0x6f, 0x2e, 0x61, 0x70, 0x69, 0x42, 0x12, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42,
+	0x63, 0x72, 0x6f, 0x2e, 0x61, 0x70, 0x69, 0x42, 0x12, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x65,
-	0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b,
+	0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2b, 0x67,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61,
-	0x61, 0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72,
+	0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f,
-	0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x3b, 0x61, 0x70, 0x69, 0xa2, 0x02, 0x04, 0x4d, 0x41,
+	0x74, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x3b, 0x61, 0x70, 0x69, 0xa2, 0x02, 0x04, 0x4d, 0x41, 0x50,
-	0x50, 0x49, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x49, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

api/field_behavior.proto

@@ -37,7 +37,7 @@ extend google.protobuf.FieldOptions {
   //   google.protobuf.Timestamp expire_time = 1
   //     [(google.api.field_behavior) = OUTPUT_ONLY,
   //      (google.api.field_behavior) = IMMUTABLE];
-  repeated micro.api.FieldBehavior field_behavior = 651052;
+  repeated micro.api.FieldBehavior field_behavior = 1052;
 }
 
 // An indicator of the behavior of a given field (for example, that a field

generate.go

@@ -6,5 +6,5 @@ package main
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/httpbody.proto
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/micro.proto
 //go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/annotations.proto
-//go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/gopenapiv2.proto
+//go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/openapiv2.proto
 //go:generate protoc -I. -I./tag --go_out=paths=source_relative:. ./tag/tag.proto

go.mod

@@ -2,4 +2,7 @@ module github.com/unistack-org/micro-proto
 
 go 1.16
 
-require google.golang.org/protobuf v1.27.1
+require (
+	github.com/golang/protobuf v1.4.3
+	google.golang.org/protobuf v1.25.0
+)

go.sum

@@ -1,8 +1,67 @@
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+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.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.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+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 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+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/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-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+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/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+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-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+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.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+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=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+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=

openapiv2/annotations.pb.go

@@ -23,42 +23,42 @@ const (
 var file_openapiv2_annotations_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.FileOptions)(nil),
-		ExtensionType: (*Document)(nil),
+		ExtensionType: (*Swagger)(nil),
-		Field:         847940,
+		Field:         1042,
 		Name:          "micro.openapiv2.openapiv2_swagger",
-		Tag:           "bytes,847940,opt,name=openapiv2_swagger",
+		Tag:           "bytes,1042,opt,name=openapiv2_swagger",
 		Filename:      "openapiv2/annotations.proto",
 	},
 	{
 		ExtendedType:  (*descriptorpb.MethodOptions)(nil),
 		ExtensionType: (*Operation)(nil),
-		Field:         847940,
+		Field:         1042,
 		Name:          "micro.openapiv2.openapiv2_operation",
-		Tag:           "bytes,847940,opt,name=openapiv2_operation",
+		Tag:           "bytes,1042,opt,name=openapiv2_operation",
 		Filename:      "openapiv2/annotations.proto",
 	},
 	{
 		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
 		ExtensionType: (*Schema)(nil),
-		Field:         847940,
+		Field:         1042,
 		Name:          "micro.openapiv2.openapiv2_schema",
-		Tag:           "bytes,847940,opt,name=openapiv2_schema",
+		Tag:           "bytes,1042,opt,name=openapiv2_schema",
 		Filename:      "openapiv2/annotations.proto",
 	},
 	{
 		ExtendedType:  (*descriptorpb.ServiceOptions)(nil),
 		ExtensionType: (*Tag)(nil),
-		Field:         847940,
+		Field:         1042,
 		Name:          "micro.openapiv2.openapiv2_tag",
-		Tag:           "bytes,847940,opt,name=openapiv2_tag",
+		Tag:           "bytes,1042,opt,name=openapiv2_tag",
 		Filename:      "openapiv2/annotations.proto",
 	},
 	{
 		ExtendedType:  (*descriptorpb.FieldOptions)(nil),
-		ExtensionType: (*Schema)(nil),
+		ExtensionType: (*JSONSchema)(nil),
-		Field:         847940,
+		Field:         1042,
 		Name:          "micro.openapiv2.openapiv2_field",
-		Tag:           "bytes,847940,opt,name=openapiv2_field",
+		Tag:           "bytes,1042,opt,name=openapiv2_field",
 		Filename:      "openapiv2/annotations.proto",
 	},
 }
@@ -70,7 +70,7 @@ var (
 	// All IDs are the same, as assigned. It is okay that they are the same, as they extend
 	// different descriptor messages.
 	//
-	// optional micro.openapiv2.Document openapiv2_swagger = 847940;
+	// optional micro.openapiv2.Swagger openapiv2_swagger = 1042;
 	E_Openapiv2Swagger = &file_openapiv2_annotations_proto_extTypes[0]
 )
 
@@ -81,7 +81,7 @@ var (
 	// All IDs are the same, as assigned. It is okay that they are the same, as they extend
 	// different descriptor messages.
 	//
-	// optional micro.openapiv2.Operation openapiv2_operation = 847940;
+	// optional micro.openapiv2.Operation openapiv2_operation = 1042;
 	E_Openapiv2Operation = &file_openapiv2_annotations_proto_extTypes[1]
 )
 
@@ -92,7 +92,7 @@ var (
 	// All IDs are the same, as assigned. It is okay that they are the same, as they extend
 	// different descriptor messages.
 	//
-	// optional micro.openapiv2.Schema openapiv2_schema = 847940;
+	// optional micro.openapiv2.Schema openapiv2_schema = 1042;
 	E_Openapiv2Schema = &file_openapiv2_annotations_proto_extTypes[2]
 )
 
@@ -103,7 +103,7 @@ var (
 	// All IDs are the same, as assigned. It is okay that they are the same, as they extend
 	// different descriptor messages.
 	//
-	// optional micro.openapiv2.Tag openapiv2_tag = 847940;
+	// optional micro.openapiv2.Tag openapiv2_tag = 1042;
 	E_Openapiv2Tag = &file_openapiv2_annotations_proto_extTypes[3]
 )
 
@@ -114,7 +114,7 @@ var (
 	// All IDs are the same, as assigned. It is okay that they are the same, as they extend
 	// different descriptor messages.
 	//
-	// optional micro.openapiv2.Schema openapiv2_field = 847940;
+	// optional micro.openapiv2.JSONSchema openapiv2_field = 1042;
 	E_Openapiv2Field = &file_openapiv2_annotations_proto_extTypes[4]
 )
 
@@ -126,44 +126,44 @@ var file_openapiv2_annotations_proto_rawDesc = []byte{
 	0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x1a, 0x20,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
 	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x1a, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x67, 0x6f, 0x70, 0x65,
+	0x1a, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x65, 0x6e,
-	0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x66, 0x0a, 0x11,
+	0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3a, 0x64, 0x0a, 0x11, 0x6f,
-	0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x73, 0x77, 0x61, 0x67, 0x67, 0x65,
+	0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x73, 0x77, 0x61, 0x67, 0x67, 0x65, 0x72,
-	0x72, 0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+	0x75, 0x66, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x92,
-	0xc4, 0xe0, 0x33, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70,
-	0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+	0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x53, 0x77, 0x61, 0x67, 0x67, 0x65, 0x72, 0x52,
-	0x6e, 0x74, 0x52, 0x10, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x53, 0x77, 0x61,
+	0x10, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x53, 0x77, 0x61, 0x67, 0x67, 0x65,
-	0x67, 0x67, 0x65, 0x72, 0x3a, 0x6d, 0x0a, 0x13, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76,
+	0x72, 0x3a, 0x6c, 0x0a, 0x13, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x6f,
-	0x32, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x2e, 0x67, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x74, 0x68, 0x6f,
-	0x74, 0x68, 0x6f, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0xe0, 0x33, 0x20,
+	0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x92, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e,
+	0x1a, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76,
-	0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x32, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x12, 0x6f, 0x70, 0x65,
-	0x12, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a,
-	0x69, 0x6f, 0x6e, 0x3a, 0x65, 0x0a, 0x10, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32,
+	0x64, 0x0a, 0x10, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x73, 0x63, 0x68,
-	0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x65, 0x6d, 0x61, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74,
-	0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0xe0, 0x33, 0x20, 0x01, 0x28, 0x0b,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x92, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x69,
-	0x32, 0x17, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69,
+	0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x53, 0x63,
-	0x76, 0x32, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x0f, 0x6f, 0x70, 0x65, 0x6e, 0x61,
+	0x68, 0x65, 0x6d, 0x61, 0x52, 0x0f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x53,
-	0x70, 0x69, 0x76, 0x32, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x3a, 0x5c, 0x0a, 0x0d, 0x6f, 0x70,
+	0x63, 0x68, 0x65, 0x6d, 0x61, 0x3a, 0x5b, 0x0a, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69,
-	0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x1f, 0x2e, 0x67, 0x6f,
+	0x76, 0x32, 0x5f, 0x74, 0x61, 0x67, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0xe0, 0x33,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x92, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65,
+	0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32,
-	0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x0c, 0x6f, 0x70, 0x65, 0x6e,
+	0x2e, 0x54, 0x61, 0x67, 0x52, 0x0c, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x54,
-	0x61, 0x70, 0x69, 0x76, 0x32, 0x54, 0x61, 0x67, 0x3a, 0x61, 0x0a, 0x0f, 0x6f, 0x70, 0x65, 0x6e,
+	0x61, 0x67, 0x3a, 0x64, 0x0a, 0x0f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x5f,
-	0x61, 0x70, 0x69, 0x76, 0x32, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f,
+	0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74,
-	0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xc4, 0xe0, 0x33, 0x20, 0x01,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x92, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6d, 0x69,
-	0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61,
+	0x63, 0x72, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2e, 0x4a, 0x53,
-	0x70, 0x69, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x0e, 0x6f, 0x70, 0x65,
+	0x4f, 0x4e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x52, 0x0e, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70,
-	0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x39, 0x5a, 0x37, 0x67,
+	0x69, 0x76, 0x32, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2d,
-	0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f,
+	0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x74, 0x6f, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x3b, 0x6f, 0x70, 0x65,
+	0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x3b, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70,
-	0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var file_openapiv2_annotations_proto_goTypes = []interface{}{
@@ -172,10 +172,11 @@ var file_openapiv2_annotations_proto_goTypes = []interface{}{
 	(*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions
 	(*descriptorpb.ServiceOptions)(nil), // 3: google.protobuf.ServiceOptions
 	(*descriptorpb.FieldOptions)(nil),   // 4: google.protobuf.FieldOptions
-	(*Document)(nil),                    // 5: micro.openapiv2.Document
+	(*Swagger)(nil),                     // 5: micro.openapiv2.Swagger
 	(*Operation)(nil),                   // 6: micro.openapiv2.Operation
 	(*Schema)(nil),                      // 7: micro.openapiv2.Schema
 	(*Tag)(nil),                         // 8: micro.openapiv2.Tag
+	(*JSONSchema)(nil),                  // 9: micro.openapiv2.JSONSchema
 }
 var file_openapiv2_annotations_proto_depIdxs = []int32{
 	0,  // 0: micro.openapiv2.openapiv2_swagger:extendee -> google.protobuf.FileOptions
@@ -183,11 +184,11 @@ var file_openapiv2_annotations_proto_depIdxs = []int32{
 	2,  // 2: micro.openapiv2.openapiv2_schema:extendee -> google.protobuf.MessageOptions
 	3,  // 3: micro.openapiv2.openapiv2_tag:extendee -> google.protobuf.ServiceOptions
 	4,  // 4: micro.openapiv2.openapiv2_field:extendee -> google.protobuf.FieldOptions
-	5,  // 5: micro.openapiv2.openapiv2_swagger:type_name -> micro.openapiv2.Document
+	5,  // 5: micro.openapiv2.openapiv2_swagger:type_name -> micro.openapiv2.Swagger
 	6,  // 6: micro.openapiv2.openapiv2_operation:type_name -> micro.openapiv2.Operation
 	7,  // 7: micro.openapiv2.openapiv2_schema:type_name -> micro.openapiv2.Schema
 	8,  // 8: micro.openapiv2.openapiv2_tag:type_name -> micro.openapiv2.Tag
-	7,  // 9: micro.openapiv2.openapiv2_field:type_name -> micro.openapiv2.Schema
+	9,  // 9: micro.openapiv2.openapiv2_field:type_name -> micro.openapiv2.JSONSchema
 	10, // [10:10] is the sub-list for method output_type
 	10, // [10:10] is the sub-list for method input_type
 	5,  // [5:10] is the sub-list for extension type_name
@@ -200,7 +201,7 @@ func file_openapiv2_annotations_proto_init() {
 	if File_openapiv2_annotations_proto != nil {
 		return
 	}
-	file_openapiv2_gopenapiv2_proto_init()
+	file_openapiv2_openapiv2_proto_init()
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{

openapiv2/annotations.proto

@@ -5,40 +5,40 @@ package micro.openapiv2;
 option go_package = "github.com/unistack-org/micro-proto/openapiv2;openapiv2";
 
 import "google/protobuf/descriptor.proto";
-import "openapiv2/gopenapiv2.proto";
+import "openapiv2/openapiv2.proto";
 
 extend google.protobuf.FileOptions {
   // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project.
   //
   // All IDs are the same, as assigned. It is okay that they are the same, as they extend
   // different descriptor messages.
-  Document openapiv2_swagger = 847940;
+  Swagger openapiv2_swagger = 1042;
 }
 extend google.protobuf.MethodOptions {
   // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project.
   //
   // All IDs are the same, as assigned. It is okay that they are the same, as they extend
   // different descriptor messages.
-  Operation openapiv2_operation = 847940;
+  Operation openapiv2_operation = 1042;
 }
 extend google.protobuf.MessageOptions {
   // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project.
   //
   // All IDs are the same, as assigned. It is okay that they are the same, as they extend
   // different descriptor messages.
-  Schema openapiv2_schema = 847940;
+  Schema openapiv2_schema = 1042;
 }
 extend google.protobuf.ServiceOptions {
   // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project.
   //
   // All IDs are the same, as assigned. It is okay that they are the same, as they extend
   // different descriptor messages.
-  Tag openapiv2_tag = 847940;
+  Tag openapiv2_tag = 1042;
 }
 extend google.protobuf.FieldOptions {
   // ID assigned by protobuf-global-extension-registry@google.com for gRPC-Gateway project.
   //
   // All IDs are the same, as assigned. It is okay that they are the same, as they extend
   // different descriptor messages.
-  Schema openapiv2_field = 847940;
+  JSONSchema openapiv2_field = 1042;
 }

openapiv2/gopenapiv2.proto

@@ -1,665 +0,0 @@
-// Copyright 2020 Google LLC. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// THIS FILE IS AUTOMATICALLY GENERATED.
-
-syntax = "proto3";
-
-package micro.openapiv2;
-
-import "google/protobuf/any.proto";
-
-// This option lets the proto compiler generate Java code inside the package
-// name (see below) instead of inside an outer class. It creates a simpler
-// developer experience by reducing one-level of name nesting and be
-// consistent with most programming languages that don't support outer classes.
-option java_multiple_files = true;
-
-// The Java outer classname should be the filename in UpperCamelCase. This
-// class is only used to hold proto descriptor, so developers don't need to
-// work with it directly.
-option java_outer_classname = "OpenAPIProto";
-
-// The Java package name must be proto package name with proper prefix.
-option java_package = "micro.openapiv2";
-
-// A reasonable prefix for the Objective-C symbols generated from the package.
-// It should at a minimum be 3 characters long, all uppercase, and convention
-// is to use an abbreviation of the package name. Something short, but
-// hopefully unique enough to not conflict with things that may come along in
-// the future. 'GPB' is reserved for the protocol buffer implementation itself.
-option objc_class_prefix = "OAS";
-
-// The Go package name.
-option go_package = "github.com/unistack-org/micro-proto/openapiv2;openapiv2";
-
-message AdditionalPropertiesItem {
-  oneof oneof {
-    Schema schema = 1;
-    bool boolean = 2;
-  }
-}
-
-message Any {
-  google.protobuf.Any value = 1;
-  string yaml = 2;
-}
-
-message ApiKeySecurity {
-  string type = 1;
-  string name = 2;
-  string in = 3;
-  string description = 4;
-  repeated NamedAny vendor_extension = 5;
-}
-
-message BasicAuthenticationSecurity {
-  string type = 1;
-  string description = 2;
-  repeated NamedAny vendor_extension = 3;
-}
-
-message BodyParameter {
-  // A brief description of the parameter. This could contain examples of use.  GitHub Flavored Markdown is allowed.
-  string description = 1;
-  // The name of the parameter.
-  string name = 2;
-  // Determines the location of the parameter.
-  string in = 3;
-  // Determines whether or not this parameter is required or optional.
-  bool required = 4;
-  Schema schema = 5;
-  repeated NamedAny vendor_extension = 6;
-}
-
-// Contact information for the owners of the API.
-message Contact {
-  // The identifying name of the contact person/organization.
-  string name = 1;
-  // The URL pointing to the contact information.
-  string url = 2;
-  // The email address of the contact person/organization.
-  string email = 3;
-  repeated NamedAny vendor_extension = 4;
-}
-
-message Default {
-  repeated NamedAny additional_properties = 1;
-}
-
-// One or more JSON objects describing the schemas being consumed and produced by the API.
-message Definitions {
-  repeated NamedSchema additional_properties = 1;
-}
-
-message Document {
-  // The Swagger version of this document.
-  string swagger = 1;
-  Info info = 2;
-  // The host (name or ip) of the API. Example: 'swagger.io'
-  string host = 3;
-  // The base path to the API. Example: '/api'.
-  string base_path = 4;
-  // The transfer protocol of the API.
-  repeated string schemes = 5;
-  // A list of MIME types accepted by the API.
-  repeated string consumes = 6;
-  // A list of MIME types the API can produce.
-  repeated string produces = 7;
-  Paths paths = 8;
-  Definitions definitions = 9;
-  ParameterDefinitions parameters = 10;
-  ResponseDefinitions responses = 11;
-  repeated SecurityRequirement security = 12;
-  SecurityDefinitions security_definitions = 13;
-  repeated Tag tags = 14;
-  ExternalDocs external_docs = 15;
-  repeated NamedAny vendor_extension = 16;
-}
-
-message Examples {
-  repeated NamedAny additional_properties = 1;
-}
-
-// information about external documentation
-message ExternalDocs {
-  string description = 1;
-  string url = 2;
-  repeated NamedAny vendor_extension = 3;
-}
-
-// A deterministic version of a JSON Schema object.
-message FileSchema {
-  string format = 1;
-  string title = 2;
-  string description = 3;
-  Any default = 4;
-  repeated string required = 5;
-  string type = 6;
-  bool read_only = 7;
-  ExternalDocs external_docs = 8;
-  Any example = 9;
-  repeated NamedAny vendor_extension = 10;
-}
-
-message FormDataParameterSubSchema {
-  // Determines whether or not this parameter is required or optional.
-  bool required = 1;
-  // Determines the location of the parameter.
-  string in = 2;
-  // A brief description of the parameter. This could contain examples of use.  GitHub Flavored Markdown is allowed.
-  string description = 3;
-  // The name of the parameter.
-  string name = 4;
-  // allows sending a parameter by name only or with an empty value.
-  bool allow_empty_value = 5;
-  string type = 6;
-  string format = 7;
-  PrimitivesItems items = 8;
-  string collection_format = 9;
-  Any default = 10;
-  double maximum = 11;
-  bool exclusive_maximum = 12;
-  double minimum = 13;
-  bool exclusive_minimum = 14;
-  int64 max_length = 15;
-  int64 min_length = 16;
-  string pattern = 17;
-  int64 max_items = 18;
-  int64 min_items = 19;
-  bool unique_items = 20;
-  repeated Any enum = 21;
-  double multiple_of = 22;
-  repeated NamedAny vendor_extension = 23;
-}
-
-message Header {
-  string type = 1;
-  string format = 2;
-  PrimitivesItems items = 3;
-  string collection_format = 4;
-  Any default = 5;
-  double maximum = 6;
-  bool exclusive_maximum = 7;
-  double minimum = 8;
-  bool exclusive_minimum = 9;
-  int64 max_length = 10;
-  int64 min_length = 11;
-  string pattern = 12;
-  int64 max_items = 13;
-  int64 min_items = 14;
-  bool unique_items = 15;
-  repeated Any enum = 16;
-  double multiple_of = 17;
-  string description = 18;
-  repeated NamedAny vendor_extension = 19;
-}
-
-message HeaderParameterSubSchema {
-  // Determines whether or not this parameter is required or optional.
-  bool required = 1;
-  // Determines the location of the parameter.
-  string in = 2;
-  // A brief description of the parameter. This could contain examples of use.  GitHub Flavored Markdown is allowed.
-  string description = 3;
-  // The name of the parameter.
-  string name = 4;
-  string type = 5;
-  string format = 6;
-  PrimitivesItems items = 7;
-  string collection_format = 8;
-  Any default = 9;
-  double maximum = 10;
-  bool exclusive_maximum = 11;
-  double minimum = 12;
-  bool exclusive_minimum = 13;
-  int64 max_length = 14;
-  int64 min_length = 15;
-  string pattern = 16;
-  int64 max_items = 17;
-  int64 min_items = 18;
-  bool unique_items = 19;
-  repeated Any enum = 20;
-  double multiple_of = 21;
-  repeated NamedAny vendor_extension = 22;
-}
-
-message Headers {
-  repeated NamedHeader additional_properties = 1;
-}
-
-// General information about the API.
-message Info {
-  // A unique and precise title of the API.
-  string title = 1;
-  // A semantic version number of the API.
-  string version = 2;
-  // A longer description of the API. Should be different from the title.  GitHub Flavored Markdown is allowed.
-  string description = 3;
-  // The terms of service for the API.
-  string terms_of_service = 4;
-  Contact contact = 5;
-  License license = 6;
-  repeated NamedAny vendor_extension = 7;
-}
-
-message ItemsItem {
-  repeated Schema schema = 1;
-}
-
-message JsonReference {
-  string _ref = 1;
-  string description = 2;
-}
-
-message License {
-  // The name of the license type. It's encouraged to use an OSI compatible license.
-  string name = 1;
-  // The URL pointing to the license.
-  string url = 2;
-  repeated NamedAny vendor_extension = 3;
-}
-
-// Automatically-generated message used to represent maps of Any as ordered (name,value) pairs.
-message NamedAny {
-  // Map key
-  string name = 1;
-  // Mapped value
-  Any value = 2;
-}
-
-// Automatically-generated message used to represent maps of Header as ordered (name,value) pairs.
-message NamedHeader {
-  // Map key
-  string name = 1;
-  // Mapped value
-  Header value = 2;
-}
-
-// Automatically-generated message used to represent maps of Parameter as ordered (name,value) pairs.
-message NamedParameter {
-  // Map key
-  string name = 1;
-  // Mapped value
-  Parameter value = 2;
-}
-
-// Automatically-generated message used to represent maps of PathItem as ordered (name,value) pairs.
-message NamedPathItem {
-  // Map key
-  string name = 1;
-  // Mapped value
-  PathItem value = 2;
-}
-
-// Automatically-generated message used to represent maps of Response as ordered (name,value) pairs.
-message NamedResponse {
-  // Map key
-  string name = 1;
-  // Mapped value
-  Response value = 2;
-}
-
-// Automatically-generated message used to represent maps of ResponseValue as ordered (name,value) pairs.
-message NamedResponseValue {
-  // Map key
-  string name = 1;
-  // Mapped value
-  ResponseValue value = 2;
-}
-
-// Automatically-generated message used to represent maps of Schema as ordered (name,value) pairs.
-message NamedSchema {
-  // Map key
-  string name = 1;
-  // Mapped value
-  Schema value = 2;
-}
-
-// Automatically-generated message used to represent maps of SecurityDefinitionsItem as ordered (name,value) pairs.
-message NamedSecurityDefinitionsItem {
-  // Map key
-  string name = 1;
-  // Mapped value
-  SecurityDefinitionsItem value = 2;
-}
-
-// Automatically-generated message used to represent maps of string as ordered (name,value) pairs.
-message NamedString {
-  // Map key
-  string name = 1;
-  // Mapped value
-  string value = 2;
-}
-
-// Automatically-generated message used to represent maps of StringArray as ordered (name,value) pairs.
-message NamedStringArray {
-  // Map key
-  string name = 1;
-  // Mapped value
-  StringArray value = 2;
-}
-
-message NonBodyParameter {
-  oneof oneof {
-    HeaderParameterSubSchema header_parameter_sub_schema = 1;
-    FormDataParameterSubSchema form_data_parameter_sub_schema = 2;
-    QueryParameterSubSchema query_parameter_sub_schema = 3;
-    PathParameterSubSchema path_parameter_sub_schema = 4;
-  }
-}
-
-message Oauth2AccessCodeSecurity {
-  string type = 1;
-  string flow = 2;
-  Oauth2Scopes scopes = 3;
-  string authorization_url = 4;
-  string token_url = 5;
-  string description = 6;
-  repeated NamedAny vendor_extension = 7;
-}
-
-message Oauth2ApplicationSecurity {
-  string type = 1;
-  string flow = 2;
-  Oauth2Scopes scopes = 3;
-  string token_url = 4;
-  string description = 5;
-  repeated NamedAny vendor_extension = 6;
-}
-
-message Oauth2ImplicitSecurity {
-  string type = 1;
-  string flow = 2;
-  Oauth2Scopes scopes = 3;
-  string authorization_url = 4;
-  string description = 5;
-  repeated NamedAny vendor_extension = 6;
-}
-
-message Oauth2PasswordSecurity {
-  string type = 1;
-  string flow = 2;
-  Oauth2Scopes scopes = 3;
-  string token_url = 4;
-  string description = 5;
-  repeated NamedAny vendor_extension = 6;
-}
-
-message Oauth2Scopes {
-  repeated NamedString additional_properties = 1;
-}
-
-message Operation {
-  repeated string tags = 1;
-  // A brief summary of the operation.
-  string summary = 2;
-  // A longer description of the operation, GitHub Flavored Markdown is allowed.
-  string description = 3;
-  ExternalDocs external_docs = 4;
-  // A unique identifier of the operation.
-  string operation_id = 5;
-  // A list of MIME types the API can produce.
-  repeated string produces = 6;
-  // A list of MIME types the API can consume.
-  repeated string consumes = 7;
-  // The parameters needed to send a valid API call.
-  repeated ParametersItem parameters = 8;
-  Responses responses = 9;
-  // The transfer protocol of the API.
-  repeated string schemes = 10;
-  bool deprecated = 11;
-  repeated SecurityRequirement security = 12;
-  repeated NamedAny vendor_extension = 13;
-}
-
-message Parameter {
-  oneof oneof {
-    BodyParameter body_parameter = 1;
-    NonBodyParameter non_body_parameter = 2;
-  }
-}
-
-// One or more JSON representations for parameters
-message ParameterDefinitions {
-  repeated NamedParameter additional_properties = 1;
-}
-
-message ParametersItem {
-  oneof oneof {
-    Parameter parameter = 1;
-    JsonReference json_reference = 2;
-  }
-}
-
-message PathItem {
-  string _ref = 1;
-  Operation get = 2;
-  Operation put = 3;
-  Operation post = 4;
-  Operation delete = 5;
-  Operation options = 6;
-  Operation head = 7;
-  Operation patch = 8;
-  // The parameters needed to send a valid API call.
-  repeated ParametersItem parameters = 9;
-  repeated NamedAny vendor_extension = 10;
-}
-
-message PathParameterSubSchema {
-  // Determines whether or not this parameter is required or optional.
-  bool required = 1;
-  // Determines the location of the parameter.
-  string in = 2;
-  // A brief description of the parameter. This could contain examples of use.  GitHub Flavored Markdown is allowed.
-  string description = 3;
-  // The name of the parameter.
-  string name = 4;
-  string type = 5;
-  string format = 6;
-  PrimitivesItems items = 7;
-  string collection_format = 8;
-  Any default = 9;
-  double maximum = 10;
-  bool exclusive_maximum = 11;
-  double minimum = 12;
-  bool exclusive_minimum = 13;
-  int64 max_length = 14;
-  int64 min_length = 15;
-  string pattern = 16;
-  int64 max_items = 17;
-  int64 min_items = 18;
-  bool unique_items = 19;
-  repeated Any enum = 20;
-  double multiple_of = 21;
-  repeated NamedAny vendor_extension = 22;
-}
-
-// Relative paths to the individual endpoints. They must be relative to the 'basePath'.
-message Paths {
-  repeated NamedAny vendor_extension = 1;
-  repeated NamedPathItem path = 2;
-}
-
-message PrimitivesItems {
-  string type = 1;
-  string format = 2;
-  PrimitivesItems items = 3;
-  string collection_format = 4;
-  Any default = 5;
-  double maximum = 6;
-  bool exclusive_maximum = 7;
-  double minimum = 8;
-  bool exclusive_minimum = 9;
-  int64 max_length = 10;
-  int64 min_length = 11;
-  string pattern = 12;
-  int64 max_items = 13;
-  int64 min_items = 14;
-  bool unique_items = 15;
-  repeated Any enum = 16;
-  double multiple_of = 17;
-  repeated NamedAny vendor_extension = 18;
-}
-
-message Properties {
-  repeated NamedSchema additional_properties = 1;
-}
-
-message QueryParameterSubSchema {
-  // Determines whether or not this parameter is required or optional.
-  bool required = 1;
-  // Determines the location of the parameter.
-  string in = 2;
-  // A brief description of the parameter. This could contain examples of use.  GitHub Flavored Markdown is allowed.
-  string description = 3;
-  // The name of the parameter.
-  string name = 4;
-  // allows sending a parameter by name only or with an empty value.
-  bool allow_empty_value = 5;
-  string type = 6;
-  string format = 7;
-  PrimitivesItems items = 8;
-  string collection_format = 9;
-  Any default = 10;
-  double maximum = 11;
-  bool exclusive_maximum = 12;
-  double minimum = 13;
-  bool exclusive_minimum = 14;
-  int64 max_length = 15;
-  int64 min_length = 16;
-  string pattern = 17;
-  int64 max_items = 18;
-  int64 min_items = 19;
-  bool unique_items = 20;
-  repeated Any enum = 21;
-  double multiple_of = 22;
-  repeated NamedAny vendor_extension = 23;
-}
-
-message Response {
-  string description = 1;
-  SchemaItem schema = 2;
-  Headers headers = 3;
-  Examples examples = 4;
-  repeated NamedAny vendor_extension = 5;
-}
-
-// One or more JSON representations for responses
-message ResponseDefinitions {
-  repeated NamedResponse additional_properties = 1;
-}
-
-message ResponseValue {
-  oneof oneof {
-    Response response = 1;
-    JsonReference json_reference = 2;
-  }
-}
-
-// Response objects names can either be any valid HTTP status code or 'default'.
-message Responses {
-  repeated NamedResponseValue response_code = 1;
-  repeated NamedAny vendor_extension = 2;
-}
-
-// A deterministic version of a JSON Schema object.
-message Schema {
-  string _ref = 1;
-  string format = 2;
-  string title = 3;
-  string description = 4;
-  Any default = 5;
-  double multiple_of = 6;
-  double maximum = 7;
-  bool exclusive_maximum = 8;
-  double minimum = 9;
-  bool exclusive_minimum = 10;
-  int64 max_length = 11;
-  int64 min_length = 12;
-  string pattern = 13;
-  int64 max_items = 14;
-  int64 min_items = 15;
-  bool unique_items = 16;
-  int64 max_properties = 17;
-  int64 min_properties = 18;
-  repeated string required = 19;
-  repeated Any enum = 20;
-  AdditionalPropertiesItem additional_properties = 21;
-  TypeItem type = 22;
-  ItemsItem items = 23;
-  repeated Schema all_of = 24;
-  Properties properties = 25;
-  string discriminator = 26;
-  bool read_only = 27;
-  Xml xml = 28;
-  ExternalDocs external_docs = 29;
-  Any example = 30;
-  repeated NamedAny vendor_extension = 31;
-}
-
-message SchemaItem {
-  oneof oneof {
-    Schema schema = 1;
-    FileSchema file_schema = 2;
-  }
-}
-
-message SecurityDefinitions {
-  repeated NamedSecurityDefinitionsItem additional_properties = 1;
-}
-
-message SecurityDefinitionsItem {
-  oneof oneof {
-    BasicAuthenticationSecurity basic_authentication_security = 1;
-    ApiKeySecurity api_key_security = 2;
-    Oauth2ImplicitSecurity oauth2_implicit_security = 3;
-    Oauth2PasswordSecurity oauth2_password_security = 4;
-    Oauth2ApplicationSecurity oauth2_application_security = 5;
-    Oauth2AccessCodeSecurity oauth2_access_code_security = 6;
-  }
-}
-
-message SecurityRequirement {
-  repeated NamedStringArray additional_properties = 1;
-}
-
-message StringArray {
-  repeated string value = 1;
-}
-
-message Tag {
-  string name = 1;
-  string description = 2;
-  ExternalDocs external_docs = 3;
-  repeated NamedAny vendor_extension = 4;
-}
-
-message TypeItem {
-  repeated string value = 1;
-}
-
-// Any property starting with x- is valid.
-message VendorExtension {
-  repeated NamedAny additional_properties = 1;
-}
-
-message Xml {
-  string name = 1;
-  string namespace = 2;
-  string prefix = 3;
-  bool attribute = 4;
-  bool wrapped = 5;
-  repeated NamedAny vendor_extension = 6;
-}

openapiv2/openapiv2.proto

@@ -97,7 +97,7 @@ message Swagger {
   // service objects into OpenAPI v2 Tag objects.
   reserved 13;
   // Additional external documentation.
-  ExternalDocs external_docs = 14;
+  ExternalDocumentation external_docs = 14;
   map<string, google.protobuf.Value> extensions = 15;
 }
 
@@ -137,7 +137,7 @@ message Operation {
   // rich text representation.
   string description = 3;
   // Additional external documentation for this operation.
-  ExternalDocs external_docs = 4;
+  ExternalDocumentation external_docs = 4;
   // Unique string used to identify the operation. The id MUST be unique among
   // all operations described in the API. Tools and libraries MAY use the
   // operationId to uniquely identify an operation, therefore, it is recommended
@@ -299,6 +299,16 @@ message Info {
 //    ...
 //  };
 //
+message Contact {
+  // The identifying name of the contact person/organization.
+  string name = 1;
+  // The URL pointing to the contact information. MUST be in the format of a
+  // URL.
+  string url = 2;
+  // The email address of the contact person/organization. MUST be in the format
+  // of an email address.
+  string email = 3;
+}
 
 // `License` is a representation of OpenAPI v2 specification's License object.
 //
@@ -318,8 +328,15 @@ message Info {
 //    ...
 //  };
 //
+message License {
+  // The license name used for the API.
+  string name = 1;
+  // A URL to the license used for the API. MUST be in the format of a URL.
+  string url = 2;
+}
 
-// ExternalDocs object.
+// `ExternalDocumentation` is a representation of OpenAPI v2 specification's
+// ExternalDocumentation object.
 //
 // See: https://github.com/OAI/OpenAPI-Specification/blob/3.0.0/versions/2.0.md#externalDocumentationObject
 //
@@ -334,6 +351,14 @@ message Info {
 //    ...
 //  };
 //
+message ExternalDocumentation {
+  // A short description of the target documentation. GFM syntax can be used for
+  // rich text representation.
+  string description = 1;
+  // The URL for the target documentation. Value MUST be in the format
+  // of a URL.
+  string url = 2;
+}
 
 // `Schema` is a representation of OpenAPI v2 specification's Schema object.
 //
@@ -356,7 +381,7 @@ message Schema {
   // field 4 is reserved for 'xml'.
   reserved 4;
   // Additional external documentation for this schema.
-  ExternalDocs external_docs = 5;
+  ExternalDocumentation external_docs = 5;
   // A free-form property to include an example of an instance for this schema in JSON.
   // This is copied verbatim to the output.
   string example = 6;
@@ -500,7 +525,7 @@ message Tag {
   // representation.
   string description = 2;
   // Additional external documentation for this tag.
-  ExternalDocs external_docs = 3;
+  ExternalDocumentation external_docs = 3;
 }
 
 // `SecurityDefinitions` is a representation of OpenAPI v2 specification's