-
Notifications
You must be signed in to change notification settings - Fork 517
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix nested change detection in CIMInstance and resource comparison #4126
Conversation
f9f70cc
to
336e4c5
Compare
336e4c5
to
71295a4
Compare
Any chance this will be merged anytime near in the future? Would be great to have the comparison work without error without having to copy the fix to the module directory on every update. |
@FabienTschanz Will this also resolve this issue here: #4291 |
I didn't test it but it would be cool if it also solved this old one I raised #3472, and I've also seen a problem with SettingDefinitionId on IntuneSettingCatalogCustomPolicyWindows10 which I've not reported yet. |
@andikrueger I'll check and report back whether it fixes that issue as well. |
Unfortunately yes, this was never fixed. |
b41b56f
to
f5fa6f4
Compare
@andikrueger Nope, that issue wasn't fixed with my update. But I updated one condition to exclude resources from the comparison if an exact match was already found. Given the following example: @ricmestre My proposed fix does indeed change the behavior of your case from #3472, but if I deploy such a blueprint and the ids aren't matching, it will at least show that all of those settings are different (better said: missing). Since there is no way to ignore properties from the inner resources (in your case the |
OK so still not fixed for me :) I'll keep my issue opened, once this is in I'll update it with how the assertion gets done with your diff. It's definetely better so I'm not against this, but this comparison engine really should be looked at, one of my biggest sells with our customers is having a monitoring tool that can assert the drifts between tenants against a single blueprint |
This morning I submitted a PR for the DSCParser that fixes an issue I encountered at a customer with nested CIM Instances. This might be the same as this issue. So it might be fixed in todays release where the new version of the DSCParser is included. |
@ykuijs I also have a long standing issue raised here microsoft/DSCParser#34 that I also spoke with @NikCharlebois about it, unfortunately I don't have time right now to test your fix so I'll look at it today during evening or by tomorrow but I'd love for this to work since it would fix IntuneSettingCatalogCustomPolicyWindows10 which is VERY important to us. |
Let me guess, it was the Settings\SettingsInstance\choiceSettingValue setting that broke down? That is the exact issue I fixed for my customer! |
Just checked the issue you are referring to and indeed, I worked on the exact same issue! Please test with todays release to see if the issue is fixed! |
Pull Request (PR) description
This pull request addresses the following two issues (without GitHub issues) in the M365DSCReport submodule:
IntuneDeviceEnrollmentPlatformRestriction
now uses theResourceInstanceName
instead of theDisplayName
property to check if such a resource exists. Previously, it used the display name property, which led to an incorrect selection of the resource if e.g. a Android platform restriction policy was created in Intune. Such policies may contain multiple definitions (Android and AndroidForWork), which are saved as separate resources.Additionally, an if condition (which was always true) was removed:
This Pull Request (PR) fixes the following issues