Merge pull request #2640 from NikCharlebois/Fixes-#2639

Fixes #2639
microsoft · Dec 8, 2022 · d8eb9a4 · d8eb9a4
2 parents d73f86b + df1d42d
commit d8eb9a4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@
 * TeamsChannel
   * Fixes an issue where channels weren't created if a non-existing GroupId was specified.
     FIXES [#2622](https://github.com/microsoft/Microsoft365DSC/issues/2622)
+* TeamsUpdateManagementPolicy
+  * Fixed error with the export that wasn't properly returning the UpdateTimeOfDay if not in short time string format.
+    FIXES [#2639](https://github.com/microsoft/Microsoft365DSC/issues/2639)
 * DEPENDENCIES
   * Updated MSCloudLoginAssistant to version 1.0.99;
 

diff --git a/...65DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1 b/...65DSC/DSCResources/MSFT_TeamsUpdateManagementPolicy/MSFT_TeamsUpdateManagementPolicy.psm1
@@ -90,21 +90,26 @@ function Get-TargetResource
         }
 
         Write-Verbose -Message "Found Teams Update Management Policy with Identity {$Identity}"
-        return @{
+        $results =  @{
             Identity              = $policy.Identity
             Description           = $policy.Description
             AllowManagedUpdates   = $policy.AllowManagedUpdates
             AllowPreview          = $policy.AllowPreview
             AllowPublicPreview    = $policy.AllowPublicPreview
             UpdateDayOfWeek       = $policy.UpdateDayOfWeek
             UpdateTime            = $policy.UpdateTime
-            UpdateTimeOfDay       = $policy.UpdateTimeOfDay.Split('T')[1].Replace('Z', '')
             Ensure                = 'Present'
             Credential            = $Credential
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId
             CertificateThumbprint = $CertificateThumbprint
         }
+        if (-not [System.String]::IsNullOrEmpty($policy.UpdateTimeOfDay))
+        {
+            $updateTimeOfDayValue = $policy.UpdateTimeOfDay.ToShortTimeString()
+            $results.Add('UpdateTimeOfDay', $updateTimeOfDayValue)
+        }
+        return $results
     }
     catch
     {

diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpdateManagementPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpdateManagementPolicy.Tests.ps1
@@ -24,7 +24,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
         BeforeAll {
             $secpasswd = ConvertTo-SecureString 'Pass@word1' -AsPlainText -Force
             $Credential = New-Object System.Management.Automation.PSCredential ('tenantadmin', $secpasswd)
-
+            $DateTimeValue = [System.DateTime]::Parse("2022-12-08 6:00:00PM")
             $Global:PartialExportFileName = 'c:\TestPath'
             Mock -CommandName Update-M365DSCExportAuthenticationResults -MockWith {
                 return @{}
@@ -66,7 +66,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Identity            = 'Tag:TestPolicy'
                     UpdateDayOfWeek     = 1
                     UpdateTime          = '18:00'
-                    UpdateTimeOfDay     = '18:00:00'
+                    UpdateTimeOfDay     = '6:00 PM'
                     Ensure              = 'Present'
                     Credential          = $Credential
                 }
@@ -100,7 +100,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Identity            = 'TestPolicy'
                     UpdateDayOfWeek     = 1
                     UpdateTime          = '18:00'
-                    UpdateTimeOfDay     = '18:00:00'
+                    UpdateTimeOfDay     = '6:00 PM'
                     Ensure              = 'Present'
                     Credential          = $Credential
                 }
@@ -114,7 +114,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         Identity            = 'TestPolicy'
                         UpdateDayOfWeek     = 3; #Drift
                         UpdateTime          = '18:00'
-                        UpdateTimeOfDay     = '2022-05-06T18:00:00'
+                        UpdateTimeOfDay     = $DateTimeValue
                     }
                 }
             }
@@ -144,7 +144,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                     Identity            = 'Tag:TestPolicy'
                     UpdateDayOfWeek     = 1
                     UpdateTime          = '18:00'
-                    UpdateTimeOfDay     = '18:00:00'
+                    UpdateTimeOfDay     = '6:00 PM'
                     Ensure              = 'Present'
                     Credential          = $Credential
                 }
@@ -158,7 +158,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         Identity            = 'Tag:TestPolicy'
                         UpdateDayOfWeek     = 1
                         UpdateTime          = '18:00'
-                        UpdateTimeOfDay     = '2022-05-06T18:00:00'
+                        UpdateTimeOfDay     = $DateTimeValue
                     }
                 }
             }
@@ -189,7 +189,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         Identity            = 'Tag:TestPolicy'
                         UpdateDayOfWeek     = 1
                         UpdateTime          = '18:00'
-                        UpdateTimeOfDay     = '2022-05-06T18:00:00'
+                        UpdateTimeOfDay     = $DateTimeValue
                     }
                 }
             }
@@ -224,7 +224,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                         Identity            = 'Tag:TestPolicy'
                         UpdateDayOfWeek     = 1
                         UpdateTime          = '18:00'
-                        UpdateTimeOfDay     = '2022-05-06T18:00:00'
+                        UpdateTimeOfDay     = $DateTimeValue
                     }
                 }
             }