Merge branch 'master' of https://github.com/clemensv/avrotize

Author: clemensv

avrotize/avrotocsharp.py

@@ -42,7 +42,7 @@ def __init__(self, base_namespace: str = '') -> None:
         self.avro_annotation = False
         self.generated_types: Dict[str,str] = {}
         self.generated_avro_types: Dict[str, Dict[str, Union[str, Dict, List]]] = {}
-        self.type_dict = {}
+        self.type_dict: Dict[str, Dict] = {}
 
     def get_qualified_name(self, namespace: str, name: str) -> str:
         """ Concatenates namespace and name with a dot separator """

avrotize/kustotoavro.py

@@ -393,8 +393,8 @@ def process_all_tables(self):
                 xregistry_messages[schemaid] = {
                     "id": schemaid,
                     "name": schema_name,
-                    "format": "CloudEvents/1.0",
-                    "metadata": {
+                    "envelope": "CloudEvents/1.0",
+                    "envelopemetadata": {
                         "type": {
                             "value": schemaid
                         },
@@ -403,13 +403,13 @@ def process_all_tables(self):
                         },
                     },
                     "schemaformat": f"Avro/{AVRO_VERSION}",
-                    "schemaurl": f"#/schemagroups/{groupname}/schemas/{schemaid}"
+                    "schemauri": f"#/schemagroups/{groupname}/schemas/{schemaid}"
                 }
                 for key, value in ce_attribs.items():
                     # skip the required attributes
                     if key == "type" or key == "source" or key == "id" or key == "specversion":
                         continue
-                    xregistry_messages[schemaid]["metadata"][key] = {
+                    xregistry_messages[schemaid]["envelopemetadata"][key] = {
                         "type": value,
                         "required": True
                     }