fix(openapi): attempt grpc-ecosystem#2 at generating correct schema d…

…efinition for google.protobuf.Any

examples/internal/clients/abe/api/swagger.yaml

@@ -2862,10 +2862,8 @@ definitions:
       status:
         code: 0
         details:
-        - typeUrl: "typeUrl"
-          value: "value"
-        - typeUrl: "typeUrl"
-          value: "value"
+        - '@type': "@type"
+        - '@type': "@type"
         message: "message"
   examplepbErrorObject:
     type: "object"
@@ -2919,7 +2917,7 @@ definitions:
   protobufAny:
     type: "object"
     properties:
-      typeUrl:
+      '@type':
         type: "string"
         description: "A URL/resource name that uniquely identifies the type of the\
           \ serialized\nprotocol buffer message. This string must contain at least\n\
@@ -2940,12 +2938,6 @@ definitions:
           \ release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\
           \nSchemes other than `http`, `https` (or the empty scheme) might be\nused\
           \ with implementation specific semantics."
-      value:
-        type: "string"
-        format: "byte"
-        description: "Must be a valid serialized protocol buffer of the above specified\
-          \ type."
-        pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$"
     description: "`Any` contains an arbitrary serialized protocol buffer message along\
       \ with a\nURL that describes the type of the serialized message.\n\nProtobuf\
       \ library provides support to pack/unpack Any values in the form\nof utility\
@@ -2975,8 +2967,7 @@ definitions:
       \n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n\
       \      \"value\": \"1.212s\"\n    }"
     example:
-      typeUrl: "typeUrl"
-      value: "value"
+      '@type': "@type"
   rpcStatus:
     type: "object"
     properties:
@@ -3004,10 +2995,8 @@ definitions:
     example:
       code: 0
       details:
-      - typeUrl: "typeUrl"
-        value: "value"
-      - typeUrl: "typeUrl"
-        value: "value"
+      - '@type': "@type"
+      - '@type': "@type"
       message: "message"
   subStringMessage:
     type: "object"

examples/internal/clients/abe/model_protobuf_any.go

@@ -13,7 +13,5 @@ package abe
 // `Any` contains an arbitrary serialized protocol buffer message along with a URL that describes the type of the serialized message.  Protobuf library provides support to pack/unpack Any values in the form of utility functions or additional generated methods of the Any type.  Example 1: Pack and unpack a message in C++.      Foo foo = ...;     Any any;     any.PackFrom(foo);     ...     if (any.UnpackTo(&foo)) {       ...     }  Example 2: Pack and unpack a message in Java.      Foo foo = ...;     Any any = Any.pack(foo);     ...     if (any.is(Foo.class)) {       foo = any.unpack(Foo.class);     }   Example 3: Pack and unpack a message in Python.      foo = Foo(...)     any = Any()     any.Pack(foo)     ...     if any.Is(Foo.DESCRIPTOR):       any.Unpack(foo)       ...   Example 4: Pack and unpack a message in Go       foo := &pb.Foo{...}      any, err := anypb.New(foo)      if err != nil {        ...      }      ...      foo := &pb.Foo{}      if err := any.UnmarshalTo(foo); err != nil {        ...      }  The pack methods provided by protobuf library will by default use 'type.googleapis.com/full.type.name' as the type URL and the unpack methods only use the fully qualified type name after the last '/' in the type URL, for example \"foo.bar.com/x/y.z\" will yield type name \"y.z\".   JSON ==== The JSON representation of an `Any` value uses the regular representation of the deserialized, embedded message, with an additional field `@type` which contains the type URL. Example:      package google.profile;     message Person {       string first_name = 1;       string last_name = 2;     }      {       \"@type\": \"type.googleapis.com/google.profile.Person\",       \"firstName\": <string>,       \"lastName\": <string>     }  If the embedded message type is well-known and has a custom JSON representation, that representation will be embedded adding a field `value` which holds the custom JSON in addition to the `@type` field. Example (for message [google.protobuf.Duration][]):      {       \"@type\": \"type.googleapis.com/google.protobuf.Duration\",       \"value\": \"1.212s\"     }
 type ProtobufAny struct {
 	// A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted).  In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows:  * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][]   value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the   URL, or have them precompiled into a binary to avoid any   lookup. Therefore, binary compatibility needs to be preserved   on changes to types. (Use versioned type names to manage   breaking changes.)  Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com.  Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics.
-	TypeUrl string `json:"typeUrl,omitempty"`
-	// Must be a valid serialized protocol buffer of the above specified type.
-	Value string `json:"value,omitempty"`
+	Type_ string `json:"@type,omitempty"`
 }

