diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index f3372054d7aa..6b37c24503ed 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -948,13 +948,13 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "grpc-httpjson-transcoding", project_desc = "Library that supports transcoding so that HTTP/JSON can be converted to gRPC", project_url = "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding", - version = "ff41eb3fc9209e6197595b54f7addfa244c0bdb6", - sha256 = "dea66b3d2dfc150373697e25b1327877e0b7480dc2bacfff1e3fd7aa00b12790", + version = "20e58e7ef9c3878ae9fc89123b9aba36d6f98a7f", + sha256 = "2f0ea248c59f51e5376f23590a986813b96076531ffe27a805f7a37407a81a87", strip_prefix = "grpc-httpjson-transcoding-{version}", urls = ["https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], extensions = ["envoy.filters.http.grpc_json_transcoder", "envoy.filters.http.grpc_field_extraction", "envoy.filters.http.proto_message_extraction"], - release_date = "2023-06-07", + release_date = "2024-08-30", cpe = "N/A", license = "Apache-2.0", license_url = "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding/blob/{version}/LICENSE", diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc index 2ffc80e63720..d4ea9bdbf9e6 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc @@ -45,6 +45,7 @@ using TranscoderPtr = std::unique_ptr; using google::grpc::transcoding::TranscoderInputStream; using TranscoderInputStreamPtr = std::unique_ptr; using envoy::extensions::filters::http::grpc_json_transcoder::v3::UnknownQueryParams; +using google::grpc::transcoding::VariableBinding; namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h index dd3550967e65..28766f34acea 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h +++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h @@ -25,23 +25,6 @@ namespace Extensions { namespace HttpFilters { namespace GrpcJsonTranscoder { -/** - * VariableBinding specifies a value for a single field in the request message. - * When transcoding HTTP/REST/JSON to gRPC/proto the request message is - * constructed using the HTTP body and the variable bindings (specified through - * request url). - * See https://github.com/googleapis/googleapis/blob/master/google/api/http.proto - * for details of variable binding. - */ -struct VariableBinding { - // The location of the field in the protobuf message, where the value - // needs to be inserted, e.g. "shelf.theme" would mean the "theme" field - // of the nested "shelf" message of the request protobuf message. - std::vector field_path; - // The value to be inserted. - std::string value; -}; - struct MethodInfo { const Protobuf::MethodDescriptor* descriptor_ = nullptr; std::vector request_body_field_path;