fix(AIP-123): skip resource-pattern-plural when there is no plural (#…

…1409)
googleapis · Jul 31, 2024 · 93a601d · 93a601d
1 parent deb3983
commit 93a601d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/rules/aip0123/resource_pattern_plural.go b/rules/aip0123/resource_pattern_plural.go
@@ -28,7 +28,7 @@ import (
 var resourcePatternPlural = &lint.MessageRule{
 	Name: lint.NewRuleName(123, "resource-pattern-plural"),
 	OnlyIf: func(m *desc.MessageDescriptor) bool {
-		return utils.IsResource(m) && len(utils.GetResource(m).GetPattern()) > 0 && !utils.IsSingletonResource(m)
+		return utils.IsResource(m) && len(utils.GetResource(m).GetPattern()) > 0 && utils.GetResourcePlural(utils.GetResource(m)) != "" && !utils.IsSingletonResource(m)
 	},
 	LintMessage: func(m *desc.MessageDescriptor) []lint.Problem {
 		var problems []lint.Problem

diff --git a/rules/aip0123/resource_pattern_plural_test.go b/rules/aip0123/resource_pattern_plural_test.go
@@ -106,3 +106,23 @@ func TestResourcePatternPluralNested(t *testing.T) {
 		})
 	}
 }
+
+func TestResourcePatternPluralSkipNoPlural(t *testing.T) {
+	f := testutils.ParseProto3String(t, `
+		import "google/api/resource.proto";
+
+		message BookShelf {
+			option (google.api.resource) = {
+				type: "library.googleapis.com/BookShelf"
+				singular: "bookShelf"
+				plural: ""
+				pattern: "shelves/{shelf}/missingPlural/{book_shelf}"
+			};
+			string name = 1;
+		}
+	`)
+	findings := resourcePatternPlural.Lint(f)
+	if got, want := len(findings), 0; got != want {
+		t.Errorf("expected %d findings, got %d: %v", want, got, findings)
+	}
+}