functions to copy determine and copy modules

kbaker827 · Mar 24, 2017 · 698a4f2 · 698a4f2
1 parent 1cbd679
commit 698a4f2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 70 deletions.
diff --git a/DSCEA.psd1 b/DSCEA.psd1
@@ -68,7 +68,7 @@ PowerShellVersion = '5.0'
 # NestedModules = @()
 
 # Functions to export from this module
-FunctionsToExport = ('Convert-DSCEAresultsToCSV','Get-DSCEAreport','Send-DSCEACSVtoSQL','Start-DSCEAscan')
+FunctionsToExport = ('Convert-DSCEAresultsToCSV','Get-DSCEAreport','Send-DSCEACSVtoSQL','Start-DSCEAscan','Get-MOFRequiredModules','Copy-DSCResource')
 
 # Cmdlets to export from this module
 CmdletsToExport = '*'

diff --git a/functions/Get-MOFRequiredModules.ps1 b/functions/Get-MOFRequiredModules.ps1
@@ -43,13 +43,26 @@
 function Copy-DSCResource
 {
     [cmdletBinding()]
-    Param($CimSession,$ModulestoCopy)
+    Param($PSSession,$ModulestoCopy)
 
     foreach ($Module in $ModulestoCopy)
     {
-        $Source = 'C:\Program Files\WindowsPowerShell\Modules'+$Module.ModuleName
-        Write-Verbose $Source
+        $Source = 'C:\Program Files\WindowsPowerShell\Modules\'+$Module.ModuleName
+        Write-Verbose "Module location: $Source"
+        $Destination = 'C:\Program Files\WindowsPowerShell\Modules\'
+        try
+        {
+            Write-Verbose "Copying"
+            Copy-Item -ToSession $PSSession -Path $Source -Destination $Destination -Recurse -Force -ErrorAction STOP -Verbose
+            Write-Verbose "Copied"
+        }
+        catch
+        {
+            Write-Output $Error[0].Exception
+            break
+        }
     }
 
 }
 
+
diff --git a/functions/HelperModule/Get-MOFRequiredModules.psm1 b/functions/HelperModule/Get-MOFRequiredModules.psm1
diff --git a/functions/Start-DSCEAscan.ps1 b/functions/Start-DSCEAscan.ps1
@@ -122,7 +122,10 @@ param
 
     #Begin DSCEA Engine
     Write-Verbose "DSCEA Scan has started"
+    #Scan the Mof file for modules other than built in
     $MofFile = (Get-Item $MofFile).FullName
+    $ModulesRequired = Get-MOFRequiredModules -mofFile $MofFile
+
     $runspacePool = [RunspaceFactory]::CreateRunspacePool(1, 10).Open() #Min Runspaces, Max Runspaces
     $scriptBlock = {
         param (
@@ -137,6 +140,8 @@ param
 
             [switch]$Force,
 
+            $ModulesRequired,
+
             [Microsoft.Management.Infrastructure.CimSession]$CimSession
             )
 
@@ -172,10 +177,22 @@ param
                         Repair-DSCEngine -ComputerName $computer -ErrorAction SilentlyContinue
                     }
                 }
+                #Copy resources if required
+                if ($ModulesRequired -ne $null) {
+                    if($CimSession) {
+                        $session = New-PSSession -ComputerName $CimSession.ComputerName
+                    }
+                    else {
+                        $session = New-PSSession -ComputerName $Computer
+                    }
+                    Copy-DSCResource -PSSession $session -ModulestoCopy $ModulesRequired
+                    Remove-PSSession $session
+                }
                 if($PSBoundParameters.ContainsKey('CimSession')) {
                     $DSCJob = Test-DSCConfiguration -ReferenceConfiguration $mofFile -CimSession $CimSession -AsJob | Wait-Job -Timeout $JobTimeout
                 }
                 else {
+
                     $DSCJob = Test-DSCConfiguration -ReferenceConfiguration $mofFile -CimSession $computer -AsJob | Wait-Job -Timeout $JobTimeout
                 }
                 if (!$DSCJob) { 
@@ -209,6 +226,7 @@ param
                 CimSession = $_
                 MofFile = $MofFile
                 JobTimeout = $JobTimeout
+                ModulesRequired = $ModulesRequired
             }
             if($PSBoundParameters.ContainsKey('Force')) {
                 $params += @{Force = $true}
@@ -251,6 +269,7 @@ param
                 Computer = $_
                 MofFile = $MofFile
                 JobTimeout = $JobTimeout
+                ModulesRequired = $ModulesRequired
             }
             if ($PSBoundParameters.ContainsKey('Force')) {
                 $params += @{Force = $true}