bazel-contrib · Sep 19, 2022 · Sep 22, 2022 · Sep 23, 2022 · Sep 25, 2022 · Sep 25, 2022
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -13,9 +13,9 @@ tasks:
   ubuntu1804_bcr_tests:
     name: BCR test module
     platform: ubuntu1804
-    # Includes https://github.com/bazelbuild/bazel/commit/4e439689db73a12b9c8a1f9f1a5f8023e09d40b0,
+    # Includes https://github.com/bazelbuild/bazel/commit/3f92232c17bf4aad51880c811c291ba4b5b42721,
     # which will eventually be released in Bazel 5.3.0.
-    bazel_version: 4e439689db73a12b9c8a1f9f1a5f8023e09d40b0
+    bazel_version: 3f92232c17bf4aad51880c811c291ba4b5b42721
     working_directory: tests/bcr
     build_targets:
       - "//..."

diff --git a/.bcr/config.yml b/.bcr/config.yml
@@ -0,0 +1 @@
+fixedReleaser: fmeum
diff --git a/.bcr/metadata.template.json b/.bcr/metadata.template.json
@@ -0,0 +1,12 @@
+{
+  "homepage": "https://github.com/bazelbuild/bazel-gazelle",
+  "maintainers": [
+    {
+      "email": "fabian@meumertzhe.im",
+      "github": "fmeum",
+      "name": "Fabian Meumertzheim"
+    }
+  ],
+  "versions": [],
+  "yanked_versions": {}
+}
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -0,0 +1,18 @@
+bcr_test_module:
+  module_path: tests/bcr
+  matrix:
+    platform:
+    - centos7
+    - debian10
+    - ubuntu2004
+    - macos
+    - windows
+  tasks:
+    run_test_module:
+      name: Run test module
+      platform: ${{ platform }}
+      build_targets:
+      - //...
+      - //:gazelle
+      test_targets:
+      - //...
diff --git a/.bcr/source.template.json b/.bcr/source.template.json
@@ -0,0 +1,4 @@
+{
+  "integrity": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{TAG}.tar.gz"
+}
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /tests/bcr/bazel-bin
 /tests/bcr/bazel-out
 /tests/bcr/bazel-testlogs
+.DS_STORE
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -6,6 +6,7 @@ load("//:def.bzl", "gazelle", "gazelle_binary")
 # gazelle:exclude vendor
 # gazelle:exclude third_party
 # gazelle:exclude .bazelci
+# gazelle:exclude .bcr
 # gazelle:exclude .idea
 # gazelle:exclude .github
 # gazelle:exclude .vscode

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,12 +1,14 @@
 module(
     name = "gazelle",
-    version = "0.26.0",
+    version = "0.27.0",
+    repo_name = "bazel_gazelle",
 )
 
 print("WARNING: The bazel_gazelle Bazel module is still highly experimental and subject to change at any time. Only use it to try out bzlmod for now.")
 
