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

deps: upgrade golang.org/x/{crypto,mod,net,sys,text,tools,term} #103446

Merged
merged 1 commit into from
May 17, 2023

Conversation

andyyang890
Copy link
Collaborator

@andyyang890 andyyang890 commented May 16, 2023

This patch updates the following core dependencies as follows:

  • golang.org/x/crypto from v0.6.0 to v0.7.0
  • golang.org/x/mod from v0.7.0 to v0.8.0
  • golang.org/x/net from v0.7.0 to v0.8.0
  • golang.org/x/sys from v0.5.0 to v0.6.0
  • golang.org/x/text from v0.7.0 to v0.8.0
  • golang.org/x/tools from v0.1.12 to v0.6.0
  • golang.org/x/term from v0.5.0 to v0.6.0

Also update rules_go to a compatible version (0.38).

Informs #21001

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart rickystewart force-pushed the upgrade_golang_deps branch from 4013276 to 0a650c8 Compare May 16, 2023 20:20
@rickystewart rickystewart requested a review from a team as a code owner May 16, 2023 20:20
@rickystewart rickystewart force-pushed the upgrade_golang_deps branch from 0a650c8 to 0b79969 Compare May 16, 2023 20:25
@andyyang890 andyyang890 requested review from knz and rafiss May 16, 2023 20:39
This patch updates the following core dependencies as follows:
* golang.org/x/crypto from v0.6.0 to v0.7.0
* golang.org/x/mod from v0.7.0 to v0.8.0
* golang.org/x/net from v0.7.0 to v0.8.0
* golang.org/x/sys from v0.5.0 to v0.6.0
* golang.org/x/text from v0.7.0 to v0.8.0
* golang.org/x/tools from v0.1.12 to v0.6.0
* golang.org/x/term from v0.5.0 to v0.6.0

Also update `rules_go` to a compatible version (0.38).

Release note: None
@andyyang890 andyyang890 force-pushed the upgrade_golang_deps branch from 0b79969 to 161de46 Compare May 16, 2023 20:43
@andyyang890 andyyang890 changed the title deps: upgrade golang.org/x/{mod,net,sys,text,tools,term} deps: upgrade golang.org/x/{crypto,mod,net,sys,text,tools,term} May 16, 2023
@andyyang890 andyyang890 requested a review from a team May 16, 2023 21:13
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

lgtm!

@knz
Copy link
Contributor

knz commented May 17, 2023

looking at the diffs in each repo,

  • golang.org/x/crypto from v0.6.0 to v0.7.0
  • golang.org/x/mod from v0.7.0 to v0.8.0
  • golang.org/x/net from v0.7.0 to v0.8.0
  • golang.org/x/sys from v0.5.0 to v0.6.0
  • golang.org/x/text from v0.7.0 to v0.8.0
  • golang.org/x/tools from v0.1.12 to v0.6.0
  • golang.org/x/term from v0.5.0 to v0.6.0

@knz
Copy link
Contributor

knz commented May 17, 2023

Of these, the upgrade of x/tools is the largest one. It's going to take a little longer to look at.

@knz
Copy link
Contributor

knz commented May 17, 2023

Ok actually most of the changes in x/tools pertain to gopls, which we don't import in crdb. The remaining changes are on the analysis packages. They are all beneficial to us.

@knz
Copy link
Contributor

knz commented May 17, 2023

For references:

  • in each of the packages, I ran git log --patch vOLD...vNEW and inspected the results:
    • for any changes to APIs that would impact our code
    • for any impl changes that could impact semantics we care about
    • didn't find anything worrying.
  • for x/tools, that was way too many changes, so instead I ran git log --patch vOLD...vNEW | diffstat to first get a sense of which sub-packages saw most movement and focus the review there. This is how I noticed most of the changes were on gopls
  • so I re-ran git log vOLD...vNEW -- go/ in x/tools to get just the subset of changes pertaining to the go sub-directory, which is the one we used. Then I inspected that and satisfied myself that none of the changes impact our production code.

@andyyang890
Copy link
Collaborator Author

Thanks for the in-depth review!

bors r=rafiss,knz

@craig
Copy link
Contributor

craig bot commented May 17, 2023

This PR was included in a batch that timed out, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented May 17, 2023

This PR was included in a batch that timed out, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented May 17, 2023

Build succeeded:

@craig craig bot merged commit d64d978 into cockroachdb:master May 17, 2023
@andyyang890 andyyang890 deleted the upgrade_golang_deps branch May 17, 2023 21:14
@rickystewart
Copy link
Collaborator

blathers backport 23.1

@blathers-crl
Copy link

blathers-crl bot commented Jul 7, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 161de46 to blathers/backport-release-23.1-103446: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

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.

5 participants