Merge pull request #1109 from benjeffery/no_additional_properties

Raise error when additional_properties specified for struct codec

Author: mergify[bot]

python/tests/test_metadata.py

@@ -1478,6 +1478,18 @@ def test_too_long_array(self):
         ):
             metadata.MetadataSchema(schema).validate_and_encode_row(data2)
 
+    def test_additional_properties(self):
+        schema = {
+            "codec": "struct",
+            "type": "object",
+            "additional_properties": True,
+            "properties": {},
+        }
+        with pytest.raises(
+            ValueError, match="Struct codec does not support additional_properties"
+        ):
+            metadata.MetadataSchema(schema)
+
 
 class TestSLiMDecoding:
     """

python/tskit/metadata.py

@@ -455,6 +455,10 @@ def enforce_fixed_properties(obj):
             elif type(obj) == dict:
                 ret = {k: enforce_fixed_properties(v) for k, v in obj.items()}
                 if ret.get("type") == "object":
+                    if ret.get("additional_properties"):
+                        raise ValueError(
+                            "Struct codec does not support additional_properties"
+                        )
                     ret["required"] = list(ret.get("properties", {}).keys())
                     ret["additionalProperties"] = False
                 return ret