Update old dependencies, support proto Editions in protoc-gen-api

Author: felipeparaujo

cmd/disco/main.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/docopt/docopt-go"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/google/gnostic/conversions"
 	discovery "github.com/google/gnostic/discovery"

cmd/petstore-builder/main.go

@@ -20,7 +20,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func usage() string {

cmd/protoc-gen-openapi/examples/google/example/library/v1/openapi_fq_schema_naming.yaml

@@ -3,7 +3,7 @@
 
 openapi: 3.0.3
 info:
-    title: LibraryService API
+    title: google.example.library.v1.LibraryService API
     description: |-
         This API represents a simple digital library.  It lets you manage Shelf
          resources and Book resources in the library. It defines the following
@@ -21,7 +21,7 @@ paths:
     /v1/shelves:
         get:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: |-
                 Lists shelves. The order is unspecified but deterministic. Newly created
                  shelves will not necessarily be added to the end of this list.
@@ -59,7 +59,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         post:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Creates a shelf, and returns the new Shelf.
             operationId: LibraryService_CreateShelf
             requestBody:
@@ -84,7 +84,7 @@ paths:
     /v1/shelves/{shelf}:
         get:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Gets a shelf. Returns NOT_FOUND if the shelf does not exist.
             operationId: LibraryService_GetShelf
             parameters:
@@ -109,7 +109,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         delete:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Deletes a shelf. Returns NOT_FOUND if the shelf does not exist.
             operationId: LibraryService_DeleteShelf
             parameters:
@@ -132,7 +132,7 @@ paths:
     /v1/shelves/{shelf}/books:
         get:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: |-
                 Lists books in a shelf. The order is unspecified but deterministic. Newly
                  created books will not necessarily be added to the end of this list.
@@ -177,7 +177,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         post:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Creates a book, and returns the new Book.
             operationId: LibraryService_CreateBook
             parameters:
@@ -209,7 +209,7 @@ paths:
     /v1/shelves/{shelf}/books/{book}:
         get:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Gets a book. Returns NOT_FOUND if the book does not exist.
             operationId: LibraryService_GetBook
             parameters:
@@ -240,7 +240,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         put:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: |-
                 Updates a book. Returns INVALID_ARGUMENT if the name of the book
                  is non-empty and does not equal the existing name.
@@ -284,7 +284,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         delete:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: Deletes a book. Returns NOT_FOUND if the book does not exist.
             operationId: LibraryService_DeleteBook
             parameters:
@@ -313,7 +313,7 @@ paths:
     /v1/shelves/{shelf}/books/{book}:move:
         post:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: |-
                 Moves a book to another shelf, and returns the new book. The book
                  id of the new book may not be the same as the original book.
@@ -353,7 +353,7 @@ paths:
     /v1/shelves/{shelf}:merge:
         post:
             tags:
-                - LibraryService
+                - google.example.library.v1.LibraryService
             description: |-
                 Merges two shelves by adding all books from the shelf named
                  `other_shelf_name` to shelf `name`, and deletes
@@ -546,4 +546,4 @@ components:
                     description: A list of messages that carry the error details.  There is a common set of message types for APIs to use.
             description: 'The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors).'
 tags:
-    - name: LibraryService
+    - name: google.example.library.v1.LibraryService

cmd/protoc-gen-openapi/examples/tests/bodymapping/openapi_fq_schema_naming.yaml

@@ -3,13 +3,13 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.bodymappying.message.v1.Messaging API
     version: 0.0.1
 paths:
     /v1/messages/{messageId}:
         patch:
             tags:
-                - Messaging
+                - tests.bodymappying.message.v1.Messaging
             operationId: Messaging_UpdateMessage
             parameters:
                 - name: messageId
@@ -70,4 +70,4 @@ components:
                 text:
                     type: string
 tags:
-    - name: Messaging
+    - name: tests.bodymappying.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/enumoptions/openapi_fq_schema_naming.yaml

@@ -3,14 +3,14 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.enumoptions.message.v1.Messaging API
     description: Messaging service
     version: 0.0.1
 paths:
     /v1/messages/{message_id}:
         post:
             tags:
-                - Messaging
+                - tests.enumoptions.message.v1.Messaging
             operationId: Messaging_CreateMessage
             parameters:
                 - name: message_id
@@ -73,4 +73,4 @@ components:
                     type: integer
                     format: enum
 tags:
-    - name: Messaging
+    - name: tests.enumoptions.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/jsonoptions/openapi_fq_schema_naming.yaml

@@ -3,14 +3,14 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.jsonnames.message.v1.Messaging API
     description: Messaging service
     version: 0.0.1
 paths:
     /v1/messages/{messageId}:
         post:
             tags:
-                - Messaging
+                - tests.jsonnames.message.v1.Messaging
             operationId: Messaging_CreateMessage
             parameters:
                 - name: messageId
@@ -44,7 +44,7 @@ paths:
     /v1/messages/{message_id}:
         patch:
             tags:
-                - Messaging
+                - tests.jsonnames.message.v1.Messaging
             operationId: Messaging_UpdateMessage
             parameters:
                 - name: message_id
@@ -120,4 +120,4 @@ components:
                 not_used:
                     type: string
 tags:
-    - name: Messaging
+    - name: tests.jsonnames.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/mapfields/openapi_fq_schema_naming.yaml

@@ -3,13 +3,13 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.mapfields.message.v1.Messaging API
     version: 0.0.1
 paths:
     /v1/messages/{messageId}:
         patch:
             tags:
-                - Messaging
+                - tests.mapfields.message.v1.Messaging
             operationId: Messaging_UpdateMessage
             parameters:
                 - name: messageId
@@ -110,4 +110,4 @@ components:
                 label:
                     type: string
 tags:
-    - name: Messaging
+    - name: tests.mapfields.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/noannotations/openapi_fq_schema_naming.yaml

@@ -3,13 +3,13 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging1 API
+    title: tests.noannotations.message.v1.Messaging1 API
     version: 0.0.1
 paths:
     /v1/messages/{message_id}:
         patch:
             tags:
-                - Messaging1
+                - tests.noannotations.message.v1.Messaging1
             operationId: Messaging1_UpdateMessage
             parameters:
                 - name: message_id
@@ -70,4 +70,4 @@ components:
                 label:
                     type: string
 tags:
-    - name: Messaging1
+    - name: tests.noannotations.message.v1.Messaging1

cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/openapi_fq_schema_naming.yaml

@@ -17,7 +17,7 @@ paths:
     /v1/messages/{message_id}:
         patch:
             tags:
-                - Messaging1
+                - tests.openapiv3annotations.message.v1.Messaging1
             operationId: Messaging1_UpdateMessage
             parameters:
                 - name: message_id
@@ -87,4 +87,4 @@ components:
             type: http
             scheme: basic
 tags:
-    - name: Messaging1
+    - name: tests.openapiv3annotations.message.v1.Messaging1

cmd/protoc-gen-openapi/examples/tests/pathparams/openapi_fq_schema_naming.yaml

@@ -3,13 +3,13 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.pathparams.message.v1.Messaging API
     version: 0.0.1
 paths:
     /v1/messages/{messageId}:
         get:
             tags:
-                - Messaging
+                - tests.pathparams.message.v1.Messaging
             operationId: Messaging_GetMessage
             parameters:
                 - name: messageId
@@ -36,7 +36,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         post:
             tags:
-                - Messaging
+                - tests.pathparams.message.v1.Messaging
             operationId: Messaging_CreateMessage
             parameters:
                 - name: messageId
@@ -66,7 +66,7 @@ paths:
     /v1/users/{userId}/messages/{messageId}:
         get:
             tags:
-                - Messaging
+                - tests.pathparams.message.v1.Messaging
             operationId: Messaging_GetUserMessage
             parameters:
                 - name: userId
@@ -130,4 +130,4 @@ components:
                 maybe:
                     type: string
 tags:
-    - name: Messaging
+    - name: tests.pathparams.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/protobuftypes/openapi_fq_schema_naming.yaml

@@ -3,15 +3,15 @@
 
 openapi: 3.0.3
 info:
-    title: Messaging API
+    title: tests.protobuftypes.message.v1.Messaging API
     version: 0.0.1
 servers:
     - url: https://foo.googleapi.com
 paths:
     /v1/messages:
         get:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             operationId: Messaging_ListMessages
             responses:
                 "200":
@@ -29,7 +29,7 @@ paths:
     /v1/messages/{messageId}:
         get:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             operationId: Messaging_GetMessage
             parameters:
                 - name: messageId
@@ -165,7 +165,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         post:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             operationId: Messaging_CreateMessage
             parameters:
                 - name: messageId
@@ -194,7 +194,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         patch:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             operationId: Messaging_UpdateMessage
             parameters:
                 - name: messageId
@@ -337,7 +337,7 @@ paths:
     /v1/messages:csv:
         get:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             description: |-
                 OpenAPI does not allow requestBody in GET operations.
                  But it should not convert it to query params either.
@@ -355,7 +355,7 @@ paths:
                                 $ref: '#/components/schemas/google.rpc.Status'
         post:
             tags:
-                - Messaging
+                - tests.protobuftypes.message.v1.Messaging
             operationId: Messaging_CreateMessagesFromCSV
             requestBody:
                 content:
@@ -514,4 +514,4 @@ components:
                         type: integer
                         format: int32
 tags:
-    - name: Messaging
+    - name: tests.protobuftypes.message.v1.Messaging

cmd/protoc-gen-openapi/examples/tests/rpctypes/openapi_fq_schema_naming.yaml

@@ -3,13 +3,13 @@
 
 openapi: 3.0.3
 info:
-    title: Status API
+    title: tests.rpctypes.message.v1.Status API
     version: 0.0.1
 paths:
     /v1/status:
         get:
             tags:
-                - Status
+                - tests.rpctypes.message.v1.Status
             operationId: Status_GetStatus
             responses:
                 "200":
@@ -51,4 +51,4 @@ components:
                     description: A list of messages that carry the error details.  There is a common set of message types for APIs to use.
             description: 'The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details. You can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors).'
 tags:
-    - name: Status
+    - name: tests.rpctypes.message.v1.Status