language/go: rewrite embedResolver to use a tree structure #1024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When embedResolver is created, we now gather all embeddable files and directories into a tree instead of a list. When embedResolver.resolve matches a pattern, it visits every node in the tree. This ensures we can recursively embed all files in a directory except hidden files. Fixes bazelbuild#1013
achew22
approved these changes
Mar 31, 2021
gcf-merge-on-green bot
pushed a commit
to googleapis/gapic-config-validator
that referenced
this pull request
Oct 11, 2021
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) | http_archive | minor | `v0.22.2` -> `v0.24.0` | --- ### Release Notes <details> <summary>bazelbuild/bazel-gazelle</summary> ### [`v0.24.0`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.24.0) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.23.0...v0.24.0) This release requires [rules_go 0.29](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.29.0) to support the retirement of `go_tool_library`. #### Changes - .netrc files are now supported for authenticated access for `go_repository` rules ([#​1090](https://togithub.com/bazelbuild/bazel-gazelle/issues/1090)) - There is now a Gazelle extension for authoring BUILD files for the R language, using [rules_r](https://togithub.com/grailbio/rules_r). #### Fixes - language/go: don't let 'go mod download' edit go.sum by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1015 - Label fix: properly parse external references to the main repository by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1006 - gazelle: add -e flag for go list 1.16 by [@​axelberardino](https://togithub.com/axelberardino) in [bazelbuild/bazel-gazelle#1019 - Correctly propagate runfiles from gazelle_bin to gazelle by [@​HALtheWise](https://togithub.com/HALtheWise) in [bazelbuild/bazel-gazelle#1008 - Support Label [@​repo](https://togithub.com/repo) -> @​repo//:repo shorthand by [@​wolfd](https://togithub.com/wolfd) in [bazelbuild/bazel-gazelle#1023 - language/go: rewrite embedResolver to use a tree structure by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1024 - Respect .bazelignore by [@​Michaelhobo](https://togithub.com/Michaelhobo) in [bazelbuild/bazel-gazelle#1022 - Change merge behavior to remove attrs instead of panicking by [@​wolfd](https://togithub.com/wolfd) in [bazelbuild/bazel-gazelle#1031 - Allow ListRepositories to load macros not in Workspace by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1053 - Honor host GOMODCACHE when GO_REPOSITORY_USE_HOST_CACHE by [@​linzhp](https://togithub.com/linzhp) in [bazelbuild/bazel-gazelle#1069 - language/go: add golang.org/x/tools/internal/typeparams to nogo deps list by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1074 - Fix "exclude" token parsing by [@​gibfahn](https://togithub.com/gibfahn) in [bazelbuild/bazel-gazelle#1073 - Have label properly resolve directives starting with "@​//" by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1086 - Correctly propagate runfiles from data dependencies to gazelle by [@​alexeagle](https://togithub.com/alexeagle) in [bazelbuild/bazel-gazelle#1094 - Add bzl_library targets to Gazelle by [@​achew22](https://togithub.com/achew22) in [bazelbuild/bazel-gazelle#760 - Escape vars in cgo flags with an extra $ by [@​dierksen](https://togithub.com/dierksen) in [bazelbuild/bazel-gazelle#1107 - autogazelle can build on windows by [@​asuffield](https://togithub.com/asuffield) in [bazelbuild/bazel-gazelle#1083 - and many documentation updates by [@​tanyabouman](https://togithub.com/tanyabouman) **Full Changelog**: bazelbuild/bazel-gazelle@v0.23.0...v0.24.0 #### `WORKSPACE` code load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "bazel_gazelle", sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() ### [`v0.23.0`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.23.0) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.22.3...v0.23.0) #### Changes - Go - `CXXFLAGS` and `CPPFLAGS` `#cgo` directives are separated into `cxxopts` and `cppopts` attributes, respectively. Thanks [@​otan](https://togithub.com/otan). - Dependencies on mapped kinds are now supported. Thanks [@​robfig](https://togithub.com/robfig). - The `gazelle` rule now supports the `update-repos` command. - The `gazelle` rule now has a `data` attribute and expands `$(location)` within arguments. - `go_repository`'s `build_naming_convention` is now considered when resolving external dependencies. If a repository already has build files, this attribute may be set to indicate which naming convention it follows. - `embedsrcs` attributes are generated for packages that contain `//go:embed` directives. - Protobuf - `proto_strip_import_prefix` may be set in the root build file. Thanks [@​linzhp](https://togithub.com/linzhp). #### `WORKSPACE` code load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "bazel_gazelle", sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() ### [`v0.22.3`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.22.3) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.22.2...v0.22.3) #### Bug fixes - `-mode=diff` treats empty build files correctly. (thanks [@​vpanta](https://togithub.com/vpanta)) - Gazelle should walk subdirectories more quickly when indexing is disabled. (thanks [@​blico](https://togithub.com/blico)) - Fixed dependency resolution with mapped kinds. (thanks [@​robfig](https://togithub.com/robfig)) - Compatibility fixes for Go 1.16. #### WORKSPACE code http_archive( name = "bazel_gazelle", sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-config-validator).
](https://renovatebot.com){kind=link}
gcf-merge-on-green bot
pushed a commit
to googleapis/gapic-generator-go
that referenced
this pull request
Oct 11, 2021
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) | http_archive | minor | `v0.22.2` -> `v0.24.0` | --- ### Release Notes <details> <summary>bazelbuild/bazel-gazelle</summary> ### [`v0.24.0`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.24.0) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.23.0...v0.24.0) This release requires [rules_go 0.29](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.29.0) to support the retirement of `go_tool_library`. #### Changes - .netrc files are now supported for authenticated access for `go_repository` rules ([#​1090](https://togithub.com/bazelbuild/bazel-gazelle/issues/1090)) - There is now a Gazelle extension for authoring BUILD files for the R language, using [rules_r](https://togithub.com/grailbio/rules_r). #### Fixes - language/go: don't let 'go mod download' edit go.sum by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1015 - Label fix: properly parse external references to the main repository by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1006 - gazelle: add -e flag for go list 1.16 by [@​axelberardino](https://togithub.com/axelberardino) in [bazelbuild/bazel-gazelle#1019 - Correctly propagate runfiles from gazelle_bin to gazelle by [@​HALtheWise](https://togithub.com/HALtheWise) in [bazelbuild/bazel-gazelle#1008 - Support Label [@​repo](https://togithub.com/repo) -> @​repo//:repo shorthand by [@​wolfd](https://togithub.com/wolfd) in [bazelbuild/bazel-gazelle#1023 - language/go: rewrite embedResolver to use a tree structure by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1024 - Respect .bazelignore by [@​Michaelhobo](https://togithub.com/Michaelhobo) in [bazelbuild/bazel-gazelle#1022 - Change merge behavior to remove attrs instead of panicking by [@​wolfd](https://togithub.com/wolfd) in [bazelbuild/bazel-gazelle#1031 - Allow ListRepositories to load macros not in Workspace by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1053 - Honor host GOMODCACHE when GO_REPOSITORY_USE_HOST_CACHE by [@​linzhp](https://togithub.com/linzhp) in [bazelbuild/bazel-gazelle#1069 - language/go: add golang.org/x/tools/internal/typeparams to nogo deps list by [@​jayconrod](https://togithub.com/jayconrod) in [bazelbuild/bazel-gazelle#1074 - Fix "exclude" token parsing by [@​gibfahn](https://togithub.com/gibfahn) in [bazelbuild/bazel-gazelle#1073 - Have label properly resolve directives starting with "@​//" by [@​tfrench-uber](https://togithub.com/tfrench-uber) in [bazelbuild/bazel-gazelle#1086 - Correctly propagate runfiles from data dependencies to gazelle by [@​alexeagle](https://togithub.com/alexeagle) in [bazelbuild/bazel-gazelle#1094 - Add bzl_library targets to Gazelle by [@​achew22](https://togithub.com/achew22) in [bazelbuild/bazel-gazelle#760 - Escape vars in cgo flags with an extra $ by [@​dierksen](https://togithub.com/dierksen) in [bazelbuild/bazel-gazelle#1107 - autogazelle can build on windows by [@​asuffield](https://togithub.com/asuffield) in [bazelbuild/bazel-gazelle#1083 - and many documentation updates by [@​tanyabouman](https://togithub.com/tanyabouman) **Full Changelog**: bazelbuild/bazel-gazelle@v0.23.0...v0.24.0 #### `WORKSPACE` code load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "bazel_gazelle", sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() ### [`v0.23.0`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.23.0) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.22.3...v0.23.0) #### Changes - Go - `CXXFLAGS` and `CPPFLAGS` `#cgo` directives are separated into `cxxopts` and `cppopts` attributes, respectively. Thanks [@​otan](https://togithub.com/otan). - Dependencies on mapped kinds are now supported. Thanks [@​robfig](https://togithub.com/robfig). - The `gazelle` rule now supports the `update-repos` command. - The `gazelle` rule now has a `data` attribute and expands `$(location)` within arguments. - `go_repository`'s `build_naming_convention` is now considered when resolving external dependencies. If a repository already has build files, this attribute may be set to indicate which naming convention it follows. - `embedsrcs` attributes are generated for packages that contain `//go:embed` directives. - Protobuf - `proto_strip_import_prefix` may be set in the root build file. Thanks [@​linzhp](https://togithub.com/linzhp). #### `WORKSPACE` code load("@​bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "bazel_gazelle", sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() ### [`v0.22.3`](https://togithub.com/bazelbuild/bazel-gazelle/releases/v0.22.3) [Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.22.2...v0.22.3) #### Bug fixes - `-mode=diff` treats empty build files correctly. (thanks [@​vpanta](https://togithub.com/vpanta)) - Gazelle should walk subdirectories more quickly when indexing is disabled. (thanks [@​blico](https://togithub.com/blico)) - Fixed dependency resolution with mapped kinds. (thanks [@​robfig](https://togithub.com/robfig)) - Compatibility fixes for Go 1.16. #### WORKSPACE code http_archive( name = "bazel_gazelle", sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4", urls = [ "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", ], ) load("@​bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-go).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When embedResolver is created, we now gather all embeddable files and
directories into a tree instead of a list.
When embedResolver.resolve matches a pattern, it visits every node in
the tree. This ensures we can recursively embed all files in a
directory except hidden files.
Fixes #1013