diff --git a/CHANGELOG.md b/CHANGELOG.md index 65d9636efd..ca5bb76ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # UNRELEASED +* IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile + * Fixing issue with the way the QrCodeImage property was exported and handled. * IntuneFirewallPolicyWindows10 * Fix export of properties that appear multiple times in subsections. @@ -384,7 +386,7 @@ selected * Fixed retrieval of resource when it cannot be found by `Id` * Added a few verbose messages -* IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile +* IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile * Initial release. * IntuneEndpointDetectionAndResponsePolicyWindows10 * Fixes an issue with `AutoFromConnector` as the Configuration package type. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/settings.json b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/settings.json index ea3b134fe1..e2cda87a9c 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/settings.json +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_DefenderDeviceAuthenticatedScanDefinition/settings.json @@ -15,6 +15,20 @@ "read": [], "update": [] } + }, + "WindowsDefenderATP":{ + "delegated": { + "read": [], + "update": [] + }, + "application": { + "read": [ + "Machine.Read.All" + ], + "update": [ + "Machine.ReadWrite.All" + ] + } } } } diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 similarity index 81% rename from Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 index 1595ccce2b..d2805adee7 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.psm1 @@ -50,7 +50,7 @@ function Get-TargetResource $QrCodeContent, [Parameter()] - [System.String] + [Microsoft.Management.Infrastructure.CimInstance] $QrCodeImage, [Parameter()] @@ -149,6 +149,14 @@ function Get-TargetResource -All ` -Filter "displayName eq '$DisplayName'" ` -ErrorAction SilentlyContinue + + # Need to do another call by id to get QrCode info. Can't just expand the property. + if ($null -ne $androidDeviceOwnerEnrollmentProfile) + { + Write-Verbose -Message 'Found by DisplayName, now retrieving additional details by id.' + $androidDeviceOwnerEnrollmentProfile = Get-MgBetaDeviceManagementAndroidDeviceOwnerEnrollmentProfile ` + -AndroidDeviceOwnerEnrollmentProfileId $androidDeviceOwnerEnrollmentProfile.Id + } } if ($null -eq $androidDeviceOwnerEnrollmentProfile) @@ -157,6 +165,15 @@ function Get-TargetResource return $nullResult } + $QrCodeImageValue = $null + if ($null -ne $androidDeviceOwnerEnrollmentProfile.QrCodeImage.Type) + { + $QrCodeImageValue = @{ + type = $androidDeviceOwnerEnrollmentProfile.QrCodeImage.Type + value = [Array] ($androidDeviceOwnerEnrollmentProfile.QrCodeImage.Value -join ',') + } + } + $results = @{ Id = $androidDeviceOwnerEnrollmentProfile.Id DisplayName = $androidDeviceOwnerEnrollmentProfile.DisplayName @@ -169,7 +186,7 @@ function Get-TargetResource EnrollmentTokenUsageCount = $androidDeviceOwnerEnrollmentProfile.EnrollmentTokenUsageCount IsTeamsDeviceProfile = $androidDeviceOwnerEnrollmentProfile.IsTeamsDeviceProfile QrCodeContent = $androidDeviceOwnerEnrollmentProfile.QrCodeContent - QrCodeImage = $androidDeviceOwnerEnrollmentProfile.QrCodeImage + QrCodeImage = $QrCodeImageValue RoleScopeTagIds = $androidDeviceOwnerEnrollmentProfile.RoleScopeTagIds TokenCreationDateTime = $androidDeviceOwnerEnrollmentProfile.TokenCreationDateTime.ToString() TokenExpirationDateTime = $androidDeviceOwnerEnrollmentProfile.TokenExpirationDateTime.ToString() @@ -253,7 +270,7 @@ function Set-TargetResource $QrCodeContent, [Parameter()] - [System.String] + [Microsoft.Management.Infrastructure.CimInstance] $QrCodeImage, [Parameter()] @@ -334,6 +351,21 @@ function Set-TargetResource $currentInstance = Get-TargetResource @PSBoundParameters $setParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters + if ($null -ne $QrCodeImage) + { + $QrCodeImageValue = @{ + type = $QrCodeImage.type + value = [System.Byte[]] @() + } + + foreach ($byteValue in $QrCodeImage.value) + { + $convertedValue = [System.Byte]([BitConverter]::GetBytes($byteValue))[0] + $QrCodeImageValue.value += $convertedValue + } + $setParameters.QrCodeImage = $QrCodeImageValue + $setParameters.QrCodeImage.value = [System.Byte[]]($setParameters.QrCodeImage.value) + } # CREATE if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent') { @@ -411,7 +443,7 @@ function Test-TargetResource $QrCodeContent, [Parameter()] - [System.String] + [Microsoft.Management.Infrastructure.CimInstance] $QrCodeImage, [Parameter()] @@ -491,19 +523,50 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of AndroidDeviceOwnerEnrollmentProfile: {$DisplayName}" - $ValuesToCheck = $PSBoundParameters - $ValuesToCheck.Remove('WifiPassword') | Out-Null $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)" + $ValuesToCheck = ([Hashtable]$PSBoundParameters).Clone() + $ValuesToCheck.Remove('WifiPassword') | Out-Null + $ValuesToCheck.Remove("QrCodeImage") | Out-Null + $ValuesToCheck.Remove("QrCodeContent") | Out-Null + $ValuesToCheck.Remove("TokenValue") | Out-Null + $ValuesToCheck.Remove("TokenCreationDateTime") | Out-Null + $ValuesToCheck.Remove("TokenExpirationDateTime") | Out-Null + + #Compare Cim instances + Write-Verbose -Message "Evaluating CIM Instances" + $TestResult = $true + $RemainingValuesToCheck = $ValuesToCheck + foreach ($key in $ValuesToCheck.Keys) + { + $source = $ValuesToCheck.$key + $target = $CurrentValues.$key + if ($null -ne $source -and $source.GetType().Name -like '*CimInstance*') + { + $TestResult = Compare-M365DSCComplexObject ` + -Source ($source) ` + -Target ($target) + + if (-not $testResult) + { + Write-Verbose -Message "Found drift in property {$key}" + break + } - $TestResult = Test-M365DSCParameterState ` - -CurrentValues $CurrentValues ` - -Source $($MyInvocation.MyCommand.Source) ` - -DesiredValues $PSBoundParameters ` - -ValuesToCheck $ValuesToCheck.Keys + $RemainingValuesToCheck.Remove($key) | Out-Null + } + } + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $RemainingValuesToCheck)" + if ($TestResult) + { + $TestResult = Test-M365DSCParameterState ` + -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck $RemainingValuesToCheck.Keys - Write-Verbose -Message "Test-TargetResource returned $TestResult" + Write-Verbose -Message "Test-TargetResource returned $TestResult" + } return $TestResult } @@ -598,12 +661,33 @@ function Export-TargetResource $Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode ` -Results $Results + if ($Results.QrCodeImage) + { + $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.QrCodeImage ` + -CIMInstanceName 'IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage' + if ($complexTypeStringResult) + { + $Results.QrCodeImage = $complexTypeStringResult + $Results.QrCodeImage = $Results.QrCodeImage.ReplacE("@('", "@(").Replace("')", "`)") + } + else + { + $Results.Remove('QrCodeImage') | Out-Null + } + } $currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName ` -ConnectionMode $ConnectionMode ` -ModulePath $PSScriptRoot ` -Results $Results ` -Credential $Credential + + if ($Results.QrCodeImage) + { + $currentDSCBlock = Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName 'QrCodeImage' -IsCIMArray:$false + + } + $dscContent += $currentDSCBlock Save-M365DSCPartialExport -Content $currentDSCBlock ` -FileName $Global:PartialExportFileName diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.schema.mof similarity index 90% rename from Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.schema.mof index 22fe3fc6f1..0fa6acdc22 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.schema.mof @@ -1,12 +1,12 @@ [ClassVersion("1.0.0.0")] -class MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfileQRImage +class MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage { [Write, Description("Indicates the content mime type.")] String type; - [Write, Description("The byte array that contains the actual content.")] String value; + [Write, Description("The byte array that contains the actual content.")] UInt32 value[]; }; -[ClassVersion("1.0.0.0"), FriendlyName("IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile")] -class MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile : OMI_BaseResource +[ClassVersion("1.0.0.0"), FriendlyName("IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile")] +class MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile : OMI_BaseResource { [Key, Description("Display name for the enrollment profile.")] String DisplayName; [Write, Description("Unique GUID for the enrollment profile. Read-Only.")] String Id; @@ -21,7 +21,7 @@ class MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile : OMI_BaseRe [Write, Description("Total number of Android devices that have enrolled using this enrollment profile.")] UInt32 EnrolledDeviceCount; [Write, Description("Total number of AOSP devices that have enrolled using the current token. Valid values 0 to 20000")] UInt32 EnrollmentTokenUsageCount; [Write, Description("String used to generate a QR code for the token.")] String QrCodeContent; - [Write, Description("String used to generate a QR code for the token.")] String QrCodeImage; + [Write, Description("String used to generate a QR code for the token."), EmbeddedInstance("MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage")] String QrCodeImage; [Write, Description("List of Scope Tags for this Entity instance.")] String RoleScopeTagIds[]; [Write, Description("Boolean that indicates that the Wi-Fi network should be configured during device provisioning. When set to TRUE, device provisioning will use Wi-Fi related properties to automatically connect to Wi-Fi networks. When set to FALSE or undefined, other Wi-Fi related properties will be ignored. Default value is TRUE. Returned by default.")] Boolean ConfigureWifi; [Write, Description("String that contains the wi-fi login ssid")] String WifiSsid; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/readme.md similarity index 64% rename from Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/readme.md index 14e5fe1b0d..8b23554c8a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/readme.md +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/readme.md @@ -1,4 +1,4 @@ -# IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile +# IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile ## Description diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/settings.json b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/settings.json similarity index 91% rename from Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/settings.json rename to Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/settings.json index 8507274e9b..243c0277e1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/settings.json +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/settings.json @@ -1,5 +1,5 @@ { - "resourceName": "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile", + "resourceName": "IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile", "description": "Enrollment Profile used to enroll Android Enterprise devices using Google's Cloud Management.", "permissions": { "graph": { diff --git a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 similarity index 91% rename from Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 index a5095ed687..8394456533 100644 --- a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/1-Create.ps1 @@ -22,7 +22,7 @@ Configuration Example Import-DscResource -ModuleName Microsoft365DSC node localhost { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; diff --git a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 similarity index 91% rename from Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 index c3fe6117bf..0652e3612d 100644 --- a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/2-Update.ps1 @@ -21,7 +21,7 @@ Configuration Example Import-DscResource -ModuleName Microsoft365DSC node localhost { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; diff --git a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 similarity index 91% rename from Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 index 6bc56f61c7..f4ce34adac 100644 --- a/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile/3-Remove.ps1 @@ -21,7 +21,7 @@ Configuration Example Import-DscResource -ModuleName Microsoft365DSC node localhost { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; diff --git a/Modules/Microsoft365DSC/SchemaDefinition.json b/Modules/Microsoft365DSC/SchemaDefinition.json index eb7af2d696..45e7adf24f 100644 --- a/Modules/Microsoft365DSC/SchemaDefinition.json +++ b/Modules/Microsoft365DSC/SchemaDefinition.json @@ -40356,7 +40356,7 @@ ] }, { - "ClassName": "MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfileQRImage", + "ClassName": "MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage", "Parameters": [ { "CIMType": "String", @@ -40371,7 +40371,7 @@ ] }, { - "ClassName": "MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile", + "ClassName": "MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile", "Parameters": [ { "CIMType": "String", diff --git a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.INTUNE.Create.Tests.ps1 b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.INTUNE.Create.Tests.ps1 index b5e98a4478..fdb4ead05c 100644 --- a/Tests/Integration/Microsoft365DSC/M365DSCIntegration.INTUNE.Create.Tests.ps1 +++ b/Tests/Integration/Microsoft365DSC/M365DSCIntegration.INTUNE.Create.Tests.ps1 @@ -364,7 +364,7 @@ AppleIdentifier = "Apple ID"; Certificate = "FakeCertMIIFdjCCBF6gAwIBAgIIMVIk4qQ3QnQwDQYJKoZIhvcNAQELBQAwgYwxQDA+BgNVBAMMN0FwcGxlIEFwcGxpY2F0aW9uIEludGVncmF0aW9uIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUzAeFw0yNDEwMjUxODE0NThaFw0yNTEwMjUxODE0NTdaMIGPMUwwSgYKCZImiZPyLGQBAQw8Y29tLmFwcGxlLm1nbXQuRXh0ZXJuYWwuMDA1NWU3ZTktNDkyYi00ZDQ2LTk2N2EtMjhmYzVkNDllZGI2MTIwMAYDVQQDDClBUFNQOjAwNTVlN2U5LTQ5MmItNGQ0Ni05NjdhLTI4ZmM1ZDQ5ZWRiNjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrEk6ojXS2lXZCW0P6Wtkv36ko7E1pDlu90IbKN+tesevGhghARFrGNJaRnCjjh7m430KMx2HmwuH08VHpevne2ANdSBOgbVD/8tbkfLN4GeO7Z+E0O5WvEKJ0h0IloV4PjhfZm367n7WDBGmAEXp/aUU91TDIGvAlwUB6M/s7WDypfKenpU7VI7BBNHOn/LwaeNyyTsr8/bn+D7CRDPb6UBYPc5wyQoEjgEjByprUB4qkICfjjvDqg0S+x/gkk4U6QDhjFcUb439EpUyUhbYFH/Opjq5uJ22xueTX3FLQII6ZFoPcC/NJLpwdEDGOOHEHb62ahrwTxzYNGoOG5v/NAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFPe+fCFgkds9G3vYOjKBad+ebH+bMIIBHAYDVR0gBIIBEzCCAQ8wggELBgkqhkiG92NkBQEwgf0wgcMGCCsGAQUFBwICMIG2DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNzdW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0aWZpY2F0ZSBwb2xpY3kgYW5kIGNlcnRpZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVtZW50cy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly93d3cuYXBwbGUuY29tL2NlcnRpZmljYXRlYXV0aG9yaXR5MBMGA1UdJQQMMAoGCCsGAQUFBwMCMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly9jcmwuYXBwbGUuY29tL2FhaTJjYS5jcmwwHQYDVR0OBBYEFE1pV3J04vJkpwqxzg040WR6U/7IMAsGA1UdDwQEAwIHgDAQBgoqhkiG92NkBgMCBAIFADANBgkqhkiG9w0BAQsFAAOCAQEAPVKFj5stCpsUT+lcC36hzR2wh8/fys/QFNFuFn57x4oe9kBvvyAXqLBhPm/J3lC+0oU/AJf3EYXwTGNxo2gCiPhJcomX3WXnbYrZHU/TH8umhtVgGqd6Xlke9iFwypidHC9dHWmwud4V42oAMZ9FHItSwh5o6rQMoZop7uKD72vxSuunEWFymF9S22DJ0oums1Ya8JmUpNfMzkyGVMMZs1OCYpzQxYpuwC+sMAVfGucp1IRLutccRGYeSV4LTN4CwfWreCPnPGjkBEmGqmusn5t/THirGjRBykUARWFpthx1wmJqHFqeAv4nhbcR/+Fu4gQQQaayX0dauBcU0T57=="; DataSharingConsetGranted = $True; - + Ensure = "Present"; ApplicationId = $ApplicationId; TenantId = $TenantId; @@ -713,7 +713,7 @@ { Name = 'hosted_app' } - + MSFT_IntuneGroupPolicyDefinitionValuePresentationValueKeyValuePair { Name = 'user_script' @@ -747,7 +747,7 @@ Id = '14c48993-35af-4b77-a4f8-12de917b1bb9' odataType = '#microsoft.graph.groupPolicyPresentationValueDecimal' } - + MSFT_IntuneGroupPolicyDefinitionValuePresentationValue { presentationDefinitionId = '98998e7f-cc2a-4d96-8c47-35dd4b2ce56b' @@ -756,7 +756,7 @@ Id = '4d654df9-6826-470f-af4e-d37491663c76' odataType = '#microsoft.graph.groupPolicyPresentationValueDecimal' } - + MSFT_IntuneGroupPolicyDefinitionValuePresentationValue { presentationDefinitionId = '6900e752-4bc3-463b-9fc8-36d78c77bc3e' @@ -2411,7 +2411,7 @@ TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; } - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile 'IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile' + IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile 'IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile' { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; @@ -2527,7 +2527,7 @@ ApplicationId = $ApplicationId; TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; - + } IntuneEndpointDetectionAndResponsePolicyMacOS 'myEDRPolicy' { @@ -2540,7 +2540,7 @@ ApplicationId = $ApplicationId; TenantId = $TenantId; CertificateThumbprint = $CertificateThumbprint; - + } IntuneEndpointDetectionAndResponsePolicyWindows10 'myEDRPolicy' { diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.Tests.ps1 similarity index 100% rename from Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile.Tests.ps1 diff --git a/docs/docs/resources/intune/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.md b/docs/docs/resources/intune/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.md index 5418d04e0f..e5bbfaa8ad 100644 --- a/docs/docs/resources/intune/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.md +++ b/docs/docs/resources/intune/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.md @@ -1,4 +1,4 @@ -# IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile +# IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile ## Parameters @@ -32,7 +32,7 @@ | **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | | | **AccessTokens** | Write | StringArray[] | Access token used for authentication. | | -### MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfileQRImage +### MSFT_IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage #### Parameters @@ -97,8 +97,7 @@ Configuration Example Import-DscResource -ModuleName Microsoft365DSC node localhost - { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + {"IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; @@ -147,7 +146,7 @@ Configuration Example Import-DscResource -ModuleName Microsoft365DSC node localhost { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + "IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId; @@ -195,8 +194,7 @@ Configuration Example ) Import-DscResource -ModuleName Microsoft365DSC node localhost - { - IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile "IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" + {"IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile-MyTestEnrollmentProfile" { AccountId = "8d2ac1fd-0ac9-4047-af2f-f1e6323c9a34e"; ApplicationId = $ApplicationId;