IntuneDeviceCompliancePolicyAndroidDeviceOwner/IntuneDeviceCompliancePolicyAndroidWorkProfile enhancements

[dannyKBjj]

Pull Request (PR) description

• IntuneDeviceCompliancePolicyAndroidDeviceOwner

  • Added missing properties for androidForWorkCompliancePolicy resource type: https://learn.microsoft.com/en-us/graph/api/resources/intune-deviceconfig-androiddeviceownercompliancepolicy?view=graph-rest-beta.
  • Non-compliance actions now supported for Export- Test- Get-
  • Non-compliance actions now supported for Set- when creating a policy, but not when updating a policy. Update can't be supported due to MgGraph bug.

• IntuneDeviceCompliancePolicyAndroidWorkProfile

  • Added missing properties for androidForWorkCompliancePolicy resource type: https://learn.microsoft.com/en-us/graph/api/resources/intune-deviceconfig-androidforworkcompliancepolicy?view=graph-rest-beta.
  • Non-compliance actions now supported for Export- Test- Get-
  • Non-compliance actions now supported for Set- when creating a policy, but not when updating a policy. Update can't be supported due to MgGraph bug.

MgGraph Update- / PATCH problem:

microsoftgraph/msgraph-sdk-powershell#2177
microsoftgraph/msgraph-metadata#245

This Pull Request (PR) fixes the following issues

- Fixes #5592
- Fixes #5593

Task list

• Added an entry to the change log under the Unreleased section of the file CHANGELOG.md.
  Entry should say what was changed and how that affects users (if applicable), and
  reference the issue being resolved (if applicable).
• Resource parameter descriptions added/updated in the schema.mof.
• Resource documentation added/updated in README.md.
• Resource settings.json file contains all required permissions.
• Examples appropriately added/updated.
• Unit tests added/updated.
• New/changed code adheres to DSC Community Style Guidelines.

[dannyKBjj]

Can't make much sense of the conflicts in the script...

[dannyKBjj]

Still unable to make sense of conflict. It is conflicting with a PR that deletes all the region telemetry?!

For example MSFT_IntuneDeviceCompliancePolicyAndroidDeviceOwner.psm1

My PR:

The Conflict:

It does not look like the code I uploaded and I'm unsure what the $script bit it conflicts with is supposed to be doing anyway!

[ykuijs]

@dannyKBjj, we recently applied some performance improvement. This means that in an export, we do not have to connect over-and-over again and send telemetry. That is why we added the if-statement in the Get method that checks for the presence of the exportedInstance script variable:

Microsoft365DSC/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile/MSFT_IntuneDeviceCompliancePolicyAndroidWorkProfile.psm1

Line 161 in 2cd3bfe

if (-not $Script:exportedInstance)

If that is set, the export routine called the Get method and it already retrieved information from the Graph. So we will be using that instead of retrieving it all over again.

So in your case, please implement the changes on the code that exists within the if-statement.

Another thing: To prevent you having to copy/paste screenshots of lines of code: You can refer to actual lines in the code by browsing to that line in GitHub, selecting it (multi-line selection also possible by shift-select last line), clicking the three dots that appear in front of the line and clicking "Copy permalink":

This will copy a link to your clipboard, which you then can paste in an issue or PR:
https://github.com/microsoft/Microsoft365DSC/blob/2cd3bfe68431cfb0b2d6c8e532c85c975945e2b1/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1#L20

GitHub will then automatically convert that into something readable:

Microsoft365DSC/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1

Line 20 in 2cd3bfe

[System.Boolean]

[dannyKBjj]

That's great, thanks for the tip!

[dannyKBjj]

Requested changes made.

[dannyKBjj]

Unit tests failed, but they run fine locally. Don't think the problem is with my code?! Besides which I've done nothing but resolve the conflicts with the code changes asked for since all the unit test passed (last time).

I've re-fetched the origin and run both unit tests and they work fine...

[dannyKBjj]

There appears to be nothing wrong with the Unit tests, but all checks are failing on the PR?!

[dannyKBjj]

pushing again....

[ykuijs]

You are now running unit tests individually, which might have something to do with it. Can you please try this:

• Browse to your local clone
• Run Import-Module './Tests/TestHarness.psm1' -Force
• Then run Invoke-TestHarness -IgnoreCodeCoverage

This will run all unit tests sequentially.

If that doesn't work, please make sure there are no other versions of M365DSC installed on your machine. I have seen issues in the past where other versions of M365DSC, for example installed in the Program Files folder, were causing issues in unit tests.

[dannyKBjj]

I tried doing as you suggested and ran all the tests from my local clone. I got a number of errors, but none of them were with my module .test scrips!

[dannyKBjj]

Unit tests working fine locally
Resource behaving correctly when tested against my live environment.

[dannyKBjj]

Merged with \Dev to resolve conflicts, new files were added that are not mine. Now these files are failing the unit tests?

[FabienTschanz]

Are you fully up to date? Do they fail locally too? I have two PRs open that worked with the latest changes.

[FabienTschanz]

Ouuuh and it seems like you goofed something up during the merge, there shouldn't be 518 changes files. Please undo the merge (by e.g. resetting your branch to your last commit before the merge) and then try again.

[dannyKBjj]

Just cannot get unit tests to work, since last merge with dev, pester environment completely broken.

Created new PR #5803 on which unit tests work fine.