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

[2024-04-08] Bump dependency updates identified by dependabot #17751

Merged
merged 4 commits into from
Apr 10, 2024

Conversation

@k8s-ci-robot
Copy link

Hi @henrybear327. Thanks for your PR.

I'm waiting for a etcd-io 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.

@henrybear327
Copy link
Contributor Author

Thanks to @ivanvc for the help!

@ivanvc
Copy link
Member

ivanvc commented Apr 8, 2024

/ok-to-test

@ivanvc
Copy link
Member

ivanvc commented Apr 8, 2024

@henrybear327, seems like the commits are not properly signed

@henrybear327 henrybear327 force-pushed the dependencies/04_08_2024 branch from 01d8fc2 to 227b00b Compare April 8, 2024 19:48
Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

Reference:
- etcd-io#17738

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
@henrybear327 henrybear327 force-pushed the dependencies/04_08_2024 branch from 227b00b to fd2b930 Compare April 8, 2024 20:09
@henrybear327
Copy link
Contributor Author

Nit: Suggest following the commit message format specified here: https://github.com/etcd-io/etcd/blob/main/Documentation/contributor-guide/dependency_management.md#steps-to-bump-a-dependency

Fixed :)

@henrybear327
Copy link
Contributor Author

@henrybear327, seems like the commits are not properly signed

Thanks for spotting! :)

@ivanvc
Copy link
Member

ivanvc commented Apr 8, 2024

/retest

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

Hey @henrybear327 - Thanks for taking care of dependencies this week. We need to bump golang.org/x/crypto it is not purely indirect, refer:

 james  ~  D  etcd   dependencies/0..                                                                          12:06:53 
 ➜ grep -Ri "golang.org/x/crypto v" | grep -v sum
tests/go.mod:   golang.org/x/crypto v0.21.0
server/go.mod:  golang.org/x/crypto v0.21.0
tools/mod/go.mod:       golang.org/x/crypto v0.21.0 // indirect
go.mod: golang.org/x/crypto v0.21.0 // indirect
etcdutl/go.mod: golang.org/x/crypto v0.21.0 // indirect

We also need to bump grpc in all places, checking this pr there are a couple of instances where grpc is using an older version:

 james  ~  D  etcd   dependencies/0..                                                                          12:07:16 
 ➜ grep -Ri "google.golang.org/grpc v" | grep -v sum
etcdctl/go.mod: google.golang.org/grpc v1.63.0
pkg/go.mod:     google.golang.org/grpc v1.63.0
tests/go.mod:   google.golang.org/grpc v1.63.0
server/go.mod:  google.golang.org/grpc v1.63.0
tools/mod/go.mod:       google.golang.org/grpc v1.62.1 // indirect
tools/testgrid-analysis/go.mod: google.golang.org/grpc v1.62.1 // indirect
client/v3/go.mod:       google.golang.org/grpc v1.63.0
go.mod: google.golang.org/grpc v1.63.0
etcdutl/go.mod: google.golang.org/grpc v1.63.0 // indirect
api/go.mod:     google.golang.org/grpc v1.63.0

@ivanvc
Copy link
Member

ivanvc commented Apr 9, 2024

Hi @jmhbnz, I also noticed google.golang.org/grpc v1.62.1 in tools/testgrid-analysis. While I was looking at it, I realized that scripts/fix.sh, specifically scripts/test_lib.sh's run_for_modules is not running for tools/{testgrid-analysis,rw-heatmaps}.

I'm not sure we want to add those two new directories with go modules to module_dirs. I'm also not sure if they will dodge some of the checks that the current library does over the code (i.e., static checks).

@jmhbnz
Copy link
Member

jmhbnz commented Apr 9, 2024

Hi @jmhbnz, I also noticed google.golang.org/grpc v1.62.1 in tools/testgrid-analysis. While I was looking at it, I realized that scripts/fix.sh, specifically scripts/test_lib.sh's run_for_modules is not running for tools/{testgrid-analysis,rw-heatmaps}.

I'm not sure we want to add those two new directories with go modules to module_dirs. I'm also not sure if they will dodge some of the checks that the current library does over the code (i.e., static checks).

Good spotting. My first instinct is we should probably update test_lib.sh, @ahrtr do you agree?

@ahrtr
Copy link
Member

ahrtr commented Apr 9, 2024

I realized that scripts/fix.sh, specifically scripts/test_lib.sh's run_for_modules is not running for tools/{testgrid-analysis,rw-heatmaps}.

Yes, please update the script to cover the tools/* as well. It's another minor technical debt I noticed long time ago. Thanks both @ivanvc @jmhbnz

@henrybear327 henrybear327 force-pushed the dependencies/04_08_2024 branch from fd2b930 to 20106a9 Compare April 9, 2024 10:17
@henrybear327
Copy link
Contributor Author

Hey @henrybear327 - Thanks for taking care of dependencies this week. We need to bump golang.org/x/crypto it is not purely indirect, refer:

 james  ~  D  etcd   dependencies/0..                                                                          12:06:53 
 ➜ grep -Ri "golang.org/x/crypto v" | grep -v sum
tests/go.mod:   golang.org/x/crypto v0.21.0
server/go.mod:  golang.org/x/crypto v0.21.0
tools/mod/go.mod:       golang.org/x/crypto v0.21.0 // indirect
go.mod: golang.org/x/crypto v0.21.0 // indirect
etcdutl/go.mod: golang.org/x/crypto v0.21.0 // indirect

We also need to bump grpc in all places, checking this pr there are a couple of instances where grpc is using an older version:

 james  ~  D  etcd   dependencies/0..                                                                          12:07:16 
 ➜ grep -Ri "google.golang.org/grpc v" | grep -v sum
etcdctl/go.mod: google.golang.org/grpc v1.63.0
pkg/go.mod:     google.golang.org/grpc v1.63.0
tests/go.mod:   google.golang.org/grpc v1.63.0
server/go.mod:  google.golang.org/grpc v1.63.0
tools/mod/go.mod:       google.golang.org/grpc v1.62.1 // indirect
tools/testgrid-analysis/go.mod: google.golang.org/grpc v1.62.1 // indirect
client/v3/go.mod:       google.golang.org/grpc v1.63.0
go.mod: google.golang.org/grpc v1.63.0
etcdutl/go.mod: google.golang.org/grpc v1.63.0 // indirect
api/go.mod:     google.golang.org/grpc v1.63.0

Thanks @jmhbnz for reviewing and catching issues! :)

I have ended up adding go.opentelemetry.io/proto/otlp as it's not fully indirect, either!

References:
- etcd-io#17748
- etcd-io#17749
- etcd-io#17750

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
References:
- etcd-io#17746

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
References:
- etcd-io#17750

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

LGTM - Thanks @henrybear327

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

lgtm

Thanks

@ahrtr ahrtr merged commit c639546 into etcd-io:main Apr 10, 2024
44 checks passed
@henrybear327 henrybear327 deleted the dependencies/04_08_2024 branch April 10, 2024 07:36
@ivanvc
Copy link
Member

ivanvc commented Apr 10, 2024

Hi @henrybear327, it looks like the summary of actions in the description got out of date after you bumped other dependencies.

Edit: You mentioned that #17748 was going to be bumped. It's direct, but it isn't part of these commits.

@henrybear327
Copy link
Contributor Author

Hi @henrybear327, it looks like the summary of actions in the description got out of date after you bumped other dependencies.

Edit: You mentioned that #17748 was going to be bumped. It's direct, but it isn't part of these commits.

That's a miss ... sorry. I will fix it in #17767

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

5 participants