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

build(deps): bump github.com/vektra/mockery/v2 from 2.46.0 to 2.46.3 #6709

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 14, 2024

Bumps github.com/vektra/mockery/v2 from 2.46.0 to 2.46.3.

Release notes

Sourced from github.com/vektra/mockery/v2's releases.

v2.46.3

Changelog

  • 4d3bfa7 Merge pull request #824 from DimaGolomozy/patch-1
  • 2e2b9bc add git
  • f55598e add ssh

v2.46.2

Changelog

  • 87fdecc Merge pull request #819 from pieter-irsan/patch-1
  • 0d1b1a2 Merge pull request #821 from Link512/master
  • 2e2c85b check nillable property for type aliases as well
  • ce9adb6 docs: update typo in README.md

v2.46.1

Changelog

  • afe04a5 Merge pull request #808 from RangelReale/fix-go123-aliastype
  • 720caa9 Undo go:build statements, make code a little DRY
  • cf26d69 Update to go1.23
  • c05a755 remove Go 1.23 testing
  • 6f7960f support types.Alias
  • 42d905a support types.Alias
  • 66dba08 support types.Alias
  • e4b095f upgrade go task
  • ea36ecc upgrade golangci-lint and add Go 1.23 to CI test
Commits
  • 4d3bfa7 Merge pull request #824 from DimaGolomozy/patch-1
  • f55598e add ssh
  • 2e2b9bc add git
  • 0d1b1a2 Merge pull request #821 from Link512/master
  • 87fdecc Merge pull request #819 from pieter-irsan/patch-1
  • 2e2c85b check nillable property for type aliases as well
  • ce9adb6 docs: update typo in README.md
  • afe04a5 Merge pull request #808 from RangelReale/fix-go123-aliastype
  • 720caa9 Undo go:build statements, make code a little DRY
  • cf26d69 Update to go1.23
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot requested a review from a team as a code owner October 14, 2024 19:40
@dependabot dependabot bot added area/dependency Issues or PRs related to dependency changes. release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes. labels Oct 14, 2024
@dependabot dependabot bot requested review from tsaarni, skriss and a team and removed request for a team October 14, 2024 19:40
@dependabot dependabot bot requested review from izturn, rajatvig, sunjayBhatia and a team October 14, 2024 19:40
@sunjayBhatia sunjayBhatia force-pushed the dependabot/go_modules/main/github.com/vektra/mockery/v2-2.46.3 branch from 0e3f201 to ae98114 Compare October 21, 2024 15:46
@sunjayBhatia
Copy link
Member

panic in controller-tools should be fixed by bumping to latest 0.16.4: kubernetes-sigs/controller-tools#1061

@sunjayBhatia
Copy link
Member

ah actually turns out it wasnt fixed entirely: kubernetes-sigs/controller-tools#1076

@tsaarni
Copy link
Member

tsaarni commented Oct 22, 2024

We didn’t have the toolchain statement in go.mod before this PR. Was it intentionally left out?

I have to admit, I still don't understand how the Go toolchain versioning interacts with dependencies. If Mockery update involves more than just bumping Mockery version, I wonder will the golangci-lint troubles #6718 need to be resolved too, before going forward with this?

- go 1.22.0
+ go 1.23
+ 
+ toolchain go1.23.2

Mockery v2.46.1 updated minimum language level to 1.23.

I think this is the sequence of events we're dealing with: Updating a dependency forces us to update the local toolchain/compiler version -> Updating the toolchain version requires a golangci-lint update -> Updating golangci-lint introduces new checks, which then cause the compilation to fail.

I also wonder, what’s the point of us manually bumping GO_VERSION and BUILD_BASE_IMAGE now that Go will override it by downloading a version via the language level and toolchain statements? Edit: the image sets GOTOOLCHAIN=local so Go will not follow its automatic logic for toolchain selection docker-library/golang#472.

Copy link

github-actions bot commented Nov 6, 2024

The Contour project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 14d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, the PR is closed

