Skip to content

Fix bug in map field to JSON conversion. #2221

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.

Sign up for GitHub

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

Merged
copybara-service merged 1 commit into from
Aug 20, 2026
+19 −2
Merged

Fix bug in map field to JSON conversion. #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/values/parsed_map_field_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ absl::Status ParsedMapFieldValue::SerializeTo(
google::protobuf::Value message;
CEL_RETURN_IF_ERROR(internal::MessageFieldToJson(
*message_, field_, descriptor_pool, message_factory, &message));
if (!message.list_value().SerializePartialToZeroCopyStream(output)) {
if (!message.struct_value().SerializePartialToZeroCopyStream(output)) {
return absl::UnknownError("failed to serialize google.protobuf.Struct");
}
return absl::OkStatus();
Expand Down
19 changes: 18 additions & 1 deletion common/values/parsed_map_field_value_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ TEST_F(ParsedMapFieldValueTest, IsZeroValue) {
EXPECT_TRUE(value.IsZeroValue());
}

TEST_F(ParsedMapFieldValueTest, SerializeTo) {
TEST_F(ParsedMapFieldValueTest, SerializeToEmpty) {
ParsedMapFieldValue value(
DynamicParseTextProto<TestAllTypesProto3>(R"pb()pb"),
DynamicGetField<TestAllTypesProto3>("map_int64_int64"), arena());
Expand All @@ -112,6 +112,23 @@ TEST_F(ParsedMapFieldValueTest, SerializeTo) {
EXPECT_THAT(std::move(output).Consume(), IsEmpty());
}

TEST_F(ParsedMapFieldValueTest, SerializeTo) {
ParsedMapFieldValue value(
DynamicParseTextProto<TestAllTypesProto3>(
R"pb(map_string_string { key: "foo" value: "bar" })pb"),
DynamicGetField<TestAllTypesProto3>("map_string_string"), arena());
google::protobuf::io::CordOutputStream output;
EXPECT_THAT(value.SerializeTo(descriptor_pool(), message_factory(), &output),
IsOk());
google::protobuf::Struct actual;
EXPECT_TRUE(actual.ParsePartialFromCord(std::move(output).Consume()));
EXPECT_THAT(actual, EqualsTextProto<google::protobuf::Struct>(
R"pb(fields {
key: "foo"
value { string_value: "bar" }
})pb"));
}

TEST_F(ParsedMapFieldValueTest, ConvertToJson) {
auto json = DynamicParseTextProto<google::protobuf::Value>(R"pb()pb");
ParsedMapFieldValue value(
Expand Down
Loading