Catch config upload validation errors

data_safe_haven/commands/config.py

@@ -215,7 +215,11 @@ def upload(
     else:
         logger.critical(f"Configuration file '{file}' not found.")
         raise typer.Exit(1)
-    config = SREConfig.from_yaml(config_yaml)
+    try:
+        config = SREConfig.from_yaml(config_yaml)
+    except DataSafeHavenTypeError as exc:
+        logger.error("Check for missing or incorrect fields in the configuration.")
+        raise typer.Exit(1) from exc
 
     # Present diff to user
     if (not force) and SREConfig.remote_exists(context, filename=config.filename):

data_safe_haven/serialisers/yaml_serialisable_model.py

@@ -54,7 +54,7 @@ def from_yaml(cls: type[T], settings_yaml: str) -> T:
             )
             for error in exc.errors():
                 logger.error(
-                    f"[red]{'.'.join(map(str, error.get('loc', [])))}: {error.get('input', '')}[/] - {error.get('msg', '')}"
+                    f"{error.get('msg', '')}: [red]{'.'.join(map(str, error.get('loc', [])))}.[/] Original input: [red]{error.get('input', '')}[/]"
                 )
             msg = f"{cls.config_type} configuration is invalid."
             raise DataSafeHavenTypeError(msg) from exc