Merge pull request #374 from camptocamp/fix

Audit: more debug messages on diff
camptocamp · Jun 17, 2024 · d5a321e · d5a321e
2 parents 4df0f4e + 246a893
commit d5a321e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/github_app_geo_project/module/audit/__init__.py b/github_app_geo_project/module/audit/__init__.py
@@ -235,6 +235,13 @@ async def _process_snyk_dpkg(
                 ["git", "diff", "--quiet"], timeout=30
             )
             if diff_proc.returncode != 0:
+                proc = subprocess.run(  # nosec # pylint: disable=subprocess-run-check
+                    ["git", "diff"], timeout=30, capture_output=True, encoding="utf-8"
+                )
+                message = module_utils.ansi_proc_message(proc)
+                message.title = "Changes to be committed"
+                _LOGGER.debug(message)
+
                 proc = subprocess.run(  # nosec # pylint: disable=subprocess-run-check
                     ["git", "checkout", "-b", new_branch], capture_output=True, encoding="utf-8", timeout=30
                 )
@@ -254,6 +261,8 @@ async def _process_snyk_dpkg(
                     else:
                         if pull_request is not None:
                             issue_check.set_title(key, f"{key} ([Pull request]({pull_request.html_url}))")
+            else:
+                _LOGGER.debug("No changes to commit")
     except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as proc_error:
         message = module_utils.ansi_proc_message(proc_error)
         _LOGGER.exception("Audit %s process error", key)

diff --git a/github_app_geo_project/module/utils.py b/github_app_geo_project/module/utils.py
@@ -562,7 +562,7 @@ def has_changes(include_un_followed: bool = False) -> bool:
     return proc.returncode != 0
 
 
-async def create_commit(message: str) -> bool:
+async def create_commit(message: str, pre_commit_check: bool = True) -> bool:
     """Do a commit."""
     proc = subprocess.run(  # nosec # pylint: disable=subprocess-run-check
         ["git", "add", "--all"], capture_output=True, encoding="utf-8", timeout=30
@@ -573,13 +573,16 @@ async def create_commit(message: str) -> bool:
         _LOGGER.warning(proc_message)
         return False
     _, success, _ = await run_timeout(
-        ["git", "commit", f"--message={message}"],
+        ["git", "commit", f"--message={message}", *([] if pre_commit_check else ["--no-verify"])],
         None,
         600,
         "Commit",
         "Error committing files",
         "Timeout committing files",
     )
+    if not success and pre_commit_check:
+        # On pre-commit issues, add them to the commit, and try again without the pre-commit
+        success = await create_commit(message, False)
     return success