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.

Sign up for GitHub

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

Jump to bottom

Switch from golang/mock to uber-go/mock #120969

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Switch from golang/mock to uber-go/mock #120969

merged 1 commit into from
Apr 18, 2024

Conversation

skitt
Copy link
Member

@skitt skitt commented Oct 2, 2023 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

See https://github.com/golang/mock#gomock: golang/mock is no longer maintained, and should be replaced by https://go.uber.org/mock.

This allows golang/mock to be dropped from the status and vendored fields in unwanted-dependencies.json.

mockgen now stores the full command used to generate the file in each generated file; this includes the temporary file name used for the header, so update-mocks.sh is changed to replace that with a constant placeholder ($BUILD_TAG_FILE, as used in the source files). This identified a duplicated -copyright_file argument in staging/src/k8s.io/legacy-cloud-providers/azure/clients/loadbalancerclient/interface.go so that's cleaned up too.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 2, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 2, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @skitt. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/kubelet area/test sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 2, 2023
@skitt
Copy link
Member Author

skitt commented Oct 2, 2023

/cc @dims @liggitt

The changes since gomock v1.6.0 make sense to me. I don’t know whether this is too “early adopter”-ish...

SIG Node PR Triage automation moved this from Done to Triage Mar 6, 2024
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 6, 2024
@skitt
Copy link
Member Author

skitt commented Mar 6, 2024

/hold pending a release containing uber-go/mock#153

@skitt skitt force-pushed the uber-go-mock branch 2 times, most recently from d1ecb1c to 12200ec Compare March 6, 2024 12:58
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Mar 6, 2024 •
edited

@skitt: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-capz-azure-file-vmss 98eefa6 link false /test pull-kubernetes-e2e-capz-azure-file-vmss

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 7, 2024
@skitt
Switch from golang/mock to uber-go/mock
6bf667a 
See https://github.com/golang/mock#gomock: golang/mock is no longer
maintained, and should be replaced by go.uber.org/mock.

This allows golang/mock to be dropped from the status and vendored
fields in unwanted-dependencies.json.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 7, 2024
@skitt
Copy link
Member Author

skitt commented Mar 7, 2024

/cancel hold

Post-processing is no longer necessary, the generated comments don’t embed temporary file names etc. @pohly @liggitt this is ready to go AFAICT.

@pohly
Copy link
Contributor

pohly commented Mar 8, 2024

LGTM

I went through the diffs in the generated code and in our files. I've not checked the changes in the vendor directory.

@liggitt
Copy link
Member

liggitt commented Mar 12, 2024

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9f96c2ae4c77f5b637c0b6b01788f64c874471c3

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, skitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 12, 2024
@skitt
Copy link
Member Author

skitt commented Mar 12, 2024

/remove-hold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 12, 2024
@skitt
Copy link
Member Author

skitt commented Mar 12, 2024

/remove-lifecycle rotten

@k8s-ci-robot k8s-ci-robot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Mar 12, 2024
@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Mar 13, 2024
@k8s-ci-robot k8s-ci-robot merged commit 528cff1 into kubernetes:master Apr 18, 2024
20 of 21 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Apr 18, 2024
@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Apr 18, 2024
@skitt skitt deleted the uber-go-mock branch April 22, 2024 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pohly pohly pohly left review comments

@liggitt liggitt liggitt left review comments

@cblecker cblecker cblecker left review comments

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@brianpursley brianpursley Awaiting requested review from brianpursley

@dims dims Awaiting requested review from dims

Assignees

@pohly pohly

@liggitt liggitt

@aojea aojea

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/kubelet area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
SIG CLI
Archived in project
SIG Node CI/Test Board
Archive-it
SIG Node PR Triage
Status: Done
SIG Node PR Triage
Done
Milestone
v1.31
Development

Successfully merging this pull request may close these issues.

None yet