From 2abbb86b115509b423492c18f64c33c3097186b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Alm=C3=A9n?= <78877636+almenscorner@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:57:29 +0200 Subject: [PATCH 1/4] do not process audit if not specified --- src/IntuneCD/backup/Intune/Applications.py | 3 ++- src/IntuneCD/backup/Intune/SettingsCatalog.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/IntuneCD/backup/Intune/Applications.py b/src/IntuneCD/backup/Intune/Applications.py index 9ea3f77..950fb19 100644 --- a/src/IntuneCD/backup/Intune/Applications.py +++ b/src/IntuneCD/backup/Intune/Applications.py @@ -63,7 +63,8 @@ def main(self) -> dict[str, any]: ) # as we must process each app individually, get the audit data up front - self.audit_data = self.make_audit_request(self.audit_filter) + if self.audit: + self.audit_data = self.make_audit_request(self.audit_filter) for app in self.graph_data["value"]: platform = None diff --git a/src/IntuneCD/backup/Intune/SettingsCatalog.py b/src/IntuneCD/backup/Intune/SettingsCatalog.py index 2b5eae0..b0008c6 100644 --- a/src/IntuneCD/backup/Intune/SettingsCatalog.py +++ b/src/IntuneCD/backup/Intune/SettingsCatalog.py @@ -27,6 +27,7 @@ def __init__(self, *args, **kwargs): ) self.assignment_endpoint = "deviceManagement/configurationPolicies/" self.assignment_extra_url = "/assignments" + self.config_audit_data = True def main(self) -> dict[str, any]: """The main method to backup the Settings Catalog @@ -52,7 +53,8 @@ def main(self) -> dict[str, any]: item_ids_dict, self.assignment_endpoint, self.assignment_extra_url ) # As we need to process each item individually, get the audit data up front - self.audit_data = self.make_audit_request(self.audit_filter) + if self.audit: + self.audit_data = self.make_audit_request(self.audit_filter) # Get the settings for each policy using batch request policy_responses = self.batch_request( item_ids, "deviceManagement/configurationPolicies/", "/settings?&top=1000" From 55e007294829efdfd3689c7cf5816e436c7ef4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Alm=C3=A9n?= <78877636+almenscorner@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:57:54 +0200 Subject: [PATCH 2/4] fix google play sync key --- src/IntuneCD/intunecdlib/IntuneCDBase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IntuneCD/intunecdlib/IntuneCDBase.py b/src/IntuneCD/intunecdlib/IntuneCDBase.py index b644849..37f66fb 100644 --- a/src/IntuneCD/intunecdlib/IntuneCDBase.py +++ b/src/IntuneCD/intunecdlib/IntuneCDBase.py @@ -47,7 +47,7 @@ def remove_keys(self, data: dict): if "VPPusedLicenseCount" in self.exclude: keys.add("usedLicenseCount") if "GPlaySyncTime" in self.exclude: - keys.add("lastSyncDateTime") + keys.add("lastAppSyncDateTime") if "CompliancePartnerHeartbeat" in self.exclude: keys.add("lastHeartbeatDateTime") From cd77a7facf8073f3bfcfed720af5d3c36e2018e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Alm=C3=A9n?= <78877636+almenscorner@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:58:09 +0200 Subject: [PATCH 3/4] bump to 2.3.2 beta 1 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index be72711..e5175b1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = IntuneCD -version = 2.3.1 +version = 2.3.2.beta1 author = Tobias Almén author_email = almenscorner@outlook.com description = Tool to backup and update configurations in Intune From 6959768cb783f6345e50f8634c0171dbf1f28871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Alm=C3=A9n?= <78877636+almenscorner@users.noreply.github.com> Date: Wed, 10 Apr 2024 12:15:54 +0200 Subject: [PATCH 4/4] remove beta tag --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e5175b1..c212cf0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = IntuneCD -version = 2.3.2.beta1 +version = 2.3.2 author = Tobias Almén author_email = almenscorner@outlook.com description = Tool to backup and update configurations in Intune