fix: proto names + google.api query param paths

Author: sudorandom

Makefile

@@ -6,6 +6,7 @@ PROTO_FILES=$(shell find internal/converter/testdata -type f -name '*.proto')
 generate: $(PROTO_FILES)
 	@echo "Generating fixture descriptor set"
 	go generate ./...
+	go generate ./internal/converter/testdata
 
 test: generate
 	go test -coverprofile=coverage.out -coverpkg=./internal/...,./converter/... ./...

README.md

@@ -124,7 +124,11 @@ protoc-gen-connect-openapi also has support for the [OpenAPI v3 annotations](htt
 | with-streaming | - | Generate OpenAPI for client/server/bidirectional streaming RPCs (can be messy). |
 
 ### Contributing
-Contributions are accepted and welcome! Please make sure that all tests pass locally for you. You normally can use normal Go tooling to run tests but if you change any protobuf files in `internal/converter/testdata/`, you need to run `go generate ./...` to ensure the related DescriptorSet gets updated. This exists because it's the easiest way to pull in buf dependencies in a reliable way.
+Contributions are accepted and welcome! Please make sure that all tests pass locally for you. You normally can use normal Go tooling to run tests but if you change any protobuf files in `internal/converter/testdata/`, you need to run this command to ensure the related DescriptorSet gets updated:
+```
+go generate ./internal/converter/testdata
+```
+This exists because it's the easiest way to pull in buf dependencies in a reliable way.
 
 Otherwise, tests are run with:
 ```shell

internal/converter/converter_test.go

@@ -73,6 +73,7 @@ func generateAndCheckResult(t *testing.T, options, format, protofile string) str
 	// Call the conversion code!
 	resp, err := converter.ConvertFrom(bytes.NewBuffer(b))
 	require.NoError(t, err)
+	require.Nil(t, resp.Error)
 	require.Len(t, resp.File, 1)
 	file := resp.File[0]
 	assert.NotNil(t, file.Name)

internal/converter/googleapi/paths.go

@@ -246,15 +246,12 @@ func partsToOpenAPIPath(tokens []Token) string {
 	return b.String()
 }
 
-func flattenToParams(opts options.Options, md protoreflect.MessageDescriptor, jsonPrefix string, seen map[string]struct{}) []*v3.Parameter {
+func flattenToParams(opts options.Options, md protoreflect.MessageDescriptor, prefix string, seen map[string]struct{}) []*v3.Parameter {
 	params := []*v3.Parameter{}
 	fields := md.Fields()
 	for i := 0; i < fields.Len(); i++ {
 		field := fields.Get(i)
-		paramName := jsonPrefix + string(field.JSONName())
-		if opts.WithProtoNames {
-			paramName = string(field.Name())
-		}
+		paramName := prefix + util.MakeFieldName(opts, field)
 		// exclude fields already found in the path
 		if _, ok := seen[string(field.FullName())]; ok {
 			continue

internal/converter/testdata/fileset.binpb

@@ -0,0 +1,39 @@
+syntax = "proto3";
+
+package proto_names.io.swagger.petstore.v2;
+
+import "google/api/annotations.proto";
+import "google/protobuf/empty.proto";
+import "google/protobuf/field_mask.proto";
+
+service Foo {
+  rpc Foo(google.protobuf.Empty) returns (google.protobuf.Empty) {
+    option idempotency_level = NO_SIDE_EFFECTS;
+    option (google.api.http) = {get: "/.well-known/jwks.json"};
+  }
+  rpc Foo2(Foo2Request) returns (Foo2Response) {
+    option (google.api.http).get = "/v1/{property_in_path_ok}/{parentMsg.property_in_path}/foo";
+  }
+
+  rpc Masky(MaskyRequest) returns (google.protobuf.Empty) {}
+
+  rpc NamedPathPatterns(Something) returns (google.protobuf.Empty) {
+    option (google.api.http).get = "/v1/{property_in_path=messages/*}";
+  }
+}
+
+message MaskyRequest {
+  google.protobuf.FieldMask fields = 1;
+}
+
+message Foo2Request {
+  string property_in_path_ok = 1;
+  Something parentMsg = 2;
+  string property_in_query_ok = 3;
+}
+message Something {
+  string property_in_path = 1;
+  string property_in_query = 2;
+}
+
+message Foo2Response {}