Changed check in Test-PdcConfiguration

Fixed Remove-PdcDatabaseImage to also remove images if no clone was made with it

Author: sanderstad

functions/Remove-PdcDatabaseImage.ps1

@@ -1,5 +1,5 @@
 function Remove-PdcDatabaseImage {
-<#
+    <#
 .SYNOPSIS
     Remove-PdcDatabaseImage removes one or more images
 
@@ -48,11 +48,14 @@ function Remove-PdcDatabaseImage {
         # Test the module database setup
         $result = Test-PdcConfiguration
 
-        if(-not $result.Check){
+        if (-not $result.Check) {
             Stop-PSFFunction -Message $result.Message -Target $result -Continue
             return
         }
 
+        # Get the database values
+        $pdcDatabaseServer = $result.SqlInstance
+        $pdcDatabaseName = $result.Database
     }
 
     process {
@@ -71,11 +74,11 @@ function Remove-PdcDatabaseImage {
                         h.IPAddress,
                         h.FQDN,
                         i.ImageLocation
-                FROM dbo.Clone AS c
+                FROM dbo.Image as i
+                    INNER JOIN dbo.Clone AS c
+                        ON c.ImageID = i.ImageID
                     INNER JOIN dbo.Host AS h
                         ON h.HostID = c.HostID
-                    INNER JOIN dbo.Image AS i
-                        ON i.ImageID = c.ImageID
                 WHERE i.ImageLocation = '$image'
                 ORDER BY h.HostName;
             "
@@ -97,35 +100,42 @@ function Remove-PdcDatabaseImage {
 
                     # Remove the clones for the host
                     try {
-                        Write-PSFMessage -Message "Removing clones for host $($result.HostName) and database $($result.DatabaseName)" -Level Verbose
-                        Remove-PdcDatabaseClone -HostName $result.HostName -Database $result.DatabaseName -Credential $Credential
+                        if ($result.HostName -ne $null) {
+                            Write-PSFMessage -Message "Removing clones for host $($result.HostName) and database $($result.DatabaseName)" -Level Verbose
+                            Remove-PdcDatabaseClone -HostName $result.HostName -Database $result.DatabaseName -Credential $Credential
+                        }
                     }
                     catch {
                         Stop-PSFFunction -Message "Couldn't remove clones from host $($result.HostName)" -Target $result -Continue
                     }
 
                 }
+            }
+            else {
+                Write-PSFMessage -Message "No clones were found created with image $image" -Level Verbose
+            }
 
-                # Remove the image from the file system
-                try {
+            # Remove the image from the file system
+            try {
+                if (Test-Path -Path $image -Credential $Credential) {
                     Write-PSFMessage -Message "Removing image '$image' from file system" -Level Verbose
                     $null = Remove-Item -Path $image -Credential $Credential -Force:$Force
                 }
-                catch {
-                    Stop-PSFFunction -Message "Couldn't remove image '$image' from file system" -Target $result
+                else{
+                    Write-PSFMessage -Message "Couldn't find image $image" -Level Verbose
                 }
+            }
+            catch {
+                Stop-PSFFunction -Message "Couldn't remove image '$image' from file system" -Target $result
+            }
 
-                # Remove the image from the database
-                try {
-                    $query = "DELETE FROM dbo.Image WHERE ImageLocation = '$image'"
-                    $results = Invoke-DbaSqlQuery -SqlInstance $ecDatabaseServer -Database $ecDatabaseName -Query $query
-                }
-                catch {
-                    Stop-PSFFunction -Message "Couldn't remove image '$image' from database" -Target $result
-                }
+            # Remove the image from the database
+            try {
+                $query = "DELETE FROM dbo.Image WHERE ImageLocation = '$image'"
+                $results = Invoke-DbaSqlQuery -SqlInstance $pdcDatabaseServer -Database $pdcDatabaseName -Query $query
             }
-            else {
-                Write-PSFMessage -Message "No clones were found created with image $image" -Level Verbose
+            catch {
+                Stop-PSFFunction -Message "Couldn't remove image '$image' from database" -Target $result
             }
 
         } # End for each image

internal/functions/Test-PdcConfiguration.ps1

@@ -84,7 +84,7 @@ function Test-PdcConfiguration {
     }
 
     Write-PSFMessage -Message "Attempting to connect to PSDatabaseClone database server $SqlInstance.." -Level Verbose
-    if ($result.Check) {
+    if (-not $errorOccured) {
         try {
             $ecServer = Connect-DbaInstance -SqlInstance $SqlInstance -SqlCredential $SqlCredential
         }