fix(gazelle): generate target names from proto file name, not directory

gazelle/buf/buf_test.go

@@ -65,6 +65,11 @@ func TestCrossResolve(t *testing.T) {
 	testRunGazelle(t, "v2/cross_resolve")
 }
 
+func TestCrossResolveOverride(t *testing.T) {
+	t.Parallel()
+	testRunGazelle(t, "cross_resolve_override")
+}
+
 func TestMerge(t *testing.T) {
 	t.Parallel()
 	testRunGazelle(t, "merge")

gazelle/buf/cross_resolve.go

@@ -16,10 +16,10 @@ package buf
 
 import (
 	"path"
+	"strings"
 
 	"github.com/bazelbuild/bazel-gazelle/config"
 	"github.com/bazelbuild/bazel-gazelle/label"
-	"github.com/bazelbuild/bazel-gazelle/language/proto"
 	"github.com/bazelbuild/bazel-gazelle/resolve"
 )
 
@@ -33,11 +33,30 @@ func (*bufLang) CrossResolve(gazelleConfig *config.Config, ruleIndex *resolve.Ru
 	if langWithDep != "proto" || importSpec.Lang != "proto" {
 		return nil
 	}
-	config := GetConfigForGazelleConfig(gazelleConfig)
-	depRepo := getRepoNameForPath(config.BufConfigFile.Pkg)
+
+	// First, check for gazelle:resolve buf directives
+	// This allows users to override the default buf_deps resolution
+	// Example: # gazelle:resolve buf proto/foo/bar.proto @com_example//proto/foo:bar_proto
+	bufImportSpec := resolve.ImportSpec{
+		Lang: "buf",
+		Imp:  importSpec.Imp,
+	}
+	if override, ok := resolve.FindRuleWithOverride(gazelleConfig, bufImportSpec, "buf"); ok {
+		return []resolve.FindResult{{Label: override}}
+	}
+
+	// Fall back to default buf_deps resolution
+	bufConfig := GetConfigForGazelleConfig(gazelleConfig)
+	depRepo := getRepoNameForPath(bufConfig.BufConfigFile.Pkg)
+
+	// Generate target name from the proto file name, not the directory name
+	// e.g., "nmts/v1/proto/ek/logical/interface.proto" -> "interface_proto"
+	protoFile := path.Base(importSpec.Imp)
+	targetName := strings.TrimSuffix(protoFile, ".proto") + "_proto"
+
 	return []resolve.FindResult{
 		{
-			Label: label.New(depRepo, path.Dir(importSpec.Imp), proto.RuleName(path.Dir(importSpec.Imp))),
+			Label: label.New(depRepo, path.Dir(importSpec.Imp), targetName),
 		},
 	}
 }

gazelle/buf/testdata/cross_resolve_override/buf.work.yaml

@@ -0,0 +1,4 @@
+version: v1
+directories:
+  - fooapis
+  - petapis

gazelle/buf/testdata/cross_resolve_override/fooapis/BUILD.in

@@ -0,0 +1 @@
+# gazelle:buf_breaking_against //:against_file

gazelle/buf/testdata/cross_resolve_override/fooapis/BUILD.out

@@ -0,0 +1,10 @@
+load("@rules_buf//buf:defs.bzl", "buf_breaking_test")
+
+# gazelle:buf_breaking_against //:against_file
+
+buf_breaking_test(
+    name = "buf_breaking",
+    against = "//:against_file",
+    config = "//fooapis:buf.yaml",
+    targets = ["//fooapis/foo/v1:foo_v1_proto"],
+)

gazelle/buf/testdata/cross_resolve_override/fooapis/buf.yaml

@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

gazelle/buf/testdata/cross_resolve_override/fooapis/foo/v1/BUILD.out

@@ -0,0 +1,15 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_buf//buf:defs.bzl", "buf_lint_test")
+
+proto_library(
+    name = "foo_v1_proto",
+    srcs = ["foo.proto"],
+    strip_import_prefix = "/fooapis",
+    visibility = ["//visibility:public"],
+)
+
+buf_lint_test(
+    name = "foo_v1_proto_lint",
+    config = "//fooapis:buf.yaml",
+    targets = [":foo_v1_proto"],
+)

gazelle/buf/testdata/cross_resolve_override/fooapis/foo/v1/foo.proto

@@ -0,0 +1,5 @@
+syntax = "proto3";
+
+package foo.v1;
+
+message Foo {}

gazelle/buf/testdata/cross_resolve_override/petapis/BUILD.in

@@ -0,0 +1,2 @@
+# gazelle:buf_breaking_against //:against_file
+# gazelle:resolve buf validate/validate.proto @custom_validate//validate:validate_proto

gazelle/buf/testdata/cross_resolve_override/petapis/BUILD.out

@@ -0,0 +1,11 @@
+load("@rules_buf//buf:defs.bzl", "buf_breaking_test")
+
+# gazelle:buf_breaking_against //:against_file
+# gazelle:resolve buf validate/validate.proto @custom_validate//validate:validate_proto
+
+buf_breaking_test(
+    name = "buf_breaking",
+    against = "//:against_file",
+    config = "//petapis:buf.yaml",
+    targets = ["//petapis/pets/v1:pets_v1_proto"],
+)

gazelle/buf/testdata/cross_resolve_override/petapis/buf.yaml

@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

gazelle/buf/testdata/cross_resolve_override/petapis/pets/v1/BUILD.out

@@ -0,0 +1,19 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_buf//buf:defs.bzl", "buf_lint_test")
+
+proto_library(
+    name = "pets_v1_proto",
+    srcs = ["pets.proto"],
+    strip_import_prefix = "/petapis",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//fooapis/foo/v1:foo_v1_proto",
+        "@custom_validate//validate:validate_proto",
+    ],
+)
+
+buf_lint_test(
+    name = "pets_v1_proto_lint",
+    config = "//petapis:buf.yaml",
+    targets = [":pets_v1_proto"],
+)

gazelle/buf/testdata/cross_resolve_override/petapis/pets/v1/pets.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package pets.v1;
+
+import "foo/v1/foo.proto";
+import "validate/validate.proto";
+
+message Pet {
+  foo.v1.Foo foo = 1;
+}