Skip to content
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

Extend gomock to allow passing an source_importpath instead of library when operating in source mode #3822

Merged
merged 4 commits into from
Jan 9, 2024

Conversation

therve
Copy link
Contributor

@therve therve commented Jan 9, 2024

What type of PR is this?

Feature

What does this PR do? Why is it needed?

This PR adds a new parameter, importpath to the gomock rule. This parameter is optional, and allows a gomock target running in source mode to avoid depending on a go_library. As far as I can see, the only use for the go_library in source mode is to extract an importpath.

I've also extended the test cases to test the different modes gomock can operate in, and made sure there's a link to gomock on the top level README.

Which issues(s) does this PR fix?

Fixes #3349

This is a rebase of #3350

…rary` when operating in source mode. This enables a use case where mocks can be included as part of the source files in a go_library. Added additional test cases and documentation.
Copy link
Member

@fmeum fmeum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, @linzhp can you take a final look?

Copy link
Contributor

@linzhp linzhp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for implementing this.

@linzhp linzhp merged commit 15ddf3b into bazel-contrib:master Jan 9, 2024
2 checks passed
cgrindel-self-hosted-renovate bot referenced this pull request in cgrindel/bazel-starlib Jan 12, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [io_bazel_rules_go](https://togithub.com/bazelbuild/rules_go) |
http_archive | minor | `v0.44.2` -> `v0.45.0` |

---

### Release Notes

<details>
<summary>bazelbuild/rules_go (io_bazel_rules_go)</summary>

###
[`v0.45.0`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.45.0)

[Compare
Source](https://togithub.com/bazelbuild/rules_go/compare/v0.44.2...v0.45.0)

#### `WORKSPACE` code

load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive")

    http_archive(
        name = "io_bazel_rules_go",
sha256 =
"de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d",
        urls = [

"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",

"https://github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",
        ],
    )

load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains",
"go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.21.6")

#### What's Changed

- nogo: use original source files instead of coverage-instrumented by
[@&#8203;emmaxy](https://togithub.com/emmaxy) in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- Allow compilers to be overwritten in go_grpc_library() by
[@&#8203;mering](https://togithub.com/mering) in
[https://github.com/bazelbuild/rules_go/pull/3812](https://togithub.com/bazelbuild/rules_go/pull/3812)
- update documentation for 0.44 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3813](https://togithub.com/bazelbuild/rules_go/pull/3813)
- Temporarily undo deprecation of `//proto:go_grpc` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3818](https://togithub.com/bazelbuild/rules_go/pull/3818)
- Rename bazel_features polyfill to prevent conflicts by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3817](https://togithub.com/bazelbuild/rules_go/pull/3817)
- Handle prerelease versions in polyfill by
[@&#8203;illicitonion](https://togithub.com/illicitonion) in
[https://github.com/bazelbuild/rules_go/pull/3821](https://togithub.com/bazelbuild/rules_go/pull/3821)
- Extend gomock to allow passing an source_importpath instead of library
when operating in source mode by
[@&#8203;therve](https://togithub.com/therve) in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)
- Fix coverage collection with modified `COVERAGE_DIR` env variable by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3820](https://togithub.com/bazelbuild/rules_go/pull/3820)
- improving logging for subcommand failure by
[@&#8203;linzhp](https://togithub.com/linzhp) in
[https://github.com/bazelbuild/rules_go/pull/3824](https://togithub.com/bazelbuild/rules_go/pull/3824)
- release rules go 0.45.0 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3825](https://togithub.com/bazelbuild/rules_go/pull/3825)

#### New Contributors

- [@&#8203;emmaxy](https://togithub.com/emmaxy) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- [@&#8203;therve](https://togithub.com/therve) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)

**Full Changelog**:
bazel-contrib/rules_go@v0.44.2...v0.45.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDAuMCIsInVwZGF0ZWRJblZlciI6IjM2LjEwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
renovate bot referenced this pull request in kreempuff/rules_unreal_engine Jan 12, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [io_bazel_rules_go](https://togithub.com/bazelbuild/rules_go) |
http_archive | minor | `v0.44.2` -> `v0.45.0` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>bazelbuild/rules_go (io_bazel_rules_go)</summary>

###
[`v0.45.0`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.45.0)

[Compare
Source](https://togithub.com/bazelbuild/rules_go/compare/v0.44.2...v0.45.0)

#### `WORKSPACE` code

load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive")

    http_archive(
        name = "io_bazel_rules_go",
sha256 =
"de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d",
        urls = [

"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",

"https://github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",
        ],
    )

load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains",
"go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.21.6")

#### What's Changed

- nogo: use original source files instead of coverage-instrumented by
[@&#8203;emmaxy](https://togithub.com/emmaxy) in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- Allow compilers to be overwritten in go_grpc_library() by
[@&#8203;mering](https://togithub.com/mering) in
[https://github.com/bazelbuild/rules_go/pull/3812](https://togithub.com/bazelbuild/rules_go/pull/3812)
- update documentation for 0.44 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3813](https://togithub.com/bazelbuild/rules_go/pull/3813)
- Temporarily undo deprecation of `//proto:go_grpc` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3818](https://togithub.com/bazelbuild/rules_go/pull/3818)
- Rename bazel_features polyfill to prevent conflicts by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3817](https://togithub.com/bazelbuild/rules_go/pull/3817)
- Handle prerelease versions in polyfill by
[@&#8203;illicitonion](https://togithub.com/illicitonion) in
[https://github.com/bazelbuild/rules_go/pull/3821](https://togithub.com/bazelbuild/rules_go/pull/3821)
- Extend gomock to allow passing an source_importpath instead of library
when operating in source mode by
[@&#8203;therve](https://togithub.com/therve) in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)
- Fix coverage collection with modified `COVERAGE_DIR` env variable by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3820](https://togithub.com/bazelbuild/rules_go/pull/3820)
- improving logging for subcommand failure by
[@&#8203;linzhp](https://togithub.com/linzhp) in
[https://github.com/bazelbuild/rules_go/pull/3824](https://togithub.com/bazelbuild/rules_go/pull/3824)
- release rules go 0.45.0 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3825](https://togithub.com/bazelbuild/rules_go/pull/3825)

#### New Contributors

- [@&#8203;emmaxy](https://togithub.com/emmaxy) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- [@&#8203;therve](https://togithub.com/therve) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)

**Full Changelog**:
bazel-contrib/rules_go@v0.44.2...v0.45.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, 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 [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/kreempuff/rules_unreal_engine).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMjcuMCIsInVwZGF0ZWRJblZlciI6IjM3LjEyNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
cgrindel-self-hosted-renovate bot referenced this pull request in cgrindel/rules_swift_package_manager Jan 23, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [io_bazel_rules_go](https://togithub.com/bazelbuild/rules_go) |
http_archive | minor | `v0.44.2` -> `v0.45.1` |

---

### Release Notes

<details>
<summary>bazelbuild/rules_go (io_bazel_rules_go)</summary>

###
[`v0.45.1`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.45.1)

[Compare
Source](https://togithub.com/bazelbuild/rules_go/compare/v0.45.0...v0.45.1)

#### `WORKSPACE` code

load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive")

    http_archive(
        name = "io_bazel_rules_go",
sha256 =
"6734a719993b1ba4ebe9806e853864395a8d3968ad27f9dd759c196b3eb3abe8",
        urls = [

"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",

"https://github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",
        ],
    )

load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains",
"go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.21.6")

#### What's Changed

- Disable `layering_check` feature in CGo tests by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3829](https://togithub.com/bazelbuild/rules_go/pull/3829)
- Print stack traces without panicking on test timeout by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3833](https://togithub.com/bazelbuild/rules_go/pull/3833)
- Fix regression in empty `.go` file filtering for nogo by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3832](https://togithub.com/bazelbuild/rules_go/pull/3832)
- release patch version 0.45.1 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3836](https://togithub.com/bazelbuild/rules_go/pull/3836)

**Full Changelog**:
bazel-contrib/rules_go@v0.45.0...v0.45.1

###
[`v0.45.0`](https://togithub.com/bazelbuild/rules_go/releases/tag/v0.45.0)

[Compare
Source](https://togithub.com/bazelbuild/rules_go/compare/v0.44.2...v0.45.0)

#### `WORKSPACE` code

load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl",
"http_archive")

    http_archive(
        name = "io_bazel_rules_go",
sha256 =
"de7974538c31f76658e0d333086c69efdf6679dbc6a466ac29e65434bf47076d",
        urls = [

"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",

"https://github.com/bazelbuild/rules_go/releases/download/v0.45.0/rules_go-v0.45.0.zip",
        ],
    )

load("@&#8203;io_bazel_rules_go//go:deps.bzl", "go_register_toolchains",
"go_rules_dependencies")

    go_rules_dependencies()

    go_register_toolchains(version = "1.21.6")

#### What's Changed

- nogo: use original source files instead of coverage-instrumented by
[@&#8203;emmaxy](https://togithub.com/emmaxy) in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- Allow compilers to be overwritten in go_grpc_library() by
[@&#8203;mering](https://togithub.com/mering) in
[https://github.com/bazelbuild/rules_go/pull/3812](https://togithub.com/bazelbuild/rules_go/pull/3812)
- update documentation for 0.44 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3813](https://togithub.com/bazelbuild/rules_go/pull/3813)
- Temporarily undo deprecation of `//proto:go_grpc` by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3818](https://togithub.com/bazelbuild/rules_go/pull/3818)
- Rename bazel_features polyfill to prevent conflicts by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3817](https://togithub.com/bazelbuild/rules_go/pull/3817)
- Handle prerelease versions in polyfill by
[@&#8203;illicitonion](https://togithub.com/illicitonion) in
[https://github.com/bazelbuild/rules_go/pull/3821](https://togithub.com/bazelbuild/rules_go/pull/3821)
- Extend gomock to allow passing an source_importpath instead of library
when operating in source mode by
[@&#8203;therve](https://togithub.com/therve) in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)
- Fix coverage collection with modified `COVERAGE_DIR` env variable by
[@&#8203;fmeum](https://togithub.com/fmeum) in
[https://github.com/bazelbuild/rules_go/pull/3820](https://togithub.com/bazelbuild/rules_go/pull/3820)
- improving logging for subcommand failure by
[@&#8203;linzhp](https://togithub.com/linzhp) in
[https://github.com/bazelbuild/rules_go/pull/3824](https://togithub.com/bazelbuild/rules_go/pull/3824)
- release rules go 0.45.0 by
[@&#8203;tyler-french](https://togithub.com/tyler-french) in
[https://github.com/bazelbuild/rules_go/pull/3825](https://togithub.com/bazelbuild/rules_go/pull/3825)

#### New Contributors

- [@&#8203;emmaxy](https://togithub.com/emmaxy) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3770](https://togithub.com/bazelbuild/rules_go/pull/3770)
- [@&#8203;therve](https://togithub.com/therve) made their first
contribution in
[https://github.com/bazelbuild/rules_go/pull/3822](https://togithub.com/bazelbuild/rules_go/pull/3822)

**Full Changelog**:
bazel-contrib/rules_go@v0.44.2...v0.45.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4xMDAuMCIsInVwZGF0ZWRJblZlciI6IjM2LjEwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Circular dependencies when including mocks generated by gomock in go_library
4 participants