examples/internal/clients/echo/api/swagger.yaml

@@ -523,7 +523,7 @@ definitions:
   protobufAny:
     type: "object"
     properties:
-      typeUrl:
+      '@type':
         type: "string"
         description: "A URL/resource name that uniquely identifies the type of the\
           \ serialized\nprotocol buffer message. This string must contain at least\n\
@@ -544,12 +544,6 @@ definitions:
           \ release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\
           \nSchemes other than `http`, `https` (or the empty scheme) might be\nused\
           \ with implementation specific semantics."
-      value:
-        type: "string"
-        format: "byte"
-        description: "Must be a valid serialized protocol buffer of the above specified\
-          \ type."
-        pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$"
     description: "`Any` contains an arbitrary serialized protocol buffer message along\
       \ with a\nURL that describes the type of the serialized message.\n\nProtobuf\
       \ library provides support to pack/unpack Any values in the form\nof utility\

examples/internal/clients/echo/model_protobuf_any.go

@@ -12,7 +12,5 @@ package echo
 // `Any` contains an arbitrary serialized protocol buffer message along with a URL that describes the type of the serialized message.  Protobuf library provides support to pack/unpack Any values in the form of utility functions or additional generated methods of the Any type.  Example 1: Pack and unpack a message in C++.      Foo foo = ...;     Any any;     any.PackFrom(foo);     ...     if (any.UnpackTo(&foo)) {       ...     }  Example 2: Pack and unpack a message in Java.      Foo foo = ...;     Any any = Any.pack(foo);     ...     if (any.is(Foo.class)) {       foo = any.unpack(Foo.class);     }   Example 3: Pack and unpack a message in Python.      foo = Foo(...)     any = Any()     any.Pack(foo)     ...     if any.Is(Foo.DESCRIPTOR):       any.Unpack(foo)       ...   Example 4: Pack and unpack a message in Go       foo := &pb.Foo{...}      any, err := anypb.New(foo)      if err != nil {        ...      }      ...      foo := &pb.Foo{}      if err := any.UnmarshalTo(foo); err != nil {        ...      }  The pack methods provided by protobuf library will by default use 'type.googleapis.com/full.type.name' as the type URL and the unpack methods only use the fully qualified type name after the last '/' in the type URL, for example \"foo.bar.com/x/y.z\" will yield type name \"y.z\".   JSON ==== The JSON representation of an `Any` value uses the regular representation of the deserialized, embedded message, with an additional field `@type` which contains the type URL. Example:      package google.profile;     message Person {       string first_name = 1;       string last_name = 2;     }      {       \"@type\": \"type.googleapis.com/google.profile.Person\",       \"firstName\": <string>,       \"lastName\": <string>     }  If the embedded message type is well-known and has a custom JSON representation, that representation will be embedded adding a field `value` which holds the custom JSON in addition to the `@type` field. Example (for message [google.protobuf.Duration][]):      {       \"@type\": \"type.googleapis.com/google.protobuf.Duration\",       \"value\": \"1.212s\"     }
 type ProtobufAny struct {
 	// A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted).  In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows:  * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][]   value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the   URL, or have them precompiled into a binary to avoid any   lookup. Therefore, binary compatibility needs to be preserved   on changes to types. (Use versioned type names to manage   breaking changes.)  Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com.  Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics.
-	TypeUrl string `json:"typeUrl,omitempty"`
-	// Must be a valid serialized protocol buffer of the above specified type.
-	Value string `json:"value,omitempty"`
+	Type_ string `json:"@type,omitempty"`
 }

examples/internal/clients/generateunboundmethods/api/swagger.yaml

@@ -101,12 +101,8 @@ definitions:
   protobufAny:
     type: "object"
     properties:
-      typeUrl:
+      '@type':
         type: "string"
