-
Notifications
You must be signed in to change notification settings - Fork 178
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
Move to Uber mock/mockgen fork #3863
Conversation
/azp run ci,e2e |
Azure Pipelines successfully started running 2 pipeline(s). |
It seems like we don't have
|
/azp run ci,e2e |
Azure Pipelines successfully started running 2 pipeline(s). |
/azp run ci,e2e |
Azure Pipelines successfully started running 2 pipeline(s). |
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.
LGTM
Uber fork, then `go mod tidy` and `go mod vendor` Note the change to `deps.go`
…tes when we were using both repos at the same time
Mocks for these interfaces were previously present, but if you remove them and make generate, they don't get replaced. I'm guessing that when they were added, the committer forgot to commit their changes to the generate.go files. This came to my attention as I was moving us over to the Uber fork because it caused errors while I was trying to get builds and unit tests working, so I codified the generation properly in this commit.
e5c6afd
to
7448b3d
Compare
/azp run |
Azure Pipelines successfully started running 2 pipeline(s). |
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.
Non-blocking question.
@@ -1,5 +1,5 @@ | |||
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT | |||
|
|||
go 1.21 | |||
go 1.21.13 |
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.
Goutham is trying to upgrade us to go 1.22. I see they've added support for 22 recently. Any reason to merget this at 1.21 and then update to 1.22?
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.
Discussed in Slack. We decided to merge this PR as-is since it's blocking stuff, and I'll branch off of Goutham's 1.22 working branch to prepare another 1.22 PR related to this stuff as needed.
Based on a quick conversation with Kipp to prevent merge conflicts or other strangeness we're going to merge this as is with version 1.21 of golang, then create a follow on PR using the branch from #3797 to ensure everything here works with 1.22. Since this blocks other critical work this feels like the best route. |
Which issue this PR addresses:
https://issues.redhat.com/browse/ARO-4360
What this PR does / why we need it:
This PR removes our dependency on https://github.com/golang/mock and completely switches us over to using https://github.com/uber-go/mock instead for two reasons:
Additionally, I upgrade our go-toolset container image from 1.21.11 to 1.21.13 to satisfy Uber mockgen's dependency on Go >= 1.21.12. The corresponding ADO PR is here: https://msazure.visualstudio.com/AzureRedHatOpenShift/_git/ARO.Build.Images/pullrequest/10921698
Test plan for issue:
CI and E2E
Is there any documentation that needs to be updated for this PR?
I don't think so, but let me know if you know of any.
How do you know this will function as expected in production?
E2E during the next release :D