Various Fixes

microsoft · Dec 5, 2024 · b65a6d1 · b65a6d1
1 parent 5a7f203
commit b65a6d1
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 # UNRELEASED
 
-* IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile
+* IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile
   * Fixing issue with the way the QrCodeImage property was exported and handled.
 
 # 1.24.12024.1
@@ -384,7 +384,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/...tAndroidDeviceOwnerEnrollmentProfile.psm1 → ...tAndroidDeviceOwnerEnrollmentProfile.psm1 b/...tAndroidDeviceOwnerEnrollmentProfile.psm1 → ...tAndroidDeviceOwnerEnrollmentProfile.psm1
@@ -528,6 +528,7 @@ function Test-TargetResource
     $ValuesToCheck.Remove('WifiPassword') | Out-Null
 
     #Compare Cim instances
+    $TestResult = $true
     foreach ($key in $PSBoundParameters.Keys)
     {
         $source = $PSBoundParameters.$key
@@ -656,7 +657,7 @@ function Export-TargetResource
             if ($Results.QrCodeImage)
             {
                 $complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.QrCodeImage `
-                                                                             -CIMInstanceName 'IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfileQRImage'
+                                                                             -CIMInstanceName 'IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfileQRImage'
                 if ($complexTypeStringResult)
                 {
                     $Results.QrCodeImage = $complexTypeStringResult

diff --git a/...idDeviceOwnerEnrollmentProfile.schema.mof → ...idDeviceOwnerEnrollmentProfile.schema.mof b/...idDeviceOwnerEnrollmentProfile.schema.mof → ...idDeviceOwnerEnrollmentProfile.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.")] 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."), EmbeddedInstance("MSFT_IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfileQRImage")] 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/...oidDeviceOwnerEnrollmentProfile/readme.md → ...oidDeviceOwnerEnrollmentProfile/readme.md b/...oidDeviceOwnerEnrollmentProfile/readme.md → ...oidDeviceOwnerEnrollmentProfile/readme.md
@@ -1,4 +1,4 @@
-# IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile
+# IntuneDeviceManagementAndroidDeviceOwnerEnrollmentProfile
 
 ## Description
 

diff --git a/...eviceOwnerEnrollmentProfile/settings.json → ...eviceOwnerEnrollmentProfile/settings.json b/...eviceOwnerEnrollmentProfile/settings.json → ...eviceOwnerEnrollmentProfile/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/...DeviceOwnerEnrollmentProfile/1-Create.ps1 → ...DeviceOwnerEnrollmentProfile/1-Create.ps1 b/...DeviceOwnerEnrollmentProfile/1-Create.ps1 → ...DeviceOwnerEnrollmentProfile/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/...DeviceOwnerEnrollmentProfile/2-Update.ps1 → ...DeviceOwnerEnrollmentProfile/2-Update.ps1 b/...DeviceOwnerEnrollmentProfile/2-Update.ps1 → ...DeviceOwnerEnrollmentProfile/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/...DeviceOwnerEnrollmentProfile/3-Remove.ps1 → ...DeviceOwnerEnrollmentProfile/3-Remove.ps1 b/...DeviceOwnerEnrollmentProfile/3-Remove.ps1 → ...DeviceOwnerEnrollmentProfile/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
@@ -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
@@ -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/...oidDeviceOwnerEnrollmentProfile.Tests.ps1 → ...oidDeviceOwnerEnrollmentProfile.Tests.ps1 b/...oidDeviceOwnerEnrollmentProfile.Tests.ps1 → ...oidDeviceOwnerEnrollmentProfile.Tests.ps1
diff --git a/...cs/resources/intune/IntuneDeviceManagmentAndroidDeviceOwnerEnrollmentProfile.md b/...cs/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;