Upgrade protobuf and Generate OpenAPI v3 responseBody content examples (#242)

* Generate OpenAPI v3 responseBody content examples
* Add google protobuf files
* Fix protoc-gen-openapi plugin tests
* Upgrade to newest protobuf versions
* Upgrade github.com/golang/protobuf
v1.5.1 -> v1.5.2
* Remove unnecessary path.Clean
* Enable generation of properties name value of type Any
This reverts the manual edit of OpenAPIv3.go and ensures that it is automatically generated.
It also adds Value for NamedAny.
* Add newly generated files
The new formatting in .proto files is done by a generator
* Move Google .proto files dir into "third_party"
From ./google -> ./third_party/google
Also add include path for protoc calls in:
COMPILE-PROTOS.sh
apps/protoc-gen-openapi/plugin_test.go
* Manually patch OpenAPI v3 proto file and re-generate pb file
This is needed to keep the original field numbers to maintain compatibility

Author: morphar

COMPILE-PROTOS.sh

@@ -17,11 +17,11 @@
 
 go get github.com/golang/protobuf/protoc-gen-go
 
-protoc --go_out=. openapiv2/OpenAPIv2.proto
-protoc --go_out=. openapiv3/OpenAPIv3.proto
-protoc --go_out=. discovery/discovery.proto
-protoc --go_out=. plugins/plugin.proto
-protoc --go_out=. extensions/extension.proto
-protoc --go_out=. surface/surface.proto
-protoc --go_out=. metrics/vocabulary.proto
-protoc --go_out=. metrics/complexity.proto
+protoc -I . -I ./third_party --go_out=. openapiv2/OpenAPIv2.proto
+protoc -I . -I ./third_party --go_out=. openapiv3/OpenAPIv3.proto
+protoc -I . -I ./third_party --go_out=. discovery/discovery.proto
+protoc -I . -I ./third_party --go_out=. plugins/plugin.proto
+protoc -I . -I ./third_party --go_out=. extensions/extension.proto
+protoc -I . -I ./third_party --go_out=. surface/surface.proto
+protoc -I . -I ./third_party --go_out=. metrics/vocabulary.proto
+protoc -I . -I ./third_party --go_out=. metrics/complexity.proto

apps/protoc-gen-openapi/plugin_test.go

@@ -24,6 +24,8 @@ func TestLibraryOpenAPI(t *testing.T) {
 	var err error
 	// Run protoc and the protoc-gen-openapi plugin to generate an OpenAPI spec.
 	err = exec.Command("protoc",
+		"-I", "../../",
+		"-I", "../../third_party",
 		"-I", "examples",
 		"examples/google/example/library/v1/library.proto",
 		"--openapi_out=.").Run()
@@ -45,6 +47,8 @@ func TestBodyMappingOpenAPI(t *testing.T) {
 	var err error
 	// Run protoc and the protoc-gen-openapi plugin to generate an OpenAPI spec.
 	err = exec.Command("protoc",
+		"-I", "../../",
+		"-I", "../../third_party",
 		"-I", "examples",
 		"examples/tests/bodymapping/message.proto",
 		"--openapi_out=.").Run()

discovery/discovery.pb.go

@@ -42,7 +42,7 @@ option java_package = "org.discovery_v1";
 option objc_class_prefix = "OAS";
 
 // The Go package name.
-option go_package = "discovery;discovery_v1";
+option go_package = "./discovery;discovery_v1";
 
 message Annotations {
   repeated string required = 1;

discovery/discovery.proto

@@ -38,10 +38,11 @@ option java_package = "org.gnostic.v1";
 // 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 = "GNX"; // "Gnostic Extension"
+// "Gnostic Extension"
+option objc_class_prefix = "GNX";
 
 // The Go package name.
-option go_package = "extensions;gnostic_extension_v1";
+option go_package = "./extensions;gnostic_extension_v1";
 
 // The version number of Gnostic.
 message Version {

extensions/extension.pb.go

@@ -812,7 +812,7 @@ func (domain *Domain) generateToRawInfoMethodForType(code *printer.Code, typeNam
 				}
 			default:
 				propertyName := propertyModel.Name
-				if propertyName == "value" {
+				if propertyName == "value" && propertyModel.Type != "Any" {
 					code.Print("// %+v", propertyModel)
 				} else if !propertyModel.Repeated {
 					code.PrintIf(isRequired, "// always include this required field.")

extensions/extension.proto

@@ -254,7 +254,7 @@ func generateExtension(schemaFile string, outDir string) error {
 		},
 		ProtoOption{
 			Name:    "go_package",
-			Value:   ".;" + strings.ToLower(protoPackage),
+			Value:   "./;" + strings.ToLower(protoPackage),
 			Comment: "// The Go package path.",
 		},
 	)

generate-gnostic/generate-compiler.go

@@ -84,7 +84,7 @@ func protoOptions(directoryName string, packageName string) []ProtoOption {
 
 		ProtoOption{
 			Name:    "go_package",
-			Value:   directoryName + ";" + packageName,
+			Value:   "./" + directoryName + ";" + packageName,
 			Comment: "// The Go package name.",
 		},
 	}

generate-gnostic/generate-extension.go

@@ -3,14 +3,13 @@ module github.com/googleapis/gnostic
 go 1.12
 
 require (
+	github.com/davecgh/go-spew v1.1.1
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0
 	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154
-	google.golang.org/protobuf v1.24.0
+	google.golang.org/protobuf v1.26.0
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
-	gopkg.in/yaml.v2 v2.2.2
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )