Merge pull request #219 from almenscorner/dev

v2.3.7

Author: almenscorner

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = IntuneCD
-version = 2.3.6
+version = 2.3.7
 author = Tobias Almén
 author_email = [email protected]
 description = Tool to backup and update configurations in Intune

src/IntuneCD/intunecdlib/BaseUpdateModule.py

@@ -640,6 +640,10 @@ def process_update(
 
             self.downstream_object = self.remove_keys(self.downstream_object)
 
+            def _add_schedule_action():
+                if repo_scheduled_actions:
+                    repo_data["scheduledActionsForRule"] = repo_scheduled_actions
+
             diffs = self.get_diffs(
                 repo_data, self.downstream_object, self.exclude_paths
             )
@@ -664,6 +668,9 @@ def process_update(
                     data=data,
                 )
 
+                # Add scheduledActionsForRule back to the data if it was removed
+                _add_schedule_action()
+
             if self.handle_assignment:
                 if self.config_type == "Windows Enrollment Profile":
                     self.handle_iterable_assignments(
@@ -680,9 +687,9 @@ def process_update(
                         self.downstream_id,
                     )
 
-            # Add scheduledActionsForRule back to the data if it was removed
-            if repo_scheduled_actions:
-                repo_data["scheduledActionsForRule"] = repo_scheduled_actions
+                # Add scheduledActionsForRule back to the data if it was removed
+                _add_schedule_action()
+
         else:
             data = create_data if create_data else repo_data
             if self.create_config:

src/IntuneCD/update/Intune/DeviceCompliance.py

@@ -46,9 +46,9 @@ def _set_compliance_script_id(self, data: dict) -> dict[str, any]:
             },
         )
         if compliance_script_id.get("value"):
-            data["deviceCompliancePolicyScript"][
-                "deviceComplianceScriptId"
-            ] = compliance_script_id["value"][0]["id"]
+            data["deviceCompliancePolicyScript"]["deviceComplianceScriptId"] = (
+                compliance_script_id["value"][0]["id"]
+            )
 
             return data
 
@@ -128,9 +128,9 @@ def _get_notification_template_id(self, rule: dict[str, any]) -> dict[str, any]:
                         0
                     ]["id"]
                 else:
-                    action[
-                        "notificationTemplateId"
-                    ] = "00000000-0000-0000-0000-000000000000"
+                    action["notificationTemplateId"] = (
+                        "00000000-0000-0000-0000-000000000000"
+                    )
 
                 action.pop("notificationTemplateName")
 
@@ -172,11 +172,21 @@ def main(self) -> dict[str, any]:
                     for rule in repo_data.get("scheduledActionsForRule"):
                         self._get_notification_template_id(rule)
 
-                    for item in intune_data["value"]:
-                        for action in item["scheduledActionsForRule"][0][
-                            "scheduledActionConfigurations"
-                        ]:
-                            self.remove_keys(action)
+                    for item in intune_data.get(
+                        "value", []
+                    ):  # Ensure "value" exists and is iterable
+                        actions = item.get("scheduledActionsForRule", [])
+
+                        if actions:  # Ensure actions is not None and not empty
+                            first_action = actions[0].get(
+                                "scheduledActionConfigurations", []
+                            )
+
+                            if (
+                                first_action
+                            ):  # Ensure scheduledActionConfigurations is not None
+                                for action in first_action:
+                                    self.remove_keys(action)
 
                     try:
                         self.process_update(