-bazel_dep(name = "bazel_skylib", version = "1.2.0")
-bazel_dep(name = "rules_go", version = "0.33.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "bazel_skylib", version = "1.3.0")
+bazel_dep(name = "protobuf", version = "3.19.6", repo_name = "com_google_protobuf")
+bazel_dep(name = "rules_go", version = "0.35.0", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_proto", version = "4.0.0")
 
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
@@ -22,6 +24,12 @@ use_repo(
     "bazel_gazelle_go_repository_tools",
 )
 
+rules_go_non_module_deps = use_extension("@io_bazel_rules_go//go/private:extensions.bzl", "non_module_dependencies")
+use_repo(
+    rules_go_non_module_deps,
+    "go_googleapis",
+)
+
 go_deps = use_extension("//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
 use_repo(

diff --git a/README.rst b/README.rst
@@ -155,10 +155,10 @@ should look like this:
 
     http_archive(
         name = "bazel_gazelle",
-        sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
+        sha256 = "efbbba6ac1a4fd342d5122cbdfdb82aeb2cf2862e35022c752eaddffada7c3f3",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.27.0/bazel-gazelle-v0.27.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.27.0/bazel-gazelle-v0.27.0.tar.gz",
         ],
     )
 
@@ -322,6 +322,8 @@ you're using a compatible version.
 +---------------------+------------------------------+------------------------------+
 | 0.27                | 0.29                         | n/a                          |
 +---------------------+------------------------------+------------------------------+
+| 0.28                | 0.35                         | n/a                          |
++---------------------+------------------------------+------------------------------+
 
 Usage
 -----

diff --git a/WORKSPACE b/WORKSPACE
@@ -28,7 +28,7 @@ go_rules_dependencies()
 
 go_register_toolchains(
     nogo = "@bazel_gazelle//:nogo",
-    version = "1.18.3",
+    version = "1.19.2",
 )
 
 load("//:deps.bzl", "gazelle_dependencies")

diff --git a/cmd/gazelle/fix-update.go b/cmd/gazelle/fix-update.go
@@ -360,6 +360,12 @@ func runFixUpdate(wd string, cmd command, args []string) (err error) {
 		}
 	})
 
+	for _, lang := range languages {
+		if finishable, ok := lang.(language.FinishableLanguage); ok {
+			finishable.DoneGeneratingRules()
+		}
+	}
+
 	// Finish building the index for dependency resolution.
 	ruleIndex.Finish()
 

diff --git a/def.bzl b/def.bzl
@@ -96,7 +96,7 @@ _gazelle_runner = rule(
         "gazelle": attr.label(
             default = "//cmd/gazelle",
             executable = True,
-            cfg = "host",
+            cfg = "exec",
         ),
         "command": attr.string(
             values = [
@@ -135,14 +135,21 @@ def gazelle(name, **kwargs):
             fail("{}: both args and extra_args were provided".format(name))
         kwargs["extra_args"] = kwargs["args"]
         kwargs.pop("args")
+
+    visibility = kwargs.pop("visibility", default = None)
+
+    tags_set = {t: "" for t in kwargs.pop("tags", [])}
+    tags_set["manual"] = ""
+    tags = [k for k in tags_set.keys()]
     runner_name = name + "-runner"
     _gazelle_runner(
         name = runner_name,
-        tags = ["manual"],
+        tags = tags,
         **kwargs
     )
     native.sh_binary(
         name = name,
         srcs = [runner_name],
-        tags = ["manual"],
+        tags = tags,
+        visibility = visibility,
     )
diff --git a/deps.bzl b/deps.bzl
@@ -93,8 +93,8 @@ def gazelle_dependencies(
         go_repository,
         name = "com_github_bazelbuild_buildtools",
         importpath = "github.com/bazelbuild/buildtools",
-        sum = "h1:7xSt0nPZ74liqR8jjBYmjentrQVrdQEhoW4/+4BrmoM=",
-        version = "v0.0.0-20220907133145-b9bfff5d7f91",
+        sum = "h1:jhiMzJ+8unnLRtV8rpbWBFE9pFNzIqgUTyZU5aA++w8=",
+        version = "v0.0.0-20221004120235-7186f635531b",
         build_naming_convention = "go_default_library",
     )
     _maybe(
@@ -171,8 +171,8 @@ def gazelle_dependencies(
         go_repository,
         name = "com_github_fsnotify_fsnotify",
         importpath = "github.com/fsnotify/fsnotify",
-        sum = "h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=",
-        version = "v1.5.4",
+        sum = "h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=",
+        version = "v1.6.0",
     )
     _maybe(
         go_repository,
@@ -276,8 +276,8 @@ def gazelle_dependencies(
         go_repository,
         name = "org_golang_x_crypto",
         importpath = "golang.org/x/crypto",
-        sum = "h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=",
-        version = "v0.0.0-20210921155107-089bfa567519",
+        sum = "h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=",
+        version = "v0.1.0",
     )
     _maybe(
         go_repository,
@@ -297,15 +297,15 @@ def gazelle_dependencies(
         go_repository,
         name = "org_golang_x_mod",
         importpath = "golang.org/x/mod",
-        sum = "h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=",
-        version = "v0.6.0-dev.0.20220419223038-86c51ed26bb4",
+        sum = "h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=",
+        version = "v0.6.0",
     )
     _maybe(
         go_repository,
         name = "org_golang_x_net",
         importpath = "golang.org/x/net",
-        sum = "h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=",
-        version = "v0.0.0-20220722155237-a158d28d115b",
+        sum = "h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=",
+        version = "v0.1.0",
     )
     _maybe(
         go_repository,
@@ -318,29 +318,29 @@ def gazelle_dependencies(
         go_repository,
         name = "org_golang_x_sync",
         importpath = "golang.org/x/sync",
-        sum = "h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=",
-        version = "v0.0.0-20220907140024-f12130a52804",
+        sum = "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=",
+        version = "v0.1.0",
     )
     _maybe(
         go_repository,
         name = "org_golang_x_sys",
         importpath = "golang.org/x/sys",
-        sum = "h1:PuvuRMeLWqsf/ZdT1UUZz0syhioyv1mzuFZsXs4fvhw=",
-        version = "v0.0.0-20220913175220-63ea55921009",
+        sum = "h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=",
+        version = "v0.1.0",
     )
     _maybe(
         go_repository,
         name = "org_golang_x_text",
         importpath = "golang.org/x/text",
-        sum = "h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=",
-        version = "v0.3.7",
+        sum = "h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=",
+        version = "v0.3.0",
     )
     _maybe(
         go_repository,
         name = "org_golang_x_tools",
         importpath = "golang.org/x/tools",
-        sum = "h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=",
-        version = "v0.1.12",
+        sum = "h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=",
+        version = "v0.2.0",
     )
     _maybe(
         go_repository,

diff --git a/extend.md b/extend.md
@@ -144,7 +144,8 @@ proto extension stores metadata in hidden attributes of generated
 ## gazelle_generation_test
 
 <pre>
-gazelle_generation_test(<a href="#gazelle_generation_test-name">name</a>, <a href="#gazelle_generation_test-gazelle_binary">gazelle_binary</a>, <a href="#gazelle_generation_test-test_data">test_data</a>, <a href="#gazelle_generation_test-build_in_suffix">build_in_suffix</a>, <a href="#gazelle_generation_test-build_out_suffix">build_out_suffix</a>)
+gazelle_generation_test(<a href="#gazelle_generation_test-name">name</a>, <a href="#gazelle_generation_test-gazelle_binary">gazelle_binary</a>, <a href="#gazelle_generation_test-test_data">test_data</a>, <a href="#gazelle_generation_test-build_in_suffix">build_in_suffix</a>, <a href="#gazelle_generation_test-build_out_suffix">build_out_suffix</a>,
+                        <a href="#gazelle_generation_test-gazelle_timeout_seconds">gazelle_timeout_seconds</a>, <a href="#gazelle_generation_test-size">size</a>)
 </pre>
 
     gazelle_generation_test is a macro for testing gazelle against workspaces.
@@ -178,5 +179,7 @@ To update the expected files, run `UPDATE_SNAPSHOTS=true bazel run //path/to:the
 | <a id="gazelle_generation_test-test_data"></a>test_data |  A list of target of the test data files you will pass to the test. This can be a https://bazel.build/reference/be/general#filegroup.   |  none |
 | <a id="gazelle_generation_test-build_in_suffix"></a>build_in_suffix |  The suffix for the input BUILD.bazel files. Defaults to .in. By default, will use files named BUILD.in as the BUILD files before running gazelle.   |  <code>".in"</code> |
 | <a id="gazelle_generation_test-build_out_suffix"></a>build_out_suffix |  The suffix for the expected BUILD.bazel files after running gazelle. Defaults to .out. By default, will use files named check the results of the gazelle run against files named BUILD.out.   |  <code>".out"</code> |
+| <a id="gazelle_generation_test-gazelle_timeout_seconds"></a>gazelle_timeout_seconds |  <p align="center"> - </p>   |  <code>2</code> |
+| <a id="gazelle_generation_test-size"></a>size |  Specifies a test target's "heaviness": how much time/resources it needs to run.   |  <code>None</code> |
 
 
diff --git a/go.mod b/go.mod
@@ -3,16 +3,16 @@ module github.com/bazelbuild/bazel-gazelle
 go 1.18
 
 require (
-	github.com/bazelbuild/buildtools v0.0.0-20220907133145-b9bfff5d7f91
+	github.com/bazelbuild/buildtools v0.0.0-20221004120235-7186f635531b
 	github.com/bazelbuild/rules_go v0.35.0
 	github.com/bmatcuk/doublestar/v4 v4.2.0
-	github.com/fsnotify/fsnotify v1.5.4
+	github.com/fsnotify/fsnotify v1.6.0
 	github.com/google/go-cmp v0.5.9
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pmezard/go-difflib v1.0.0
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
-	golang.org/x/sync v0.0.0-20220907140024-f12130a52804
-	golang.org/x/tools v0.1.12
+	golang.org/x/mod v0.6.0
+	golang.org/x/sync v0.1.0
+	golang.org/x/tools v0.2.0
 )
 
-require golang.org/x/sys v0.0.0-20220913175220-63ea55921009 // indirect
+require golang.org/x/sys v0.1.0 // indirect