Commit file deletion as well as archiving

Author: almenscorner

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = IntuneCD
-version = 2.4.1.beta1
+version = 2.4.1.beta2
 author = Tobias Almén
 author_email = almenscorner@outlook.com
 description = Tool to backup and update configurations in Intune

src/IntuneCD/intunecdlib/archive.py

@@ -42,15 +42,21 @@ def archive_file(self, file, root):
         shutil.move(src, dst)
 
         if self.audit_data:
-            self._handle_audit_commit(file, dst, archive_path)
+            self._handle_audit_commit(file, dst, archive_path, src)
 
     def _get_audit_delete_events(self) -> list:
         """Gets all delete events from the audit log from the last 24h
 
         Returns:
             list: A list of all delete events
         """
-        start_date = (datetime.now(timezone.utc) - timedelta(days=1)).isoformat()
+        if not os.getenv("AUDIT_DAYS_BACK"):
+            days_back = 1
+        else:
+            days_back = int(os.getenv("AUDIT_DAYS_BACK"))
+        start_date = (
+            datetime.now(timezone.utc) - timedelta(days=days_back)
+        ).isoformat()
         end_date = datetime.now(timezone.utc).isoformat()
 
         q_params = {
@@ -69,7 +75,7 @@ def _get_audit_delete_events(self) -> list:
 
         return audit_data
 
-    def _handle_audit_commit(self, filename, filepath, archive_path):
+    def _handle_audit_commit(self, filename, filepath, archive_path, source_file):
         """Handles the audit commit for the file
 
         Args:
@@ -109,6 +115,17 @@ def _handle_audit_commit(self, filename, filepath, archive_path):
             }
 
             self.filename = os.path.splitext(os.path.basename(filepath))[0]
+            # process audit and check for deleted files
+            self.process_audit_data.process_audit_data(
+                audit_data_record,
+                None,
+                archive_path,
+                filepath,
+                get_record=False,
+                record=audit_data_record,
+                source_file=source_file,
+            )
+            # process audit and check for archived files
             self.process_audit_data.process_audit_data(
                 audit_data_record,
                 None,

src/IntuneCD/intunecdlib/process_audit_data.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import subprocess
+import os
 
 from .IntuneCDBase import IntuneCDBase
 
@@ -128,7 +129,30 @@ def _git_check_new_file(self, path, file):
 
         return False
 
-    def _git_commit_changes(self, audit_record, path, file):
+    def _git_check_deleted_file(self, path, file):
+        """Checks if the file is deleted.
+
+        Args:
+            path: The path to the git repo.
+            file: The file to check.
+        """
+
+        # check if it is a deleted file
+        cmd = ["git", "-C", path, "ls-files", "--deleted", f"{file}"]
+        self.log(
+            function="_git_check_deleted_file",
+            msg=f"Running command {cmd} to check if {file} is a deleted file.",
+        )
+        deleted_file_result = subprocess.run(
+            cmd, capture_output=True, text=True, check=False
+        )
+        # check if "deleted" is in the stdout
+        if deleted_file_result.stdout:
+            return True
+
+        return False
+
+    def _git_commit_changes(self, audit_record, path, file, deleted=False):
         """
         Commits the changes to the git repo.
 
@@ -137,7 +161,10 @@ def _git_commit_changes(self, audit_record, path, file):
         :param file: The file to commit.
         """
         # commit the changes
-        cmd = ["git", "-C", path, "add", f"{file}"]
+        if deleted:
+            cmd = ["git", "-C", path, "rm", f"{file}"]
+        else:
+            cmd = ["git", "-C", path, "add", f"{file}"]
         self.log(
             function="_git_commit_changes",
             msg=f"Running command {cmd} to add {file} to the git repo.",
@@ -195,7 +222,14 @@ def _get_payload_from_audit_data(self, audit_data, compare_data):
         return records
 
     def process_audit_data(
-        self, audit_data, compare_data, path, file, get_record=True, record=None
+        self,
+        audit_data,
+        compare_data,
+        path,
+        file,
+        get_record=True,
+        record=None,
+        source_file=None,
     ):
         """
         Processes the audit data from Intune.
@@ -233,10 +267,21 @@ def process_audit_data(
 
             if not result:
                 file_not_found = self._git_check_new_file(path, file)
+                if source_file:
+                    path = os.path.dirname(source_file)
+                    file_deleted = self._git_check_deleted_file(path, source_file)
+                else:
+                    file_deleted = self._git_check_deleted_file(path, file)
 
-            if result or file_not_found:
+            if result or file_not_found or file_deleted:
                 # commit the changes
-                self._git_commit_changes(record, path, file)
+                if file_deleted and source_file:
+                    path = os.path.dirname(source_file)
+                    self._git_commit_changes(record, path, source_file, deleted=True)
+                elif file_deleted:
+                    self._git_commit_changes(record, path, file, deleted=True)
+                else:
+                    self._git_commit_changes(record, path, file)
             else:
                 self.log(
                     function="process_audit_data",