Merge pull request #62 from vlariono/Issue#45

xScheduledTask: Incorrect TaskPath handling (Fixes #45)

DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.psm1

@@ -267,9 +267,12 @@ function Get-TargetResource
         $RunOnlyIfNetworkAvailable = $false
     )
 
+    $TaskPath = ConvertTo-NormalizedTaskPath -TaskPath $TaskPath
+
     Write-Verbose -Message ('Retrieving existing task ({0} in {1})' -f $TaskName, $TaskPath)
+
     $task = Get-ScheduledTask -TaskName $TaskName -TaskPath $TaskPath -ErrorAction SilentlyContinue
-    
+
     if ($null -eq $task) 
     {
         Write-Verbose -Message ('No task found. returning empty task {0} with Ensure = "Absent"' -f $Taskname)
@@ -527,8 +530,8 @@ function Get-TargetResource
         }
 
         return @{
-            TaskName = $TaskName
-            TaskPath = $TaskPath
+            TaskName = $task.TaskName
+            TaskPath = $task.TaskPath
             StartTime = $startAt
             Ensure = 'Present'
             Description = $task.Description
@@ -820,6 +823,8 @@ function Set-TargetResource
         $RunOnlyIfNetworkAvailable = $false
     )
 
+    $TaskPath = ConvertTo-NormalizedTaskPath -TaskPath $TaskPath
+
     Write-Verbose -Message ('Entering Set-TargetResource for {0} in {1}' -f $TaskName, $TaskPath)
     $currentValues = Get-TargetResource @PSBoundParameters
 
@@ -974,7 +979,7 @@ function Set-TargetResource
         {
             if ($RepetitionDuration.TimeOfDay -le $RepeatInterval.TimeOfDay)
             {
-                $exceptionMessage ='Repetition interval is set to {0} but repetition duration is {1}' -f $RepeatInterval.TimeOfDay, $RepetitionDuration.TimeOfDay
+                $exceptionMessage = 'Repetition interval is set to {0} but repetition duration is {1}' -f $RepeatInterval.TimeOfDay, $RepetitionDuration.TimeOfDay
                 New-InvalidArgumentException -Message $exceptionMessage -ArgumentName RepetitionDuration
             }
 
@@ -993,11 +998,11 @@ function Set-TargetResource
 
         if ($currentValues.Ensure -eq 'Present') 
         {
-            Write-Verbose -Message ('Removing previous scheduled task' -f $TaskName)
+            Write-Verbose -Message ('Removing previous scheduled task {0}' -f $TaskName)
             $null = Unregister-ScheduledTask -TaskName $TaskName -TaskPath $TaskPath -Confirm:$false
         }
 
-        Write-Verbose -Message ('Creating new scheduled task' -f $TaskName)
+        Write-Verbose -Message ('Creating new scheduled task {0}' -f $TaskName)
 
         $scheduledTask = New-ScheduledTask -Action $action -Trigger $trigger -Settings $setting
 
@@ -1042,7 +1047,7 @@ function Set-TargetResource
 
     if ($Ensure -eq 'Absent') 
     {
-        Write-Verbose -Message ('Removing scheduled task' -f $TaskName)
+        Write-Verbose -Message ('Removing scheduled task {0}' -f $TaskName)
         Unregister-ScheduledTask -TaskName $TaskName -TaskPath $TaskPath -Confirm:$false
     }
 }
@@ -1297,6 +1302,8 @@ function Test-TargetResource
         [System.Boolean]
         $RunOnlyIfNetworkAvailable = $false
     )
+
+    $TaskPath = ConvertTo-NormalizedTaskPath -TaskPath $TaskPath
 
     Write-Verbose -Message ('Testing scheduled task {0}' -f $TaskName)
 
@@ -1315,6 +1322,36 @@ function Test-TargetResource
         return $false 
     }
 
+    $desiredValues = $PSBoundParameters
+    $desiredValues.TaskPath = $TaskPath
+
     Write-Verbose -Message 'Testing DSC parameter state'
-    return Test-DscParameterState -CurrentValues $CurrentValues -DesiredValues $PSBoundParameters
+    return Test-DscParameterState -CurrentValues $CurrentValues -DesiredValues $desiredValues
+}
+
+<#
+.SYNOPSIS
+Helper function to convert TaskPath to the right form
+
+.PARAMETER TaskPath
+The path to the task 
+#>
+
+function ConvertTo-NormalizedTaskPath
+{
+    [CmdletBinding()]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [System.String]
+        $TaskPath
+    )
+
+    $pathArray = $TaskPath.Split('\').Where( {$_})
+    if ($pathArray.Count -gt 0)
+    {
+        $TaskPath = "\$($pathArray -join '\')\"
+    }
+
+    return $TaskPath
 }

README.md

@@ -119,6 +119,9 @@ xVirtualMemory has the following properties:
 ## Versions
 
 ### Unreleased
+* xScheduledTask
+    - Fixed incorrect TaskPath handling [Fix #45](https://github.com/PowerShell/xComputerManagement/issues/45)
+
 * xComputer: Changed comparision that validates if we are in the correct AD Domain to work correctly if FQDN wasn't used
 
 ### 2.0.0.0
@@ -128,7 +131,7 @@ xVirtualMemory has the following properties:
 ### 1.10.0.0
 * Added resources
   - xVirtualMemory
-
+  
 ### 1.9.0.0
 * Added resources
   - xPowerPlan