Fix install when version is provided with leading 'v' (#19)

- Minor fixes:
    1. Confirm option not passed to uninstall commands.
    2. Install-ContainerTools fails when Initialze-NatNetwork fails. Write-Error instead.

Co-authored-by: TinaMor <mor.tina@outlook.com>

Author: TinaMor

Tests/AllToolsUtilities.Tests.ps1

@@ -213,12 +213,12 @@ Describe "AllToolsUtilities.psm1" {
 
         It "Should register services and initialize NAT network" {
             Install-ContainerTools `
-            -InstallPath 'TestDrive:\Install Directory' `
-            -Force -Confirm:$false `
-            -RegisterServices
+                -InstallPath 'TestDrive:\Install Directory' `
+                -Force -Confirm:$false `
+                -RegisterServices
 
             $RegisterContainerdParams = @{
-                ContainerdPath =  "$InstallPath\Containerd"
+                ContainerdPath = "$InstallPath\Containerd"
             }
             $RegisterBuildKitdParams = @{
                 BuildKitPath = "$InstallPath\Buildkit"
@@ -230,5 +230,12 @@ Describe "AllToolsUtilities.psm1" {
                 -ParameterFilter { $RegisterBuildKitdParams -and $Start -eq $true -and $Force -eq $true }
             Should -Invoke Initialize-NatNetwork -ModuleName 'AllToolsUtilities' -Times 1
         }
+
+        It "Should not throw an error if initializing NAT network fails" {
+            Mock Initialize-NatNetwork -ModuleName 'AllToolsUtilities' -MockWith { throw 'Error message' }
+
+            { Install-ContainerTools -InstallPath 'TestDrive:\Install Directory' -Force -Confirm:$false -RegisterServices } | Should -Not -Throw
+            $Error[0].Exception.Message | Should -Be 'Failed to initialize NAT network. Error message'
+        }
     }
 }

containers-toolkit/Private/CommonToolUtilities.psm1

@@ -64,7 +64,7 @@ function Get-InstallationFile {
     begin {
         $functions = {
             function Receive-File ($feature) {
-                Write-Information -InformationAction Continue -MessageData "Downloading $($feature.Feature) version $($feature.Version)"
+                Write-Information -InformationAction Continue -MessageData "Downloading $($feature.Feature) version v$($feature.Version)"
                 try {
                     Invoke-WebRequest -Uri $feature.Uri -OutFile $feature.DownloadPath -UseBasicParsing
                 }
@@ -107,7 +107,7 @@ function Get-InstallationFile {
     }
 
     end {
-        $jobs | Remove-Job -Force
+        $jobs | Remove-Job -Force -ErrorAction SilentlyContinue
     }
 }
 

containers-toolkit/Public/AllToolsUtilities.psm1

@@ -72,7 +72,12 @@ function Install-ContainerTools {
     )
 
     begin {
-        $toInstall = @("containerd", "buildkit", "nerdctl")
+        # Strip leading "v" from version
+        $containerdVersion = $containerdVersion.TrimStart("v")
+        $buildKitVersion = $buildKitVersion.TrimStart("v")
+        $nerdctlVersion = $nerdctlVersion.TrimStart("v")
+
+        $toInstall = @("containerd v($containerdVersion)", "buildkit v($buildKitVersion)", "nerdctl v($nerdctlVersion)")
         $toInstallString = $($toInstall -join ', ')
 
         $WhatIfMessage = "$toInstallString will be installed"
@@ -88,18 +93,18 @@ function Install-ContainerTools {
 
     process {
         if ($PSCmdlet.ShouldProcess($InstallPath, $WhatIfMessage)) {
-            Write-Debug "Tools to install: $toInstallString"
+            Write-Output "Tools to install: $toInstallString"
 
             # Global Variables needed for the script
             $containerdTarFile = "containerd-${containerdVersion}-windows-amd64.tar.gz"
-            $BuildKitTarFile = "buildkit-v${BuildKitVersion}.windows-amd64.tar.gz"
+            $buildKitTarFile = "buildkit-v${buildKitVersion}.windows-amd64.tar.gz"
             $nerdctlTarFile = "nerdctl-${nerdctlVersion}-windows-amd64.tar.gz"
 
             # Installation paths
             $ContainerdPath = "$InstallPath\Containerd"
             $BuildkitPath = "$InstallPath\Buildkit"
             $NerdCTLPath = "$InstallPath\nerdctl"
-
+            
             $files = @(
                 [PSCustomObject]@{
                     Feature      = "Containerd"
@@ -140,7 +145,7 @@ function Install-ContainerTools {
                     # Uninstall if tool exists at specified location. Requires user consent
                     if (-not (Test-EmptyDirectory -Path $params.InstallPath) ) {
                         Write-Warning "Uninstalling $($params.Feature) from $($params.InstallPath)"
-                        Uninstall-ContainerTool -Tool $params.Feature -Path $params.InstallPath -Force $force
+                        Uninstall-ContainerTool -Tool $params.Feature -Path $params.InstallPath -Force:$force
                     }
 
                     # Untar downloaded files to the specified installation path
@@ -156,8 +161,8 @@ function Install-ContainerTools {
 
                     if ($RegisterServices) {
                         $RegisterParams = @{
-                            force = $force
-                            feature = $params.Feature
+                            force       = $force
+                            feature     = $params.Feature
                             installPath = $params.InstallPath
                         }
                         Register-Service @RegisterParams
@@ -168,21 +173,25 @@ function Install-ContainerTools {
                 }
             }
 
+            $isError = $false
             if ($RegisterServices) {
-                Initialize-NatNetwork
+                try { 
+                    Initialize-NatNetwork -Force:$force -Confirm:$false
+                }
+                catch {
+                    $isError = $true
+                    Write-Error "Failed to initialize NAT network. $_"
+                }
             }
             else {
-                Write-Information -Tags "Instructions" -MessageData (
-                    "To start containderd service, run 'Start-Service containerd' or 'Start-ContainerdService',",
-                    "To start buildkitd service, run 'Start-Service buildkitd' or 'Start-BuildkitdService'"
-                )
+                $message = "To register containerd and buildkitd services, run the following commands:`n`tRegister-ContainerdService -ContainerdPath '$ContainerdPath' -Start`n`tRegister-BuildkitdService -BuildkitPath '$BuildkitPath' -Start"
+                $message += "`nThen, to create a NAT network for nerdctl, run the following command:`n`tInitialize-NatNetwork"
+                Write-Information -MessageData $message -Tags "Instructions" -InformationAction Continue
             }
 
-            Write-Information -MessageData "$($completedInstalls -join ', ') installed successfully." -Tags "Installation" -InformationAction Continue
-
-            $message = "To register containerd and buildkitd services, run the following commands:`n`tRegister-ContainerdService -ContainerdPath '$ContainerdPath' -Start`n`tRegister-BuildkitdService -BuildkitPath '$BuildkitPath' -Start"
-            $message += "`nThen, to create a NAT network for nerdctl, run the following command:`n`tInitialize-NatNetwork"
-            Write-Information -MessageData $message -Tags "Instructions" -InformationAction Continue
+            if (!$isError) {
+                Write-Output "$($completedInstalls -join ', ') installed successfully."
+            }
         }
         else {
             # Code that should be processed if doing a WhatIf operation
@@ -194,7 +203,7 @@ function Install-ContainerTools {
 
 function Uninstall-ContainerTool($Tool, $Path, $force) {
     $uninstallCommand = "Uninstall-$($Tool)"
-    & $uninstallCommand -Path "$Path" -Force:$Force
+    & $uninstallCommand -Path "$Path" -Force:$Force -Confirm:$false
 }
 
 function Get-InstalledVersion($feature, $Latest) {