You can:

  • Ensure your PR is passing all CI checks. PRs that are fully green are more likely to be reviewed. If you are having trouble with CI checks, reach out to the #contour channel in the Kubernetes Slack workspace.
  • Mark this PR as fresh by commenting or pushing a commit
  • Close this PR
  • Offer to help out with triage

Please send feedback to the #contour channel in the Kubernetes Slack

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 6, 2024
@tsaarni
Copy link
Member

tsaarni commented Nov 8, 2024

@dependabot rebase

Copy link
Contributor Author

dependabot bot commented on behalf of github Nov 8, 2024

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@tsaarni
Copy link
Member

tsaarni commented Nov 8, 2024

@dependabot recreate

@dependabot dependabot bot force-pushed the dependabot/go_modules/main/github.com/vektra/mockery/v2-2.46.3 branch 3 times, most recently from c1a6075 to 88ddd2f Compare November 8, 2024 20:15
@tsaarni
Copy link
Member

tsaarni commented Nov 8, 2024

@dependabot rebase

Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.0 to 2.46.3.
- [Release notes](https://github.com/vektra/mockery/releases)
- [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md)
- [Commits](vektra/mockery@v2.46.0...v2.46.3)

---
updated-dependencies:
- dependency-name: github.com/vektra/mockery/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/go_modules/main/github.com/vektra/mockery/v2-2.46.3 branch from 88ddd2f to 8afa808 Compare November 8, 2024 21:01
* Update minimum go version in go.mod

Signed-off-by: Tero Saarni <[email protected]>
@tsaarni
Copy link
Member

tsaarni commented Nov 8, 2024

I bumped to the latest controller-tools but still no luck :( It seems we have something unique that no-one other has seen yet. It seems to crash when processing ContourConfiguration.Status.Conditions.Condition which is inlined type alias

Condition `json:",inline"`

type Condition = meta_v1.Condition

So I thought to add that into controller-tools CRD test suite but I have not been able to get it crash yet. Must be something more intricate...

@github-actions github-actions bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 9, 2024
@tsaarni
Copy link
Member

tsaarni commented Nov 9, 2024

Must be something more intricate...

The intricacy is following:

  1. When running go run sigs.k8s.io/controller-tools/cmd/controller-gen it will use the default go1.23 setting (which is gotypesalias=1).
  2. When running go run sigs.k8s.io/controller-tools/cmd/[email protected] it will use gotypesalias=0 that will hide the bug.

The two commands give different result, regardless of their version being pinned in go.mod. I think when explicitly giving the version @v0.16.5 go run will use the target projects go.mod versions. If not, it will use our versions.

When cloning controller-gen and running tests, the go.mod settings causes old gotypesalias=0 to be used. The bug can be reproduced in controller-gen if adding inline type alias to the test data and running generation with GODEBUG=gotypesalias=1.

Same problem concerns github.com/ahmetb/gen-crd-api-reference-docs, it also cannot handle inline type alias. The error comes from github.com/kubernetes/gengo which does have some fixes in main. It looked like the behavior is chosen by compiler version used in build, but so far I did not get it to work even if stepping up go version in gen-crd-api-reference-docs go.mod.

As a workaround for now I will set GODEBUG=gotypesalias=0 for the two tools.

I've submitted an issue kubernetes-sigs/controller-tools#1088.

* Disable types alias

Signed-off-by: Tero Saarni <[email protected]>
Signed-off-by: Tero Saarni <[email protected]>
Copy link

codecov bot commented Nov 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.03%. Comparing base (fdf434c) to head (ff36f1b).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #6709   +/-   ##
=======================================
  Coverage   81.03%   81.03%           
=======================================
  Files         133      133           
  Lines       20006    20006           
=======================================
  Hits        16212    16212           
  Misses       3500     3500           
  Partials      294      294           

Copy link
Member

@sunjayBhatia sunjayBhatia 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 looking into this @tsaarni great explanation 🙏🏽

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dependency Issues or PRs related to dependency changes. release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants