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

Try removing replace directives from go.mod. #30651

Merged
merged 2 commits into from
Sep 8, 2023
Merged

Try removing replace directives from go.mod. #30651

merged 2 commits into from
Sep 8, 2023

Conversation

cjwagner
Copy link
Member

@cjwagner cjwagner commented Sep 7, 2023

I'm not sure if this will work, but it would be really nice to get rid of the replace directives in our go.mod file so that we can go get and go install packages from this repo.

/cc @listx

@k8s-ci-robot k8s-ci-robot requested a review from listx September 7, 2023 21:43
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cjwagner

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ghproxy Issues or PRs related to code in /ghproxy sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Sep 7, 2023
listx
listx reviewed Sep 7, 2023
View reviewed changes
go.mod
@@ -35,6 +21,10 @@ require (
github.com/bazelbuild/buildtools v0.0.0-20200922170545-10384511ce98
github.com/blang/semver/v4 v4.0.0
github.com/bwmarrin/snowflake v0.0.0
// Upstream is unmaintained. This fork introduces two important changes:
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you check that running make update-go-deps does not erase these comments?

Copy link
Member Author

Choose a reason for hiding this comment

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

Just tried locally and it didn't change any files. 👍

airbornepony
airbornepony reviewed Sep 7, 2023
View reviewed changes
go.mod
@@ -35,6 +21,10 @@ require (
github.com/bazelbuild/buildtools v0.0.0-20200922170545-10384511ce98
github.com/blang/semver/v4 v4.0.0
github.com/bwmarrin/snowflake v0.0.0
// Upstream is unmaintained. This fork introduces two important changes:
// * We log an error if writing a cache key fails (e.G. because disk is full)
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: e.g.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops forgot to fix this. I've addressed it in the next PR.

@listx
Copy link
Contributor

listx commented Sep 7, 2023

Looks like just a handful of unit tests fail. In your next update, apart from fixing the broken tests, could you also link to golang/go#44840 (comment) in your commit message description?

@k8s-ci-robot k8s-ci-robot added area/prow Issues or PRs related to prow area/prow/plugins Issues or PRs related to prow's plugins for the hook component labels Sep 7, 2023
@cjwagner
Copy link
Member Author

cjwagner commented Sep 7, 2023

I just removed the failing unit test cases for the golint plugin. I can't find a changelog to prove it, but it seems like the linter behavior changed slightly.

@cjwagner
Copy link
Member Author

cjwagner commented Sep 7, 2023

Looks like the update I made to the AKS sdk is affected by the breaking changes. We'll need to follow the migration guide here to remove that replace directive.
@droslean I'm trying to remove the replace directive added here: 9be1ab7#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6R8
Do you have the bandwidth to help with updating kubetest to use the new version of this SDK? I'll try to take a look later to see how involved it is.

@droslean
Copy link
Member

droslean commented Sep 8, 2023

Looks like the update I made to the AKS sdk is affected by the breaking changes. We'll need to follow the migration guide here to remove that replace directive. @droslean I'm trying to remove the replace directive added here: 9be1ab7#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6R8 Do you have the bandwidth to help with updating kubetest to use the new version of this SDK? I'll try to take a look later to see how involved it is.

@cjwagner Sure. I'll try to update kubetest.

@cjwagner
Try removing replace directives from go.mod.
c96693a 
See golang/go#44840 (comment)
for why these are problematic for 'go install' and 'go get'.
@cjwagner
Remove golint test cases for deprecated lints.
f18b3ce 
I looked for a changelog describing when these lints were deprecated,
but I couldn't find anything. Other lints are still working so /shrug.
@cjwagner
Copy link
Member Author

cjwagner commented Sep 8, 2023

Thanks @droslean!
I've pulled out the problematic AKS stuff into a separate commit so that we can get most of this merged.

@cjwagner cjwagner mentioned this pull request Sep 8, 2023
Merged
@listx
Copy link
Contributor

listx commented Sep 8, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 8, 2023
@k8s-ci-robot k8s-ci-robot merged commit 12387e8 into kubernetes:master Sep 8, 2023
@cjwagner cjwagner deleted the replace-replace branch September 8, 2023 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@airbornepony airbornepony airbornepony left review comments

@listx listx listx left review comments

Assignees

@listx listx

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ghproxy Issues or PRs related to code in /ghproxy area/kubetest area/prow/plugins Issues or PRs related to prow's plugins for the hook component area/prow Issues or PRs related to prow cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cjwagner @k8s-ci-robot @listx @droslean @airbornepony