Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

protoc-gen-openapi: remove duplicate body params #444

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+1,756 −227
Open

protoc-gen-openapi: remove duplicate body params #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions COMPILE-PROTOS.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# limitations under the License.
#

go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1

protoc -I . -I ./third_party --go_out=. --go_opt=paths=source_relative plugins/*.proto
protoc -I . -I ./third_party --go_out=. --go_opt=paths=source_relative surface/*.proto
protoc -I . -I ./third_party --go_out=. --go_opt=paths=source_relative metrics/*.proto
protoc -I . -I ./third_party --go_out=. --go_opt=paths=source_relative metrics/*.proto
24 changes: 6 additions & 18 deletions cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MoveBookRequest'
$ref: '#/components/schemas/MoveBookRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -374,7 +374,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MergeShelvesRequest'
$ref: '#/components/schemas/MergeShelvesRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -469,36 +469,24 @@ components:
field in the subsequent call to `ListShelves` method to retrieve the next
page of results.
description: Response message for LibraryService.ListShelves.
MergeShelvesRequest:
MergeShelvesRequest_Body:
required:
- name
- other_shelf_name
type: object
properties:
name:
type: string
description: The name of the shelf we're adding books to.
other_shelf_name:
type: string
description: The name of the shelf we're removing books from and deleting.
description: |-
Describes the shelf being removed (other_shelf_name) and updated
(name) in this merge.
MoveBookRequest:
description: The body of LibraryService_MergeShelves
MoveBookRequest_Body:
required:
- name
- other_shelf_name
type: object
properties:
name:
type: string
description: The name of the book to move.
other_shelf_name:
type: string
description: The name of the destination shelf.
description: |-
Describes what book to move (name) and what shelf we're moving it
to (other_shelf_name).
description: The body of LibraryService_MoveBook
Shelf:
required:
- name
Expand Down
24 changes: 6 additions & 18 deletions cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_default_response.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MoveBookRequest'
$ref: '#/components/schemas/MoveBookRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -374,7 +374,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MergeShelvesRequest'
$ref: '#/components/schemas/MergeShelvesRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -469,36 +469,24 @@ components:
field in the subsequent call to `ListShelves` method to retrieve the next
page of results.
description: Response message for LibraryService.ListShelves.
MergeShelvesRequest:
MergeShelvesRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the shelf we're adding books to.
otherShelfName:
type: string
description: The name of the shelf we're removing books from and deleting.
description: |-
Describes the shelf being removed (other_shelf_name) and updated
(name) in this merge.
MoveBookRequest:
description: The body of LibraryService_MergeShelves
MoveBookRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the book to move.
otherShelfName:
type: string
description: The name of the destination shelf.
description: |-
Describes what book to move (name) and what shelf we're moving it
to (other_shelf_name).
description: The body of LibraryService_MoveBook
Shelf:
required:
- name
Expand Down
24 changes: 6 additions & 18 deletions cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/google.example.library.v1.MoveBookRequest'
$ref: '#/components/schemas/google.example.library.v1.MoveBookRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -374,7 +374,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/google.example.library.v1.MergeShelvesRequest'
$ref: '#/components/schemas/google.example.library.v1.MergeShelvesRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -461,36 +461,24 @@ components:
field in the subsequent call to `ListShelves` method to retrieve the next
page of results.
description: Response message for LibraryService.ListShelves.
google.example.library.v1.MergeShelvesRequest:
google.example.library.v1.MergeShelvesRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the shelf we're adding books to.
otherShelfName:
type: string
description: The name of the shelf we're removing books from and deleting.
description: |-
Describes the shelf being removed (other_shelf_name) and updated
(name) in this merge.
google.example.library.v1.MoveBookRequest:
description: The body of LibraryService_MergeShelves
google.example.library.v1.MoveBookRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the book to move.
otherShelfName:
type: string
description: The name of the destination shelf.
description: |-
Describes what book to move (name) and what shelf we're moving it
to (other_shelf_name).
description: The body of LibraryService_MoveBook
google.example.library.v1.Shelf:
required:
- name
Expand Down
24 changes: 6 additions & 18 deletions cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MoveBookRequest'
$ref: '#/components/schemas/MoveBookRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -374,7 +374,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MergeShelvesRequest'
$ref: '#/components/schemas/MergeShelvesRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -469,36 +469,24 @@ components:
field in the subsequent call to `ListShelves` method to retrieve the next
page of results.
description: Response message for LibraryService.ListShelves.
MergeShelvesRequest:
MergeShelvesRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the shelf we're adding books to.
otherShelfName:
type: string
description: The name of the shelf we're removing books from and deleting.
description: |-
Describes the shelf being removed (other_shelf_name) and updated
(name) in this merge.
MoveBookRequest:
description: The body of LibraryService_MergeShelves
MoveBookRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the book to move.
otherShelfName:
type: string
description: The name of the destination shelf.
description: |-
Describes what book to move (name) and what shelf we're moving it
to (other_shelf_name).
description: The body of LibraryService_MoveBook
Shelf:
required:
- name
Expand Down
24 changes: 6 additions & 18 deletions cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_string_enum.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MoveBookRequest'
$ref: '#/components/schemas/MoveBookRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -374,7 +374,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/MergeShelvesRequest'
$ref: '#/components/schemas/MergeShelvesRequest_Body'
required: true
responses:
"200":
Expand Down Expand Up @@ -469,36 +469,24 @@ components:
field in the subsequent call to `ListShelves` method to retrieve the next
page of results.
description: Response message for LibraryService.ListShelves.
MergeShelvesRequest:
MergeShelvesRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the shelf we're adding books to.
otherShelfName:
type: string
description: The name of the shelf we're removing books from and deleting.
description: |-
Describes the shelf being removed (other_shelf_name) and updated
(name) in this merge.
MoveBookRequest:
description: The body of LibraryService_MergeShelves
MoveBookRequest_Body:
required:
- name
- otherShelfName
type: object
properties:
name:
type: string
description: The name of the book to move.
otherShelfName:
type: string
description: The name of the destination shelf.
description: |-
Describes what book to move (name) and what shelf we're moving it
to (other_shelf_name).
description: The body of LibraryService_MoveBook
Shelf:
required:
- name
Expand Down
Loading