[2024-05-06] Bump dependency updates identified by dependabot

[henrybear327]

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

This pull request completes this week's etcd dependency updates following our dependency roster and dependency management instructions

Summary of actions

• Bumped
  • google.golang.org/protobuf from 1.33.0 to 1.34.1
    • build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.1 in /tools/mod #17953
    • build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.1 #17956
  • go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc from 0.50.0 to 0.51.0
    • build(deps): bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc from 0.50.0 to 0.51.0 #17960
  • golang.org/x/crypto from 0.22.0 to 0.23.0
    • build(deps): bump golang.org/x/crypto from 0.22.0 to 0.23.0 #17958
    • build(deps): bump golang.org/x/crypto from 0.22.0 to 0.23.0 in /tools/mod #17954
  • golang.org/x/net from 0.24.0 to 0.25.0
    • build(deps): bump golang.org/x/net from 0.24.0 to 0.25.0 #17959
• Closed (fully indirect)
  • golang.org/x/text from 0.14.0 to 0.15.0
    • build(deps): bump golang.org/x/text from 0.14.0 to 0.15.0 #17957
  • github.com/pelletier/go-toml/v2 from 2.2.0 to 2.2.2
    • build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.0 to 2.2.2 in /tools/mod #17952
  • github.com/ultraware/whitespace from 0.1.0 to 0.1.1
    • build(deps): bump github.com/ultraware/whitespace from 0.1.0 to 0.1.1 in /tools/mod #17951
  • gitlab.com/bosi/decorder from 0.4.1 to 0.4.2
    • build(deps): bump gitlab.com/bosi/decorder from 0.4.1 to 0.4.2 in /tools/mod #17955

[k8s-ci-robot]

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-sigs/prow repository.

[henrybear327]

Hey @ivanvc,

I need some help resolving the static analysis failure regarding the protobuf. :(

After updating the dependency, it will fail with the following error.

'proto_annotations' started at Thu May  9 12:03:46 CEST 2024
--- ./scripts/etcd_version_annotations.txt      2024-05-05 17:22:55
+++ /var/folders/rt/8_srrksd42q6s84ww5_qyp_40000gn/T/tmp.FUhil46epv     2024-05-09 12:03:47
@@ -456,6 +456,8 @@
 mvccpb.KeyValue.mod_revision: ""
 mvccpb.KeyValue.value: ""
 mvccpb.KeyValue.version: ""
+pb.GoFeatures: ""
+pb.GoFeatures.legacy_unmarshal_json_enum: ""
 walpb.Record: ""
 walpb.Record.crc: ""
 walpb.Record.data: ""
Failed proto-annotations-verification!
If you are adding new proto fields/messages that will be included in raft log:
* Please add etcd_version annotation in *.proto file with next etcd version
* Run ./scripts/genproto.sh
* Run ./scripts/update_proto_annotations.sh
FAIL: 'proto_annotations' FAILED at Thu May  9 12:03:47 CEST 2024

Can you give me some hints? Thank you!

[ivanvc]

@henrybear327, I think you need to run make fix. After that, commit that change

diff --git a/scripts/etcd_version_annotations.txt b/scripts/etcd_version_annotations.txt
index dc78d423e..a9228a661 100644
--- a/scripts/etcd_version_annotations.txt
+++ b/scripts/etcd_version_annotations.txt
@@ -456,6 +456,8 @@ mvccpb.KeyValue.lease: ""
 mvccpb.KeyValue.mod_revision: ""
 mvccpb.KeyValue.value: ""
 mvccpb.KeyValue.version: ""
+pb.GoFeatures: ""
+pb.GoFeatures.legacy_unmarshal_json_enum: ""
 walpb.Record: ""
 walpb.Record.crc: ""
 walpb.Record.data: ""

Along with the protobuf update, then make validate seems to run fine for me.

[ivanvc]

/ok-to-test

[ahrtr]

/ok-to-test

[henrybear327]

@henrybear327, I think you need to run make fix. After that, commit that change

diff --git a/scripts/etcd_version_annotations.txt b/scripts/etcd_version_annotations.txt
index dc78d423e..a9228a661 100644
--- a/scripts/etcd_version_annotations.txt
+++ b/scripts/etcd_version_annotations.txt
@@ -456,6 +456,8 @@ mvccpb.KeyValue.lease: ""
 mvccpb.KeyValue.mod_revision: ""
 mvccpb.KeyValue.value: ""
 mvccpb.KeyValue.version: ""
+pb.GoFeatures: ""
+pb.GoFeatures.legacy_unmarshal_json_enum: ""
 walpb.Record: ""
 walpb.Record.crc: ""
 walpb.Record.data: ""

Along with the protobuf update, then make validate seems to run fine for me.

As suggested, I manually patched the suggested fix from running make verify, and committed the change!

Hopefully the new commit makes sense :)

Thank you @ivanvc !

[ahrtr]

As suggested, I manually patched the suggested fix from running make verify, and committed the change!

FYI. it's recommended to run make fix as mentioned above #17973 (comment)

[ahrtr]

LGTM

Thanks @henrybear327

[ivanvc]

/lgtm thanks, @henrybear327