From ca964f185853ed2a3df394435dffdb07cc4707e6 Mon Sep 17 00:00:00 2001 From: Xynnn007 Date: Thu, 12 Dec 2024 10:32:09 +0800 Subject: [PATCH] chore: update protobuf version Signed-off-by: Xynnn007 --- Cargo.lock | 42 +++++++++---------- Cargo.toml | 2 +- .../src/ttrpc_proto/attestation_agent.rs | 4 +- .../src/ttrpc_proto/confidential_data_hub.rs | 4 +- .../token_provider/aa/attestation_agent.rs | 4 +- .../hub/src/bin/protos/api.rs | 4 +- .../hub/src/bin/protos/keyprovider.rs | 4 +- .../resource/kbs/ttrpc_proto/getresource.rs | 4 +- ocicrypt-rs/src/utils/ttrpc/keyprovider.rs | 4 +- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4258741c5..53c6a06fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -210,7 +210,7 @@ dependencies = [ "clap 4.2.7", "form_urlencoded", "hyper 0.14.28", - "protobuf 3.5.1", + "protobuf 3.7.1", "serde_json", "tokio", "ttrpc", @@ -350,7 +350,7 @@ dependencies = [ "kbs_protocol", "log", "prost 0.13.4", - "protobuf 3.5.1", + "protobuf 3.7.1", "reqwest 0.12.9", "rstest", "serde", @@ -1135,7 +1135,7 @@ dependencies = [ "nix 0.29.0", "p12", "prost 0.13.4", - "protobuf 3.5.1", + "protobuf 3.7.1", "rand", "reqwest 0.12.9", "resource_uri", @@ -3011,7 +3011,7 @@ dependencies = [ "oci-spec", "ocicrypt-rs", "prost 0.13.4", - "protobuf 3.5.1", + "protobuf 3.7.1", "reqwest 0.12.9", "resource_uri", "ring", @@ -3355,7 +3355,7 @@ dependencies = [ "base64 0.22.1", "serde", "serde_json", - "thiserror 2.0.3", + "thiserror 2.0.6", ] [[package]] @@ -3372,7 +3372,7 @@ dependencies = [ "jwt-simple", "kbs-types", "log", - "protobuf 3.5.1", + "protobuf 3.7.1", "reqwest 0.12.9", "resource_uri", "rstest", @@ -4207,7 +4207,7 @@ dependencies = [ "openssl", "pin-project-lite", "prost 0.13.4", - "protobuf 3.5.1", + "protobuf 3.7.1", "resource_uri", "ring", "serde", @@ -4882,9 +4882,9 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "protobuf" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", @@ -4902,13 +4902,13 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" +checksum = "e26b833f144769a30e04b1db0146b2aaa53fd2fd83acf10a6b5f996606c18144" dependencies = [ "anyhow", "once_cell", - "protobuf 3.5.1", + "protobuf 3.7.1", "protobuf-parse", "regex", "tempfile", @@ -4917,14 +4917,14 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" +checksum = "322330e133eab455718444b4e033ebfac7c6528972c784fcde28d2cc783c6257" dependencies = [ "anyhow", "indexmap 2.2.3", "log", - "protobuf 3.5.1", + "protobuf 3.7.1", "protobuf-support", "tempfile", "thiserror 1.0.69", @@ -4933,9 +4933,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ "thiserror 1.0.69", ] @@ -6806,8 +6806,8 @@ dependencies = [ "libc", "log", "nix 0.26.4", - "protobuf 3.5.1", - "protobuf-codegen 3.5.1", + "protobuf 3.7.1", + "protobuf-codegen 3.7.1", "thiserror 1.0.69", "tokio", "tokio-vsock", @@ -6821,7 +6821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d7f7631d7a9ebed715a47cd4cb6072cbc7ae1d4ec01598971bbec0024340c2" dependencies = [ "protobuf 2.28.0", - "protobuf-codegen 3.5.1", + "protobuf-codegen 3.7.1", "protobuf-support", "ttrpc-compiler", ] diff --git a/Cargo.toml b/Cargo.toml index 00a6709c6..0e17ca436 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ log = "0.4.22" nix = "0.29" openssl = "0.10" prost = "0.13" -protobuf = "3.5.1" +protobuf = "3.7.1" rand = "0.8.5" reqwest = { version = "0.12", default-features = false } resource_uri = { path = "attestation-agent/deps/resource_uri" } diff --git a/api-server-rest/src/ttrpc_proto/attestation_agent.rs b/api-server-rest/src/ttrpc_proto/attestation_agent.rs index b1c66c9d8..ff9e89578 100644 --- a/api-server-rest/src/ttrpc_proto/attestation_agent.rs +++ b/api-server-rest/src/ttrpc_proto/attestation_agent.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:attestation_agent.GetEvidenceRequest) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/api-server-rest/src/ttrpc_proto/confidential_data_hub.rs b/api-server-rest/src/ttrpc_proto/confidential_data_hub.rs index 0902e6217..0a0268254 100644 --- a/api-server-rest/src/ttrpc_proto/confidential_data_hub.rs +++ b/api-server-rest/src/ttrpc_proto/confidential_data_hub.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:api.GetResourceRequest) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/attestation-agent/kbs_protocol/src/token_provider/aa/attestation_agent.rs b/attestation-agent/kbs_protocol/src/token_provider/aa/attestation_agent.rs index 5ce4693dc..ba0e0ce1c 100644 --- a/attestation-agent/kbs_protocol/src/token_provider/aa/attestation_agent.rs +++ b/attestation-agent/kbs_protocol/src/token_provider/aa/attestation_agent.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:attestation_agent.GetEvidenceRequest) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/confidential-data-hub/hub/src/bin/protos/api.rs b/confidential-data-hub/hub/src/bin/protos/api.rs index ec5b63ecc..d20b85bce 100644 --- a/confidential-data-hub/hub/src/bin/protos/api.rs +++ b/confidential-data-hub/hub/src/bin/protos/api.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:api.UnsealSecretInput) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/confidential-data-hub/hub/src/bin/protos/keyprovider.rs b/confidential-data-hub/hub/src/bin/protos/keyprovider.rs index a5e5c412c..606647028 100644 --- a/confidential-data-hub/hub/src/bin/protos/keyprovider.rs +++ b/confidential-data-hub/hub/src/bin/protos/keyprovider.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:keyprovider.KeyProviderKeyWrapProtocolInput) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/image-rs/src/resource/kbs/ttrpc_proto/getresource.rs b/image-rs/src/resource/kbs/ttrpc_proto/getresource.rs index d6ea19b9b..2367f0112 100644 --- a/image-rs/src/resource/kbs/ttrpc_proto/getresource.rs +++ b/image-rs/src/resource/kbs/ttrpc_proto/getresource.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:api.GetResourceRequest) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/ocicrypt-rs/src/utils/ttrpc/keyprovider.rs b/ocicrypt-rs/src/utils/ttrpc/keyprovider.rs index 2de64c499..573d5747d 100644 --- a/ocicrypt-rs/src/utils/ttrpc/keyprovider.rs +++ b/ocicrypt-rs/src/utils/ttrpc/keyprovider.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit +// This file is generated by rust-protobuf 3.7.1. Do not edit // .proto file is parsed by pure // @generated @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:keyprovider.KeyProviderKeyWrapProtocolInput) #[derive(PartialEq,Clone,Default,Debug)]