Merge pull request #4436 from opsmill/pog-repo-import-raise-errors-IFC-696

Properly raise repo import errors instead of catching them

Author: ogenstad

backend/infrahub/git/integrator.py

@@ -448,7 +448,6 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
                 await self.log.warning(
                     f"Unable to find the schema {schema}", repository=self.name, branch=branch_name, commit=commit
                 )
-                continue
 
             if full_schema.is_file():
                 schema_file = SchemaFile(identifier=str(schema), location=full_schema)
@@ -464,7 +463,6 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
                     schema_file.load_content()
                     schemas_data.append(schema_file)
 
-        has_error = False
         for schema_file in schemas_data:
             if schema_file.valid:
                 continue
@@ -474,10 +472,6 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
                 branch=branch_name,
                 commit=commit,
             )
-            has_error = True
-
-        if has_error:
-            return
 
         # Valid data format of content
         for schema_file in schemas_data:
@@ -490,10 +484,10 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
                     branch=branch_name,
                     commit=commit,
                 )
-                has_error = True
-
-        if has_error:
-            return
+                raise ValidationError(
+                    identifier=str(self.id),
+                    message=f"Schema not valid, found '{len(exc.errors())}' error(s) in {schema_file.identifier} : {exc}",
+                ) from exc
 
         response = await self.sdk.schema.load(schemas=[item.content for item in schemas_data], branch=branch_name)
 
@@ -513,7 +507,9 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
                 f"Unable to load the schema : {', '.join(error_messages)}", repository=self.name, commit=commit
             )
 
-            return
+            raise ValidationError(
+                identifier=str(self.id), message=f"Unable to load the schema : {', '.join(error_messages)}"
+            )
 
         for schema_file in schemas_data:
             await self.log.info(
@@ -618,7 +614,7 @@ async def import_python_check_definitions(
                 await self.log.warning(
                     self.name, import_type="check_definition", file=check.file_path.as_posix(), error=str(exc)
                 )
-                continue
+                raise
 
             checks.extend(
                 await self.get_check_definition(
@@ -803,7 +799,7 @@ async def import_python_transforms(
                 await self.log.warning(
                     self.name, import_type="python_transform", file=transform.file_path.as_posix(), error=str(exc)
                 )
-                continue
+                raise
 
             transforms.extend(
                 await self.get_python_transforms(
@@ -899,6 +895,7 @@ async def get_check_definition(
                 repository=self.name,
                 branch=branch_name,
             )
+            raise
         return checks
 
     async def get_python_transforms(
@@ -931,6 +928,7 @@ async def get_python_transforms(
                 repository=self.name,
                 branch=branch_name,
             )
+            raise
 
         return transforms
 

changelog/4334.fixed.md

@@ -0,0 +1 @@
+Properly raise errors instead of just logging them during repository import failures so that the "sync status" gets updated even if we've caught the errors.