Fix snake_case for plural resource name (#569)

googleapis · Jun 19, 2020 · 3cf71fe · 3cf71fe
1 parent cf5dd14
commit 3cf71fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rules/aip0136/http_parent_variable.go b/rules/aip0136/http_parent_variable.go
@@ -37,8 +37,8 @@ var httpParentVariable = &lint.MethodRule{
 			if _, ok := vars["parent"]; ok {
 				// Determine the resource.
 				segs := strings.Split(strings.Split(http.GetPlainURI(), ":")[0], "/")
-				plural := segs[len(segs)-1]
-				singular := strcase.SnakeCase(p.Singular(plural))
+				plural := strcase.SnakeCase(segs[len(segs)-1])
+				singular := p.Singular(plural)
 
 				// Does the RPC name end in the singular or plural name of the resource?
 				// If not, complain.

diff --git a/rules/aip0136/http_parent_variable_test.go b/rules/aip0136/http_parent_variable_test.go
@@ -34,6 +34,7 @@ func TestHTTPParentVariable(t *testing.T) {
 		{"ValidBookVar", "WritePage", "/v1/{book=publishers/*/books/*}:writePage", testutils.Problems{}},
 		{"ValidBatchGet", "BatchGetBooks", "/v1/{parent=publishers/*}/books:batchGet", testutils.Problems{}},
 		{"ValidBatchCreate", "BatchCreateBooks", "/v1/{parent=publishers/*}/books:batchCreate", testutils.Problems{}},
+		{"ValidTwoWordNounBatch", "BatchUpdateAudioBooks", "/v1/{parent=publishers/*}/audioBooks:batchUpdate", testutils.Problems{}},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			f := testutils.ParseProto3Tmpl(t, `