Skip to content

Commit 5c08c21

Browse files
authored
Replace deprecated Protobuf::ParseFromArray (#41845)
Risk Level: none Testing: unit tests Docs Changes: n/a Release Notes: n/a Platform Specific Features: n/a Signed-off-by: Yan Avlasov <[email protected]>
1 parent bdfd1e9 commit 5c08c21

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

source/extensions/common/wasm/context.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ WasmResult Context::grpcCall(std::string_view grpc_service, std::string_view ser
934934
std::string_view request, std::chrono::milliseconds timeout,
935935
uint32_t* token_ptr) {
936936
GrpcService service_proto;
937-
if (!service_proto.ParseFromArray(grpc_service.data(), grpc_service.size())) {
937+
if (!service_proto.ParseFromString(grpc_service)) {
938938
auto cluster_name = std::string(grpc_service.substr(0, grpc_service.size()));
939939
const auto thread_local_cluster = clusterManager().getThreadLocalCluster(cluster_name);
940940
if (thread_local_cluster == nullptr) {
@@ -983,7 +983,7 @@ WasmResult Context::grpcStream(std::string_view grpc_service, std::string_view s
983983
std::string_view method_name, const Pairs& initial_metadata,
984984
uint32_t* token_ptr) {
985985
GrpcService service_proto;
986-
if (!service_proto.ParseFromArray(grpc_service.data(), grpc_service.size())) {
986+
if (!service_proto.ParseFromString(grpc_service)) {
987987
auto cluster_name = std::string(grpc_service.substr(0, grpc_service.size()));
988988
const auto thread_local_cluster = clusterManager().getThreadLocalCluster(cluster_name);
989989
if (thread_local_cluster == nullptr) {

source/extensions/common/wasm/foreign.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RegisterForeignFunction registerVerifySignatureForeignFunction(
9696
[](WasmBase&, std::string_view arguments,
9797
const std::function<void*(size_t size)>& alloc_result) -> WasmResult {
9898
envoy::source::extensions::common::wasm::VerifySignatureArguments args;
99-
if (args.ParseFromArray(arguments.data(), arguments.size())) {
99+
if (args.ParseFromString(arguments)) {
100100
const auto& hash = args.hash_function();
101101
auto signature_str = args.signature();
102102
auto text_str = args.text();
@@ -209,7 +209,7 @@ RegisterForeignFunction registerSetEnvoyFilterStateForeignFunction(
209209
[](WasmBase&, std::string_view arguments,
210210
const std::function<void*(size_t size)>&) -> WasmResult {
211211
envoy::source::extensions::common::wasm::SetEnvoyFilterStateArguments args;
212-
if (args.ParseFromArray(arguments.data(), arguments.size())) {
212+
if (args.ParseFromString(arguments)) {
213213
auto context = static_cast<Context*>(proxy_wasm::current_context_);
214214
return context->setEnvoyFilterState(args.path(), args.value(),
215215
toFilterStateLifeSpan(args.span()));
@@ -393,7 +393,7 @@ class DeclarePropertyFactory {
393393
WasmForeignFunction f = [self](WasmBase&, std::string_view arguments,
394394
const std::function<void*(size_t size)>&) -> WasmResult {
395395
envoy::source::extensions::common::wasm::DeclarePropertyArguments args;
396-
if (args.ParseFromArray(arguments.data(), arguments.size())) {
396+
if (args.ParseFromString(arguments)) {
397397
CelStateType type = CelStateType::Bytes;
398398
switch (args.type()) {
399399
case envoy::source::extensions::common::wasm::WasmType::Bytes:

test/extensions/filters/http/wasm/test_data/test_cpp.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ void TestRootContext::onTick() {
790790
if (WasmResult::Ok == proxy_call_foreign_function(function.data(), function.size(), in.data(),
791791
in.size(), &out, &out_size)) {
792792
envoy::source::extensions::common::wasm::VerifySignatureResult result;
793-
if (result.ParseFromArray(out, static_cast<int>(out_size)) && result.result()) {
793+
if (result.ParseFromString(absl::string_view(out, out_size)) && result.result()) {
794794
logInfo("signature is valid");
795795
} else {
796796
logError(result.error());
@@ -814,7 +814,7 @@ void TestRootContext::onTick() {
814814
if (WasmResult::Ok == proxy_call_foreign_function(function.data(), function.size(), in.data(),
815815
in.size(), &out, &out_size)) {
816816
envoy::source::extensions::common::wasm::VerifySignatureResult result;
817-
if (result.ParseFromArray(out, static_cast<int>(out_size)) && result.result()) {
817+
if (result.ParseFromString(absl::string_view(out, out_size)) && result.result()) {
818818
logCritical("signature should not be ok");
819819
} else {
820820
logError(result.error());
@@ -837,7 +837,7 @@ void TestRootContext::onTick() {
837837
if (WasmResult::Ok == proxy_call_foreign_function(function.data(), function.size(), in.data(),
838838
in.size(), &out, &out_size)) {
839839
envoy::source::extensions::common::wasm::VerifySignatureResult result;
840-
if (result.ParseFromArray(out, static_cast<int>(out_size)) && result.result()) {
840+
if (result.ParseFromString(absl::string_view(out, out_size)) && result.result()) {
841841
logCritical("signature should not be ok");
842842
} else {
843843
logError(result.error());
@@ -861,7 +861,7 @@ void TestRootContext::onTick() {
861861
if (WasmResult::Ok == proxy_call_foreign_function(function.data(), function.size(), in.data(),
862862
in.size(), &out, &out_size)) {
863863
envoy::source::extensions::common::wasm::VerifySignatureResult result;
864-
if (result.ParseFromArray(out, static_cast<int>(out_size)) && result.result()) {
864+
if (result.ParseFromString(absl::string_view(out, out_size)) && result.result()) {
865865
logCritical("signature should not be ok");
866866
} else {
867867
logError(result.error());

0 commit comments

Comments
 (0)