Skip to content

Commit

Permalink
Merge pull request #198 from almenscorner/dev
Browse files Browse the repository at this point in the history
v2.3.2
  • Loading branch information
almenscorner committed Apr 10, 2024
2 parents bfe6bff + 6959768 commit aeee4f0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = IntuneCD
version = 2.3.1
version = 2.3.2
author = Tobias Almén
author_email = [email protected]
description = Tool to backup and update configurations in Intune
Expand Down
3 changes: 2 additions & 1 deletion src/IntuneCD/backup/Intune/Applications.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/IntuneCD/backup/Intune/SettingsCatalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/IntuneCD/intunecdlib/IntuneCDBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit aeee4f0

Please sign in to comment.