feat(generator): handle Any fields with Value or Struct

Author: colinmoy

generator/internal/discovery_to_proto.cc

@@ -108,7 +108,9 @@ StatusOr<std::string> GetImportForProtobufType(
     std::string const& protobuf_type) {
   static auto const* const kProtobufTypeImports =
       new std::unordered_map<std::string, std::string>{
-          {"google.protobuf.Any", "google/protobuf/any.proto"}};
+          {"google.protobuf.Any", "google/protobuf/any.proto"},
+          {"google.protobuf.Struct", "google/protobuf/struct.proto"},
+          {"google.protobuf.Value", "google/protobuf/struct.proto"}};
 
   auto iter = kProtobufTypeImports->find(protobuf_type);
   if (iter == kProtobufTypeImports->end()) {
@@ -354,7 +356,7 @@ std::set<std::string> FindAllTypesToImport(nlohmann::json const& json) {
     worklist.pop_back();
 
     if (current->contains("type") && (*current)["type"] == "any") {
-      types_to_import.insert("google.protobuf.Any");
+      types_to_import.insert("google.protobuf.Value");
     }
     if (current->contains("$ref")) {
       types_to_import.insert((*current)["$ref"]);

generator/internal/discovery_to_proto_test.cc

@@ -1276,7 +1276,7 @@ TEST(FindAllTypesToImportTest, SimpleAnyField) {
   auto const parsed_json = nlohmann::json::parse(kTypeJson, nullptr, false);
   ASSERT_TRUE(parsed_json.is_object());
   auto result = FindAllTypesToImport(parsed_json);
-  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Any"));
+  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Value"));
 }
 
 TEST(FindAllTypesToImportTest, MultipleSimpleRefFields) {
@@ -1345,7 +1345,7 @@ TEST(FindAllTypesToImportTest, ArrayRefAnyFields) {
   auto const parsed_json = nlohmann::json::parse(kTypeJson, nullptr, false);
   ASSERT_TRUE(parsed_json.is_object());
   auto result = FindAllTypesToImport(parsed_json);
-  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Any", "Bar"));
+  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Value", "Bar"));
 }
 
 TEST(FindAllTypesToImportTest, MapRefFields) {
@@ -1387,7 +1387,7 @@ TEST(FindAllTypesToImportTest, MapAnyFields) {
   auto const parsed_json = nlohmann::json::parse(kTypeJson, nullptr, false);
   ASSERT_TRUE(parsed_json.is_object());
   auto result = FindAllTypesToImport(parsed_json);
-  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Any"));
+  EXPECT_THAT(result, UnorderedElementsAre("google.protobuf.Value"));
 }
 
 TEST(FindAllTypesToImportTest, SingleNestedRefField) {

generator/internal/discovery_type_vertex.cc

@@ -110,7 +110,7 @@ DiscoveryTypeVertex::DetermineTypeAndSynthesis(nlohmann::json const& v,
   }
 
   if (type == "any") {
-    return TypeInfo{"google.protobuf.Any", compare_package_name,
+    return TypeInfo{"google.protobuf.Value", compare_package_name,
                     properties_for_synthesis, false, false};
   }
 
@@ -181,13 +181,16 @@ DiscoveryTypeVertex::DetermineTypeAndSynthesis(nlohmann::json const& v,
       scalar_type = CheckForScalarType(items);
       if (scalar_type) {
         type = *scalar_type;
+      } else if (type == "any") {
+        type = "google.protobuf.Value";
+        return TypeInfo{type, compare_package_name, nullptr, false, false};
       } else if (type == "object" && items.contains("properties")) {
         // Synthesize a nested type for this array.
         type = CapitalizeFirstLetter(field_name + "Item");
         return TypeInfo{type, compare_package_name, &items, false, true};
       } else if (type == "object" && items.contains("additionalProperties") &&
                  (items["additionalProperties"]).value("type", "") == "any") {
-        type = "google.protobuf.Any";
+        type = "google.protobuf.Struct";
         return TypeInfo{type, compare_package_name, nullptr, false, false};
       } else {
         return internal::InvalidArgumentError(

generator/internal/discovery_type_vertex_test.cc

@@ -220,7 +220,8 @@ INSTANTIATE_TEST_SUITE_P(
         DetermineTypesSuccess{"string", R"""({"type":"string"})""", "string",
                               true, false, false, false},
         DetermineTypesSuccess{"any", R"""({"type":"any"})""",
-                              "google.protobuf.Any", true, false, false, false},
+                              "google.protobuf.Value", true, false, false,
+                              false},
         DetermineTypesSuccess{"boolean", R"""({"type":"boolean"})""", "bool",
                               true, false, false, false},
         DetermineTypesSuccess{"integer_no_format", R"""({"type":"integer"})""",
@@ -246,7 +247,10 @@ INSTANTIATE_TEST_SUITE_P(
         DetermineTypesSuccess{
             "array_any",
             R"""({"type":"array","items":{"type":"object","additionalProperties":{"type":"any"}}})""",
-            "google.protobuf.Any", true, false, false, false},
+            "google.protobuf.Struct", true, false, false, false},
+        DetermineTypesSuccess{
+            "array_items_any", R"""({"type":"array","items":{"type":"any"}})""",
+            "google.protobuf.Value", true, false, false, false},
         DetermineTypesSuccess{
             "array_nested_message",
             R"""({"type":"array","items":{"type":"object", "properties":{}}})""",