Move bzl ext (#265)

* Move Gazelle extension to //gazelle/bzl and change package name

This fixes an issue with importing bazel-skylib into
google3. Currently, Glaze (internal Go build file generator) attempts
to generate a target (//gazelle:gazelle) that conflicts with one
that's already declared here.

I think the right solution is actually to move the package into a
subdirectory. In the future (bazelbuild/bazel-gazelle#5), Gazelle's Go
extension will generate target names similar to what Glaze does, so
the same conflict will happen in open source. I think it's also
logical to have a directory of packages in case more need to be added
in the future, and for the extension to have a package name matching
the language it works with.

This is an incompatible change, but the //gazelle directory isn't part
of a tagged release yet, so hopefully it won't break anyone.

* fix runfiles access in test

* Fix gazelle package names.

Co-authored-by: Jay Conrod <jayconrod@google.com>

49 files changed, 12 insertions, 9 deletions

diff --git a/gazelle/BUILD b/gazelle/bzl/BUILD
index d20212c..fea1d51 100644
--- a/gazelle/BUILD
+++ b/gazelle/bzl/BUILD
@@ -4,7 +4,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
 # gazelle:exclude testdata
 
 go_library(
-    name = "go_default_library",
+    name = "bzl",
     srcs = ["gazelle.go"],
     importpath = "github.com/bazelbuild/bazel-skylib/gazelle",
     visibility = ["//visibility:public"],
@@ -21,14 +21,14 @@ go_library(
 )
 
 go_test(
-    name = "go_default_test",
+    name = "bzl_test",
     srcs = ["gazelle_test.go"],
     data = [
         ":gazelle-skylib",
     ] + glob([
         "testdata/**",
     ]),
-    embed = [":go_default_library"],
+    embed = [":bzl"],
     deps = [
         "@bazel_gazelle//testtools:go_default_library",
         "@io_bazel_rules_go//go/tools/bazel:go_default_library",
@@ -39,7 +39,7 @@ go_test(
 # extension and thus only has the skylib language installed.
 gazelle_binary(
     name = "gazelle-skylib",
-    languages = [":go_default_library"],
+    languages = [":bzl"],
     visibility = [
         # Also make the binary available in the root of the repo for use, but
         # not externally.
diff --git a/gazelle/README.md b/gazelle/bzl/README.md
index 8b7cb7b..8b7cb7b 100644
--- a/gazelle/README.md
+++ b/gazelle/bzl/README.md
diff --git a/gazelle/gazelle.go b/gazelle/bzl/gazelle.go
index b45ef3d..f948390 100644
--- a/gazelle/gazelle.go
+++ b/gazelle/bzl/gazelle.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package gazelle generates a `bzl_library` target for every `.bzl` file in
+// Package bzl generates a `bzl_library` target for every `.bzl` file in
 // each package.
 //
 // The `bzl_library` rule is provided by
@@ -21,7 +21,7 @@ limitations under the License.
 //
 // This extension is experimental and subject to change. It is not included
 // in the default Gazelle binary.
-package gazelle
+package bzl
 
 import (
 	"flag"
diff --git a/gazelle/gazelle_test.go b/gazelle/bzl/gazelle_test.go
index a22f7f6..e4f59e8 100644
--- a/gazelle/gazelle_test.go
+++ b/gazelle/bzl/gazelle_test.go
@@ -1,4 +1,4 @@
-package gazelle
+package bzl
 
 /* Copyright 2020 The Bazel Authors. All rights reserved.
 
@@ -29,7 +29,7 @@ import (
 
 var gazellePath = findGazelle()
 
-const testDataPath = "gazelle/testdata/"
+const testDataPath = "gazelle/bzl/testdata/"
 
 // TestGazelleBinary runs a gazelle binary with starlib installed on each
 // directory in `testdata/*`. Please see `testdata/README.md` for more
@@ -54,6 +54,9 @@ func TestGazelleBinary(t *testing.T) {
 			tests[parts[0]] = append(tests[parts[0]], f)
 		}
 	}
+	if len(tests) == 0 {
+		t.Fatal("no tests found")
+	}
 
 	for testName, files := range tests {
 		testPath(t, testName, files)
@@ -132,7 +135,7 @@ func testPath(t *testing.T, name string, files []bazel.RunfileEntry) {
 }
 
 func findGazelle() string {
-	gazellePath, ok := bazel.FindBinary("gazelle", "gazelle-skylib")
+	gazellePath, ok := bazel.FindBinary("gazelle/bzl", "gazelle-skylib")
 	if !ok {
 		panic("could not find gazelle binary")
 	}
diff --git a/gazelle/testdata/README.md b/gazelle/bzl/testdata/README.md
index a6a3603..a6a3603 100644
--- a/gazelle/testdata/README.md
+++ b/gazelle/bzl/testdata/README.md
diff --git a/gazelle/testdata/defaultvisibility/BUILD.in b/gazelle/bzl/testdata/defaultvisibility/BUILD.in
index e69de29..e69de29 100644
--- a/gazelle/testdata/defaultvisibility/BUILD.in
+++ b/gazelle/bzl/testdata/defaultvisibility/BUILD.in
diff --git a/gazelle/testdata/defaultvisibility/BUILD.out b/gazelle/bzl/testdata/defaultvisibility/BUILD.out
index 44c1495..44c1495 100644
--- a/gazelle/testdata/defaultvisibility/BUILD.out
+++ b/gazelle/bzl/testdata/defaultvisibility/BUILD.out
diff --git a/gazelle/testdata/defaultvisibility/WORKSPACE b/gazelle/bzl/testdata/defaultvisibility/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/defaultvisibility/WORKSPACE
+++ b/gazelle/bzl/testdata/defaultvisibility/WORKSPACE
diff --git a/gazelle/testdata/defaultvisibility/foo.bzl b/gazelle/bzl/testdata/defaultvisibility/foo.bzl
index 1191303..1191303 100644
--- a/gazelle/testdata/defaultvisibility/foo.bzl
+++ b/gazelle/bzl/testdata/defaultvisibility/foo.bzl
diff --git a/gazelle/testdata/defaultvisibility/nested/dir/BUILD.in b/gazelle/bzl/testdata/defaultvisibility/nested/dir/BUILD.in
index 830932a..830932a 100644
--- a/gazelle/testdata/defaultvisibility/nested/dir/BUILD.in
+++ b/gazelle/bzl/testdata/defaultvisibility/nested/dir/BUILD.in
diff --git a/gazelle/testdata/defaultvisibility/nested/dir/BUILD.out b/gazelle/bzl/testdata/defaultvisibility/nested/dir/BUILD.out
index 8394b9c..8394b9c 100644
--- a/gazelle/testdata/defaultvisibility/nested/dir/BUILD.out
+++ b/gazelle/bzl/testdata/defaultvisibility/nested/dir/BUILD.out
diff --git a/gazelle/testdata/defaultvisibility/nested/dir/bar.bzl b/gazelle/bzl/testdata/defaultvisibility/nested/dir/bar.bzl
index 8ab1fcb..8ab1fcb 100644
--- a/gazelle/testdata/defaultvisibility/nested/dir/bar.bzl
+++ b/gazelle/bzl/testdata/defaultvisibility/nested/dir/bar.bzl
diff --git a/gazelle/testdata/empty/BUILD.in b/gazelle/bzl/testdata/empty/BUILD.in
index e1e154c..e1e154c 100644
--- a/gazelle/testdata/empty/BUILD.in
+++ b/gazelle/bzl/testdata/empty/BUILD.in
diff --git a/gazelle/testdata/empty/BUILD.out b/gazelle/bzl/testdata/empty/BUILD.out
index ac0e990..ac0e990 100644
--- a/gazelle/testdata/empty/BUILD.out
+++ b/gazelle/bzl/testdata/empty/BUILD.out
diff --git a/gazelle/testdata/empty/WORKSPACE b/gazelle/bzl/testdata/empty/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/empty/WORKSPACE
+++ b/gazelle/bzl/testdata/empty/WORKSPACE
diff --git a/gazelle/testdata/empty/foo.bzl b/gazelle/bzl/testdata/empty/foo.bzl
index e69de29..e69de29 100644
--- a/gazelle/testdata/empty/foo.bzl
+++ b/gazelle/bzl/testdata/empty/foo.bzl
diff --git a/gazelle/testdata/external/BUILD.in b/gazelle/bzl/testdata/external/BUILD.in
index e7bc836..e7bc836 100644
--- a/gazelle/testdata/external/BUILD.in
+++ b/gazelle/bzl/testdata/external/BUILD.in
diff --git a/gazelle/testdata/external/BUILD.out b/gazelle/bzl/testdata/external/BUILD.out
index c70685f..c70685f 100644
--- a/gazelle/testdata/external/BUILD.out
+++ b/gazelle/bzl/testdata/external/BUILD.out
diff --git a/gazelle/testdata/external/WORKSPACE b/gazelle/bzl/testdata/external/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/external/WORKSPACE
+++ b/gazelle/bzl/testdata/external/WORKSPACE
diff --git a/gazelle/testdata/external/foo.bzl b/gazelle/bzl/testdata/external/foo.bzl
index ad548a5..ad548a5 100644
--- a/gazelle/testdata/external/foo.bzl
+++ b/gazelle/bzl/testdata/external/foo.bzl
diff --git a/gazelle/testdata/import/BUILD.in b/gazelle/bzl/testdata/import/BUILD.in
index e69de29..e69de29 100644
--- a/gazelle/testdata/import/BUILD.in
+++ b/gazelle/bzl/testdata/import/BUILD.in
diff --git a/gazelle/testdata/import/BUILD.out b/gazelle/bzl/testdata/import/BUILD.out
index a19a11a..a19a11a 100644
--- a/gazelle/testdata/import/BUILD.out
+++ b/gazelle/bzl/testdata/import/BUILD.out
diff --git a/gazelle/testdata/import/WORKSPACE b/gazelle/bzl/testdata/import/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/import/WORKSPACE
+++ b/gazelle/bzl/testdata/import/WORKSPACE
diff --git a/gazelle/testdata/import/bar.bzl b/gazelle/bzl/testdata/import/bar.bzl
index 7ffea51..7ffea51 100644
--- a/gazelle/testdata/import/bar.bzl
+++ b/gazelle/bzl/testdata/import/bar.bzl
diff --git a/gazelle/testdata/import/foo.bzl b/gazelle/bzl/testdata/import/foo.bzl
index eb8d33c..eb8d33c 100644
--- a/gazelle/testdata/import/foo.bzl
+++ b/gazelle/bzl/testdata/import/foo.bzl
diff --git a/gazelle/testdata/multidir/BUILD.in b/gazelle/bzl/testdata/multidir/BUILD.in
index e69de29..e69de29 100644
--- a/gazelle/testdata/multidir/BUILD.in
+++ b/gazelle/bzl/testdata/multidir/BUILD.in
diff --git a/gazelle/testdata/multidir/BUILD.out b/gazelle/bzl/testdata/multidir/BUILD.out
index 44c1495..44c1495 100644
--- a/gazelle/testdata/multidir/BUILD.out
+++ b/gazelle/bzl/testdata/multidir/BUILD.out
diff --git a/gazelle/testdata/multidir/WORKSPACE b/gazelle/bzl/testdata/multidir/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/multidir/WORKSPACE
+++ b/gazelle/bzl/testdata/multidir/WORKSPACE
diff --git a/gazelle/testdata/multidir/foo.bzl b/gazelle/bzl/testdata/multidir/foo.bzl
index 1191303..1191303 100644
--- a/gazelle/testdata/multidir/foo.bzl
+++ b/gazelle/bzl/testdata/multidir/foo.bzl
diff --git a/gazelle/testdata/multidir/nested/dir/BUILD.out b/gazelle/bzl/testdata/multidir/nested/dir/BUILD.out
index 07ec8ce..07ec8ce 100644
--- a/gazelle/testdata/multidir/nested/dir/BUILD.out
+++ b/gazelle/bzl/testdata/multidir/nested/dir/BUILD.out
diff --git a/gazelle/testdata/multidir/nested/dir/bar.bzl b/gazelle/bzl/testdata/multidir/nested/dir/bar.bzl
index 7ffea51..7ffea51 100644
--- a/gazelle/testdata/multidir/nested/dir/bar.bzl
+++ b/gazelle/bzl/testdata/multidir/nested/dir/bar.bzl
diff --git a/gazelle/testdata/nobuildfiles/BUILD.out b/gazelle/bzl/testdata/nobuildfiles/BUILD.out
index ac0e990..ac0e990 100644
--- a/gazelle/testdata/nobuildfiles/BUILD.out
+++ b/gazelle/bzl/testdata/nobuildfiles/BUILD.out
diff --git a/gazelle/testdata/nobuildfiles/WORKSPACE b/gazelle/bzl/testdata/nobuildfiles/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/nobuildfiles/WORKSPACE
+++ b/gazelle/bzl/testdata/nobuildfiles/WORKSPACE
diff --git a/gazelle/testdata/nobuildfiles/foo.bzl b/gazelle/bzl/testdata/nobuildfiles/foo.bzl
index e69de29..e69de29 100644
--- a/gazelle/testdata/nobuildfiles/foo.bzl
+++ b/gazelle/bzl/testdata/nobuildfiles/foo.bzl
diff --git a/gazelle/testdata/private/BUILD.in b/gazelle/bzl/testdata/private/BUILD.in
index e69de29..e69de29 100644
--- a/gazelle/testdata/private/BUILD.in
+++ b/gazelle/bzl/testdata/private/BUILD.in
diff --git a/gazelle/testdata/private/BUILD.out b/gazelle/bzl/testdata/private/BUILD.out
index e65b00f..e65b00f 100644
--- a/gazelle/testdata/private/BUILD.out
+++ b/gazelle/bzl/testdata/private/BUILD.out
diff --git a/gazelle/testdata/private/WORKSPACE b/gazelle/bzl/testdata/private/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/private/WORKSPACE
+++ b/gazelle/bzl/testdata/private/WORKSPACE
diff --git a/gazelle/testdata/private/foo.bzl b/gazelle/bzl/testdata/private/foo.bzl
index 7e1dcd1..7e1dcd1 100644
--- a/gazelle/testdata/private/foo.bzl
+++ b/gazelle/bzl/testdata/private/foo.bzl
diff --git a/gazelle/testdata/private/private/BUILD.out b/gazelle/bzl/testdata/private/private/BUILD.out
index eb2e935..eb2e935 100644
--- a/gazelle/testdata/private/private/BUILD.out
+++ b/gazelle/bzl/testdata/private/private/BUILD.out
diff --git a/gazelle/testdata/private/private/bar.bzl b/gazelle/bzl/testdata/private/private/bar.bzl
index c8a4871..c8a4871 100644
--- a/gazelle/testdata/private/private/bar.bzl
+++ b/gazelle/bzl/testdata/private/private/bar.bzl
diff --git a/gazelle/testdata/simple/BUILD.in b/gazelle/bzl/testdata/simple/BUILD.in
index e267b5a..e267b5a 100644
--- a/gazelle/testdata/simple/BUILD.in
+++ b/gazelle/bzl/testdata/simple/BUILD.in
diff --git a/gazelle/testdata/simple/BUILD.out b/gazelle/bzl/testdata/simple/BUILD.out
index 3c71d56..3c71d56 100644
--- a/gazelle/testdata/simple/BUILD.out
+++ b/gazelle/bzl/testdata/simple/BUILD.out
diff --git a/gazelle/testdata/simple/WORKSPACE b/gazelle/bzl/testdata/simple/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/simple/WORKSPACE
+++ b/gazelle/bzl/testdata/simple/WORKSPACE
diff --git a/gazelle/testdata/simple/foo.bzl b/gazelle/bzl/testdata/simple/foo.bzl
index e69de29..e69de29 100644
--- a/gazelle/testdata/simple/foo.bzl
+++ b/gazelle/bzl/testdata/simple/foo.bzl
diff --git a/gazelle/testdata/tests/BUILD.in b/gazelle/bzl/testdata/tests/BUILD.in
index e267b5a..e267b5a 100644
--- a/gazelle/testdata/tests/BUILD.in
+++ b/gazelle/bzl/testdata/tests/BUILD.in
diff --git a/gazelle/testdata/tests/BUILD.out b/gazelle/bzl/testdata/tests/BUILD.out
index 3c71d56..3c71d56 100644
--- a/gazelle/testdata/tests/BUILD.out
+++ b/gazelle/bzl/testdata/tests/BUILD.out
diff --git a/gazelle/testdata/tests/WORKSPACE b/gazelle/bzl/testdata/tests/WORKSPACE
index e69de29..e69de29 100644
--- a/gazelle/testdata/tests/WORKSPACE
+++ b/gazelle/bzl/testdata/tests/WORKSPACE
diff --git a/gazelle/testdata/tests/foo.bzl b/gazelle/bzl/testdata/tests/foo.bzl
index e69de29..e69de29 100644
--- a/gazelle/testdata/tests/foo.bzl
+++ b/gazelle/bzl/testdata/tests/foo.bzl
diff --git a/gazelle/testdata/tests/foo_tests.bzl b/gazelle/bzl/testdata/tests/foo_tests.bzl
index e69de29..e69de29 100644
--- a/gazelle/testdata/tests/foo_tests.bzl
+++ b/gazelle/bzl/testdata/tests/foo_tests.bzl