feat(ingest): support reserved keywords in model codegen (#6351)

datahub-project · Nov 3, 2022 · 0ca3383 · 0ca3383
1 parent ff885f0
commit 0ca3383
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/metadata-ingestion/scripts/avro_codegen.py b/metadata-ingestion/scripts/avro_codegen.py
@@ -197,6 +197,7 @@ def generate(schemas_path: str, outdir: str) -> None:
         "mxe/MetadataChangeLog.avsc",
         "mxe/PlatformEvent.avsc",
         "platform/event/v1/EntityChangeEvent.avsc",
+        "metadata/query/filter/Filter.avsc",  # temporarily added to test reserved keywords support
     }
 
     # Find all the aspect schemas / other important schemas.

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
@@ -35,7 +35,7 @@ def get_long_description():
     "entrypoints",
     "docker",
     "expandvars>=0.6.5",
-    "avro-gen3==0.7.6",
+    "avro-gen3==0.7.7",
     # "avro-gen3 @ git+https://github.com/acryldata/avro_gen@master#egg=avro-gen3",
     "avro>=1.10.2,<1.11",
     "python-dateutil>=2.8.0",

diff --git a/metadata-ingestion/tests/unit/serde/test_serde.py b/metadata-ingestion/tests/unit/serde/test_serde.py
@@ -290,3 +290,22 @@ def test_missing_optional_in_union() -> None:
     original = models.DataHubPolicyInfoClass.from_obj(original_json)
 
     assert revised == original
+
+
+def test_reserved_keywords() -> None:
+    filter1 = models.FilterClass()
+    assert filter1.or_ is None
+
+    filter2 = models.FilterClass(
+        or_=[
+            models.ConjunctiveCriterionClass(
+                and_=[
+                    models.CriterionClass(field="foo", value="var", negated=True),
+                ]
+            )
+        ]
+    )
+    assert "or" in filter2.to_obj()
+
+    filter3 = models.FilterClass.from_obj(filter2.to_obj())
+    assert filter2 == filter3