Remove extensions from Schema

As they are already included in JSONSchema
grpc-ecosystem · Nov 16, 2021 · 615922e · 615922e
1 parent b0e52fa
commit 615922e
Show file tree

Hide file tree

Showing 28 changed files with 828 additions and 858 deletions.
diff --git a/examples/internal/helloworld/helloworld.pb.go b/examples/internal/helloworld/helloworld.pb.go
diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.pb.go b/examples/internal/proto/examplepb/a_bit_of_everything.pb.go
diff --git a/examples/internal/proto/examplepb/a_bit_of_everything.proto b/examples/internal/proto/examplepb/a_bit_of_everything.proto
@@ -237,18 +237,18 @@ message ABitOfEverything {
 			title: "A bit of everything"
 			description: "Intentionaly complicated message type to cover many features of Protobuf."
 			required: ["uuid", "int64_value", "double_value"]
+			extensions: {
+				key: "x-a-bit-of-everything-foo";
+				value {
+					string_value: "bar";
+				}
+			}
 		}
 		external_docs: {
 			url: "https://github.com/grpc-ecosystem/grpc-gateway";
 			description: "Find out more about ABitOfEverything";
 		}
 		example: "{\"int64_value\": 12, \"double_value\": 12.3}"
-		extensions: {
-            key: "x-a-bit-of-everything-foo";
-            value {
-                string_value: "bar";
-            }
-        }
 	};
 
 	// Nested is nested type.

diff --git a/examples/internal/proto/examplepb/echo_service.pb.go b/examples/internal/proto/examplepb/echo_service.pb.go
diff --git a/examples/internal/proto/examplepb/flow_combination.pb.go b/examples/internal/proto/examplepb/flow_combination.pb.go
diff --git a/examples/internal/proto/examplepb/generate_unbound_methods.pb.go b/examples/internal/proto/examplepb/generate_unbound_methods.pb.go
diff --git a/examples/internal/proto/examplepb/non_standard_names.pb.go b/examples/internal/proto/examplepb/non_standard_names.pb.go
diff --git a/examples/internal/proto/examplepb/openapi_merge_a.pb.go b/examples/internal/proto/examplepb/openapi_merge_a.pb.go
diff --git a/examples/internal/proto/examplepb/openapi_merge_b.pb.go b/examples/internal/proto/examplepb/openapi_merge_b.pb.go
diff --git a/examples/internal/proto/examplepb/response_body_service.pb.go b/examples/internal/proto/examplepb/response_body_service.pb.go
diff --git a/examples/internal/proto/examplepb/stream.pb.go b/examples/internal/proto/examplepb/stream.pb.go
diff --git a/examples/internal/proto/examplepb/unannotated_echo_service.pb.go b/examples/internal/proto/examplepb/unannotated_echo_service.pb.go
diff --git a/examples/internal/proto/examplepb/use_go_template.pb.go b/examples/internal/proto/examplepb/use_go_template.pb.go
diff --git a/examples/internal/proto/examplepb/wrappers.pb.go b/examples/internal/proto/examplepb/wrappers.pb.go
diff --git a/examples/internal/proto/pathenum/path_enum.pb.go b/examples/internal/proto/pathenum/path_enum.pb.go
diff --git a/examples/internal/proto/sub/message.pb.go b/examples/internal/proto/sub/message.pb.go
diff --git a/examples/internal/proto/sub2/message.pb.go b/examples/internal/proto/sub2/message.pb.go
diff --git a/internal/descriptor/apiconfig/apiconfig.pb.go b/internal/descriptor/apiconfig/apiconfig.pb.go
diff --git a/internal/descriptor/openapiconfig/openapiconfig.pb.go b/internal/descriptor/openapiconfig/openapiconfig.pb.go
diff --git a/protoc-gen-openapiv2/internal/genopenapi/template.go b/protoc-gen-openapiv2/internal/genopenapi/template.go
@@ -2269,14 +2269,6 @@ func openapiSchemaFromProtoSchema(s *openapi_options.Schema, reg *descriptor.Reg
 		ret.Example = json.RawMessage(s.Example)
 	}
 
-	if s != nil && s.Extensions != nil {
-		exts, err := processExtensions(s.Extensions)
-		if err != nil {
-			panic(err)
-		}
-		ret.extensions = exts
-	}
-
 	return ret
 }
 

diff --git a/protoc-gen-openapiv2/internal/genopenapi/template_test.go b/protoc-gen-openapiv2/internal/genopenapi/template_test.go
@@ -1404,8 +1404,10 @@ func TestApplyTemplateExtensions(t *testing.T) {
 		},
 	}
 	openapiSchema := openapi_options.Schema{
-		Extensions: map[string]*structpb.Value{
-			"x-schema-foo": {Kind: &structpb.Value_StringValue{StringValue: "baz"}},
+		JsonSchema: &openapi_options.JSONSchema{
+			Extensions: map[string]*structpb.Value{
+				"x-schema-foo": {Kind: &structpb.Value_StringValue{StringValue: "baz"}},
+			},
 		},
 	}
 	verifyTemplateExtensions := func(t *testing.T, reg *descriptor.Registry, file *descriptor.File,

diff --git a/protoc-gen-openapiv2/options/annotations.pb.go b/protoc-gen-openapiv2/options/annotations.pb.go