-
Notifications
You must be signed in to change notification settings - Fork 369
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix "exclude" token parsing #1073
Conversation
Looks good. My only suggestion is I think it may also be helpful to add a more "end-to-end" test in |
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. ℹ️ Googlers: Go here for more info. |
@googlebot I fixed it. |
@blico sounds good, added. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Thank you!
[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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).
[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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).
What type of PR is this?
Bug fix
What package or component does this PR mostly affect?
rule
What does this PR do? Why is it needed?
It fixes the marshaling of GlobValue with non empty excludes.
Example
Before
Invalid, see Functions - Glob.
After
Which issues(s) does this PR fix?
I have not filed an issue.
Commits (oldest to newest)
f596991 Fix "exclude" token parsing
3f0d09d test: Add e2e test