Merge pull request #9 from sanderstad/development

sanderstad · web-flow · commit fe0a6230aa59 · 2018-09-01T06:44:18.000-07:00
Migrate away from Hyper-V
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Before submitting the bug**
+- [ ] Ensure you are able to reproduce it on the latest released version (_we release often_)
+- [ ] Verified this bug is not already reported in an issue
+- [ ] Verified errors are not related to permissions
+- [ ] Can reproduce in a clean PowerShell session (_clean = `powershell -NoProfile`_)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+```powershell
+<#
+    Provide exact (or sanitized) code to reproduce the error
+#>
+```
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environmental data**
+<!-- Provide output of the following two commands -->
+
+ - PowerShell: <!-- $PSVersionTable output -->
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Latest version of dbatools as of writing**
+Please provide the latest released version of dbatools module.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/PSDatabaseClone.psd1 b/PSDatabaseClone.psd1
@@ -1,6 +1,6 @@
 ﻿@{
     # Script module or binary module file associated with this manifest
-    ModuleToProcess    = 'PSDatabaseClone.psm1'
+    RootModule         = 'PSDatabaseClone.psm1'
 
     # Version number of this module.
     ModuleVersion      = '0.1.47'
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 # See http://www.appveyor.com/docs/appveyor-yml for many more options
-version: 0.1.{build}
+version: 0.2.{build}
 
 cache:
 - C:\ProgramData\chocolatey\bin -> appveyor.yml
@@ -13,7 +13,7 @@ shallow_clone: true
 
 environment:
   environment: development
-  version: 0.1.$(appveyor_build_number)
+  version: 0.2.$(appveyor_build_number)
   appveyor_rdp_password: Psd@tabaseclone2018
 
 matrix:
@@ -28,4 +28,4 @@ test_script:
 - ps: .\tests\pester.ps1
 
 #on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
diff --git a/bin/PSDatabaseClone.dll b/bin/PSDatabaseClone.dll
diff --git a/functions/clone/Get-PSDCClone.ps1 b/functions/clone/Get-PSDCClone.ps1
@@ -207,7 +207,6 @@
                 HostName      = $result.HostName
             }
         }
