Fixed issues which came after merge

Other PRs were merged to master, and so there are test failures /
linting errors I had to fix now.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>

Author: olehermanse

src/cfengine_cli/commands.py

@@ -50,7 +50,7 @@ def deploy() -> int:
     return r
 
 
-def _format_filename(filename, line_length, check):
+def _format_filename(filename: str, line_length: int, check: bool) -> int:
     if filename.startswith("./."):
         return 0
     if filename.endswith(".json"):
@@ -60,7 +60,7 @@ def _format_filename(filename, line_length, check):
     raise UserError(f"Unrecognized file format: {filename}")
 
 
-def _format_dirname(directory, line_length, check):
+def _format_dirname(directory: str, line_length: int, check: bool) -> int:
     ret = 0
     for filename in find(directory, extension=".json"):
         ret |= _format_filename(filename, line_length, check)

src/cfengine_cli/format.py

@@ -28,20 +28,20 @@
 PROMISER_PARTS = {"promiser", "->", "stakeholder"}
 
 
-def format_json_file(filename: str, check: bool) -> None:
+def format_json_file(filename: str, check: bool) -> int:
     """Reformat a JSON file in place using cfbs pretty-printer."""
     assert filename.endswith(".json")
 
     if check:
         r = not pretty_check_file(filename)
         if r:
             print(f"JSON file '{filename}' needs reformatting")
-        return r
+        return int(r)
 
     r = pretty_file(filename)
     if r:
         print(f"JSON file '{filename}' was reformatted")
-    return r
+    return int(r)
 
 
 def text(node: Node) -> str:
@@ -654,7 +654,7 @@ def autoformat(
 # ---------------------------------------------------------------------------
 
 
-def format_policy_file(filename: str, line_length: int, check: bool) -> None:
+def format_policy_file(filename: str, line_length: int, check: bool) -> int:
     """Format a .cf policy file in place, writing only if content changed."""
     assert filename.endswith(".cf")
 
@@ -685,7 +685,7 @@ def format_policy_file(filename: str, line_length: int, check: bool) -> None:
 
 def format_policy_fin_fout(
     fin: IO[str], fout: IO[str], line_length: int, check: bool
-) -> None:
+) -> int:
     """Format CFEngine policy read from fin, writing the result to fout."""
     PY_LANGUAGE = Language(tscfengine.language())
     parser = Parser(PY_LANGUAGE)

tests/unit/test_format.py

@@ -82,7 +82,7 @@ def _format(code: str, line_length: int = 80) -> str:
     """Format CFEngine source via format_policy_fin_fout and return the result."""
     fin = io.StringIO(code)
     fout = io.StringIO()
-    format_policy_fin_fout(fin, fout, line_length)
+    format_policy_fin_fout(fin, fout, line_length, False)
     return fout.getvalue()