-      value:
-        type: "string"
-        format: "byte"
-        pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$"
   rpcStatus:
     type: "object"
     properties:

examples/internal/clients/generateunboundmethods/docs/ProtobufAny.md

@@ -3,8 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**TypeUrl** | **string** |  | [optional] [default to null]
-**Value** | **string** |  | [optional] [default to null]
+**Type_** | **string** |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

examples/internal/clients/generateunboundmethods/model_protobuf_any.go

@@ -10,6 +10,5 @@
 package generateunboundmethods
 
 type ProtobufAny struct {
-	TypeUrl string `json:"typeUrl,omitempty"`
-	Value string `json:"value,omitempty"`
+	Type_ string `json:"@type,omitempty"`
 }

examples/internal/clients/responsebody/api/swagger.yaml

@@ -148,7 +148,7 @@ definitions:
   protobufAny:
     type: "object"
     properties:
-      typeUrl:
+      '@type':
         type: "string"
         description: "A URL/resource name that uniquely identifies the type of the\
           \ serialized\nprotocol buffer message. This string must contain at least\n\
@@ -169,12 +169,6 @@ definitions:
           \ release, and it is not used for type URLs beginning with\ntype.googleapis.com.\n\
           \nSchemes other than `http`, `https` (or the empty scheme) might be\nused\
           \ with implementation specific semantics."
-      value:
-        type: "string"
-        format: "byte"
-        description: "Must be a valid serialized protocol buffer of the above specified\
-          \ type."
-        pattern: "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$"
     description: "`Any` contains an arbitrary serialized protocol buffer message along\
       \ with a\nURL that describes the type of the serialized message.\n\nProtobuf\
       \ library provides support to pack/unpack Any values in the form\nof utility\
@@ -204,8 +198,7 @@ definitions:
       \n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n\
       \      \"value\": \"1.212s\"\n    }"
     example:
-      typeUrl: "typeUrl"
-      value: "value"
+      '@type': "@type"
   rpcStatus:
     type: "object"
     properties:
@@ -233,10 +226,8 @@ definitions:
     example:
       code: 0
       details:
-      - typeUrl: "typeUrl"
-        value: "value"
-      - typeUrl: "typeUrl"
-        value: "value"
+      - '@type': "@type"
+      - '@type': "@type"
       message: "message"
   Stream result of examplepbResponseBodyOut:
     properties:
@@ -250,8 +241,6 @@ definitions:
       error:
         code: 0
         details:
-        - typeUrl: "typeUrl"
-          value: "value"
-        - typeUrl: "typeUrl"
-          value: "value"
+        - '@type': "@type"
+        - '@type': "@type"
         message: "message"

examples/internal/clients/responsebody/docs/ProtobufAny.md

@@ -3,8 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**TypeUrl** | **string** | A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted).  In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows:  * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][]   value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the   URL, or have them precompiled into a binary to avoid any   lookup. Therefore, binary compatibility needs to be preserved   on changes to types. (Use versioned type names to manage   breaking changes.)  Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com.  Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics. | [optional] [default to null]
-**Value** | **string** | Must be a valid serialized protocol buffer of the above specified type. | [optional] [default to null]
+**Type_** | **string** | A URL/resource name that uniquely identifies the type of the serialized protocol buffer message. This string must contain at least one \"/\" character. The last segment of the URL's path must represent the fully qualified name of the type (as in `path/google.protobuf.Duration`). The name should be in a canonical form (e.g., leading \".\" is not accepted).  In practice, teams usually precompile into the binary all types that they expect it to use in the context of Any. However, for URLs which use the scheme `http`, `https`, or no scheme, one can optionally set up a type server that maps type URLs to message definitions as follows:  * If no scheme is provided, `https` is assumed. * An HTTP GET on the URL must yield a [google.protobuf.Type][]   value in binary format, or produce an error. * Applications are allowed to cache lookup results based on the   URL, or have them precompiled into a binary to avoid any   lookup. Therefore, binary compatibility needs to be preserved   on changes to types. (Use versioned type names to manage   breaking changes.)  Note: this functionality is not currently available in the official protobuf release, and it is not used for type URLs beginning with type.googleapis.com.  Schemes other than `http`, `https` (or the empty scheme) might be used with implementation specific semantics. | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)