-
     }
 
     end {
diff --git a/functions/clone/New-PSDCClone.ps1 b/functions/clone/New-PSDCClone.ps1
@@ -110,6 +110,12 @@
     )
 
     begin {
+        # Check if the setup has ran
+        if (-not (Get-PSFConfigValue -FullName psdatabaseclone.setup.status)) {
+            Stop-PSFFunction -Message "The module setup has NOT yet successfully run. Please run 'Set-PSDCConfiguration'"
+            return
+        }
+
         # Get the information store
         $informationStore = Get-PSFConfigValue -FullName psdatabaseclone.informationstore.mode
 
@@ -145,6 +151,9 @@
         if ($Disabled) {
             $active = 0
         }
+
+        # Set the location where to save the diskpart command
+        $diskpartScriptFile = Get-PSFConfigValue -FullName psdatabaseclone.diskpart.scriptfile -Fallback "$env:APPDATA\psdatabaseclone\diskpartcommand.txt"
     }
 
     process {
@@ -161,12 +170,6 @@
 
                 # Setup the computer object
                 $computer = [PsfComputer]$server.Name
-
-                # Check if Hyper-V enabled for the SQL instance
-                if (-not (Test-PSDCHyperVEnabled -HostName $computer.ComputerName -Credential $Credential)) {
-                    Stop-PSFFunction -Message "Hyper-V is not enabled on host." -ErrorRecord $_ -Target $computer -Continue
-                    return
-                }
             }
             catch {
                 Stop-PSFFunction -Message "Could not connect to Sql Server instance $instance" -ErrorRecord $_ -Target $instance
@@ -357,9 +360,15 @@
                     try {
                         Write-PSFMessage -Message "Creating clone from $ParentVhd" -Level Verbose
 
+                        $command = "create vdisk file='$Destination\$CloneName.vhdx' parent='$ParentVhd'"
+
                         # Check if computer is local
                         if ($computer.IsLocalhost) {
-                            $vhd = New-VHD -ParentPath $ParentVhd -Path "$Destination\$CloneName.vhdx" -Differencing
+                            # Set the content of the diskpart script file
+                            Set-Content -Path $diskpartScriptFile -Value $command -Force
+
+                            $script = [ScriptBlock]::Create("diskpart /s $diskpartScriptFile")
+                            $null = Invoke-PSFCommand -ScriptBlock $script
                         }
                         else {
                             $command = [ScriptBlock]::Create("New-VHD -ParentPath $ParentVhd -Path `"$Destination\$CloneName.vhdx`" -Differencing")
@@ -372,7 +381,7 @@
 
                     }
                     catch {
-                        Stop-PSFFunction -Message "Could not create clone" -Target $vhd -Continue
+                        Stop-PSFFunction -Message "Could not create clone" -Target $vhd -Continue -ErrorRecord $_
                     }
                 }
 
@@ -384,14 +393,14 @@
                         # Check if computer is local
                         if ($computer.IsLocalhost) {
                             # Mount the disk
-                            $null = Mount-VHD -Path "$Destination\$CloneName.vhdx" -NoDriveLetter
+                            $null = Mount-DiskImage -ImagePath "$Destination\$CloneName.vhdx"
 
                             # Get the disk based on the name of the vhd
                             $disk = Get-Disk | Where-Object {$_.Location -eq "$Destination\$CloneName.vhdx"}
                         }
                         else {
                             # Mount the disk
-                            $command = [ScriptBlock]::Create("Mount-VHD -Path `"$Destination\$CloneName.vhdx`" -NoDriveLetter")
+                            $command = [ScriptBlock]::Create("Mount-DiskImage -ImagePath `"$Destination\$CloneName.vhdx`"")
                             $null = Invoke-PSFCommand -ComputerName $computer -ScriptBlock $command -Credential $Credential
 
                             # Get the disk based on the name of the vhd
diff --git a/functions/clone/Remove-PSDCClone.ps1 b/functions/clone/Remove-PSDCClone.ps1
@@ -224,14 +224,14 @@
                     try {
 
                         if ($computer.IsLocalhost) {
-                            $null = Dismount-VHD -Path $item.CloneLocation -Credential $Credential
+                            $null = Dismount-DiskImage -ImagePath $item.CloneLocation
                         }
                         else {
                             $command = [ScriptBlock]::Create("Test-Path -Path '$($item.CloneLocation)'")
                             Write-PSFMessage -Message "Dismounting disk '$($item.CloneLocation)' from $($item.HostName)" -Level Verbose
                             $result = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
                             #if (-not $result) {
-                            $command = [scriptblock]::Create("Dismount-VHD -Path '$($item.CloneLocation)'")
+                            $command = [scriptblock]::Create("Dismount-DiskImage -ImagePath '$($item.CloneLocation)'")
                             $null = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
                             #}
                         }
diff --git a/functions/disk/Initialize-PSDCVhdDisk.ps1 b/functions/disk/Initialize-PSDCVhdDisk.ps1
@@ -87,15 +87,19 @@
             Write-PSFMessage -Message "Vhd is already mounted" -Level Warning
 
             # retrieve the specific disk
-            $disk = $disks | Where-Object {$_.Location -eq $Path}
+            $disk = $disks | Where-Object Location -eq $Path
         }
         else {
-            if ($PSCmdlet.ShouldProcess($disk, "Mounting disk")) {
+            if ($PSCmdlet.ShouldProcess("Mounting disk")) {
                 # Mount the vhd
                 try {
                     Write-PSFMessage -Message "Mounting disk $disk" -Level Verbose
 
-                    $disk = Mount-VHD -Path $Path -PassThru | Get-Disk
+                    # Mount the disk
+                    Mount-DiskImage -ImagePath $Path
+
+                    # Get the disk
+                    $disk = Get-Disk | Where-Object Location -eq $Path
                 }
                 catch {
                     Stop-PSFFunction -Message "Couldn't mount vhd" -Target $Path -ErrorRecord $_ -Continue
@@ -123,7 +127,7 @@
             }
             catch {
                 # Dismount the drive
-                Dismount-VHD -Path $Path
+                Dismount-DiskImage -DiskImage $Path
 
                 Stop-PSFFunction -Message "Couldn't create the partition" -Target $disk -ErrorRecord $_ -Continue
             }
diff --git a/functions/disk/New-PSDCVhdDisk.ps1 b/functions/disk/New-PSDCVhdDisk.ps1
@@ -15,8 +15,14 @@
     .PARAMETER FileName
         The file name of the VHD
 
+    .PARAMETER VhdType
+        The type of the harddisk. This can either by VHD (version 1) or VHDX (version 2)
+        The default is VHDX.
+
     .PARAMETER Size
-        The size of the VHD.
+        The size of the VHD in MB.
+        If no size is used the default will be set to the type of VHD.
+        The default for VHD is 2 TB and for VHDX 64TB
 
     .PARAMETER FixedSize
         Set the VHD to have a fixed size or not.
@@ -63,7 +69,9 @@
         [string]$Destination,
         [string]$Name,
         [string]$FileName,
-        [uint64]$Size = 64TB,
+        [ValidateSet('VHD', 'VHDX')]
+        [string]$VhdType,
+        [uint64]$Size,
         [switch]$FixedSize,
         [switch]$ReadOnly,
         [switch]$Force,
@@ -84,13 +92,42 @@
             }
         }
 
+        # Check the vhd type
+        if (-not $VhdType) {
+            Write-PSFMessage -Message "Setting vhd type to 'VHD" -Level Verbose
+            $VhdType = 'VHDX'
+        }
+
+        # Check the size of the file
+        if (-not $Size) {
+            switch ($VhdType) {
+                'VHD' { $Size = 2TB }
+                'VHDX' { $Size = 64TB }
+            }
+
+            # Make sure the size in MB instead of some other version
+            $Size = $Size / 1MB
+        }
+        else {
+            if ($VhdType -eq 'VHD' -and $size -gt 2TB) {
+                Stop-PSFFunction -Message "Size cannot exceed 2TB when using VHD type."
+            }
+            elseif ($VhdType -eq 'VHDX' -and $size -gt 64TB) {
+                Stop-PSFFunction -Message "Size cannot exceed 64TB when using VHDX type."
+            }
+
+            if ($Size -lt 3MB) {
+                Stop-PSFFunction -Message "The size of the vhd cannot be smaller than 3MB" -Continue
+            }
+        }
+
         # Check the name and file name parameters
         if (-not $Name -and -not $FileName) {
             Stop-PSFFunction -Message "Either set the Name or FileName parameter"
         }
         else {
             if (-not $FileName) {
-                $FileName = "$Name.vhdx"
+                $FileName = "$Name.$($VhdType.ToLower())"
                 Write-PSFMessage -Message "Setting file name to $FileName" -Level Verbose
             }
             elseif ($FileName) {
@@ -112,13 +149,21 @@
 
         # Check if the file does not yet exist
         if (Test-Path $vhdPath) {
-            Stop-PSFFunction -Message "The vhd file already exists" -Continue
+            if(-not $Force){
+                Stop-PSFFunction -Message "The vhd file already exists" -Continue
+            }
+            else{
+                try{
+                    Remove-Item -Path $vhdPath -Force:$Force
+                }
+                catch{
+                    Stop-PSFFunction -Message "Could not remove VHD '$vhdPath'" -Continue -ErrorRecord $_
+                }
+            }
         }
 
-        # Check the size of the file
-        if ($Size -lt 3MB) {
-            Stop-PSFFunction -Message "The size of the vhd cannot be smaller than 3MB" -Continue
-        }
+        # Set the location where to save the diskpart command
+        $diskpartScriptFile = Get-PSFConfigValue -FullName psdatabaseclone.diskpart.scriptfile -Fallback "$env:APPDATA\psdatabaseclone\diskpartcommand.txt"
     }
 
     process {
@@ -129,11 +174,18 @@
             # Check if the file needs to have a fixed size
             try {
                 if ($FixedSize) {
-                    $null = New-VHD -Path $vhdPath -SizeBytes $Size -Fixed
+                    $command = "create vdisk file='$vhdPath' maximum=$Size type=fixed"
                 }
                 else {
-                    $null = New-VHD -Path $vhdPath -SizeBytes $Size -Dynamic
+                    $command = "create vdisk file='$vhdPath' maximum=$Size type=expandable"
                 }
+
+                # Set the content of the diskpart script file
+                Set-Content -Path $diskpartScriptFile -Value $command -Force
+
+                $script = [ScriptBlock]::Create("diskpart /s $diskpartScriptFile")
+                Invoke-PSFCommand -ScriptBlock $script
+
             }
             catch {
                 Stop-PSFFunction -Message "Something went wrong creating the vhd" -ErrorRecord $_ -Continue
@@ -142,6 +194,9 @@
     }
 
     end {
+        # Clean up the script file for diskpart
+        Remove-Item $diskpartScriptFile -Force
+
         # Test if there are any errors
         if (Test-PSFFunctionInterrupt) { return }
 
diff --git a/functions/image/New-PSDCImage.ps1 b/functions/image/New-PSDCImage.ps1
diff --git a/functions/support/Set-PSDCConfiguration.ps1 b/functions/support/Set-PSDCConfiguration.ps1
diff --git a/internal/scripts/preimport.ps1 b/internal/scripts/preimport.ps1

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,6 @@`
`207`	`207`	`HostName = $result.HostName`
`208`	`208`	`}`
`209`	`209`	`}`
`210`		`-`
`211`	`210`	`}`
`212`	`211`
`213`	`212`	`end {`