Install-OSServer: Fixed a bug when trying to update lifetime installer. Get-OSServerInfo: Added Lifetime version output

pintonunes · pintonunes · commit 879fdc76b9c3 · 2021-01-22T11:57:48.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Outsystems.SetupTools Release History
 
+## 3.9.0.0
+
+- Install-OSServer: Fixed a bug when trying to update lifetime installer
+- Get-OSServerInfo: Added Lifetime version output
+
 ## 3.8.0.0
 
 - Updated the OutSystems repo for downloading sources
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.8.0.{build}
+version: 3.9.0.{build}
 
 only_commits:
   files:
diff --git a/src/Outsystems.SetupTools/Functions/Get-OSServerInfo.ps1 b/src/Outsystems.SetupTools/Functions/Get-OSServerInfo.ps1
@@ -23,12 +23,13 @@ function Get-OSServerInfo
 
         # Initialize the results object
         $serverInfo = [pscustomobject]@{
-            PSTypeName   = 'Outsystems.SetupTools.ServerInfo'
-            InstallDir   = ''
-            Version      = ''
-            MachineName  = ''
-            SerialNumber = ''
-            PrivateKey   = ''
+            PSTypeName       = 'Outsystems.SetupTools.ServerInfo'
+            InstallDir       = ''
+            Version          = ''
+            MachineName      = ''
+            SerialNumber     = ''
+            PrivateKey       = ''
+            LifetimeVersion  = ''
         }
     }
 
@@ -48,11 +49,13 @@ function Get-OSServerInfo
         $serverInfo.Version = [System.Version]$serverInfo.Version
         $serverInfo.MachineName = GetServerMachineName
         $serverInfo.SerialNumber = GetServerSerialNumber
+        $serverInfo.LifetimeVersion = [System.Version]$(GetLifetimeVersion)
 
         LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 0 -Message "Server InstallDir is: $($serverInfo.InstallDir)"
         LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 0 -Message "Server version is: $($serverInfo.Version)"
         LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 0 -Message "Server machine name is: $($serverInfo.MachineName)"
         LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 0 -Message "Server serial number is: $($serverInfo.SerialNumber)"
+        LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 0 -Message "Lifetime version is: $($serverInfo.LifetimeVersion)"
 
         #region private key
         $privateKeyFile = "$($serverInfo.InstallDir)\private.key"
diff --git a/src/Outsystems.SetupTools/Functions/Install-OSServer.ps1 b/src/Outsystems.SetupTools/Functions/Install-OSServer.ps1
@@ -119,13 +119,16 @@ function Install-OSServer
 
         $osVersion = GetServerVersion
         $osInstallDir = GetServerInstallDir
-
-        # Installer name
         $osInstaller = "PlatformServer-$Version.exe"
+
+        # Lifetime with platform server
         if ($WithLifetime.IsPresent)
         {
-            # Lifetime installer instead
+            # Replace the installer name
             $osInstaller = "LifeTimeWithPlatformServer-$Version.exe"
+
+            # Get lifetime version instead of platform server
+            $osVersion = GetLifetimeVersion
         }
     }
 
diff --git a/src/Outsystems.SetupTools/Lib/PlatformSetup.ps1 b/src/Outsystems.SetupTools/Lib/PlatformSetup.ps1
@@ -706,6 +706,16 @@ function GetServerVersion()
     return $output
 }
 
+function GetLifetimeVersion()
+{
+    LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 2 -Message "Getting the contents of the registry key HKLM:SOFTWARE\OutSystems\Installer\Server\LifeTime"
+    $output = RegRead -Path "HKLM:SOFTWARE\OutSystems\Installer\Server" -Name "LifeTime"
+
+    LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 2 -Message "Returning: $output"
+
+    return $output
+}
+
 function GetServiceStudioVersion([string]$MajorVersion)
 {
     LogMessage -Function $($MyInvocation.Mycommand) -Phase 1 -Stream 2 -Message "Getting the contents of the registry key HKLM:SOFTWARE\OutSystems\Installer\Service Studio $MajorVersion\Service Studio $MajorVersion"
diff --git a/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1 b/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1
@@ -12,7 +12,7 @@
 RootModule = 'OutSystems.SetupTools.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.8.0.0'
+ModuleVersion = '3.9.0.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/test/unit/Get-OSServerInfo.Tests.ps1 b/test/unit/Get-OSServerInfo.Tests.ps1
@@ -20,16 +20,20 @@ InModuleScope -ModuleName OutSystems.SetupTools {
         Mock GetServerSerialNumber { return 'XBI-NMO-IL5-OYI-9SO-LCU-4SQ-QUT' }
         Mock Test-Path { return $true }
         Mock Get-Content { return $filecontent }
+        Mock GetLifetimeVersion { return $null }
 
         $assGetServerInstallDir = @{ 'CommandName' = 'GetServerInstallDir'; 'Times' = 1; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assGetServerVersion = @{ 'CommandName' = 'GetServerVersion'; 'Times' = 1; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assGetServerMachineName = @{ 'CommandName' = 'GetServerMachineName'; 'Times' = 1; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assGetServerSerialNumber = @{ 'CommandName' = 'GetServerSerialNumber'; 'Times' = 1; 'Exactly' = $true ; 'Scope' = 'Context' }
+        $assGetLifetimeVersion = @{ 'CommandName' = 'GetLifetimeVersion'; 'Times' = 1; 'Exactly' = $true ; 'Scope' = 'Context' }
+
 
         $assNotGetServerInstallDir = @{ 'CommandName' = 'GetServerInstallDir'; 'Times' = 0; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assNotGetServerVersion = @{ 'CommandName' = 'GetServerVersion'; 'Times' = 0; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assNotGetServerMachineName = @{ 'CommandName' = 'GetServerMachineName'; 'Times' = 0; 'Exactly' = $true ; 'Scope' = 'Context' }
         $assNotGetServerSerialNumber = @{ 'CommandName' = 'GetServerSerialNumber'; 'Times' = 0; 'Exactly' = $true ; 'Scope' = 'Context' }
+        $assNotGetLifetimeVersion = @{ 'CommandName' = 'GetLifetimeVersion'; 'Times' = 0; 'Exactly' = $true ; 'Scope' = 'Context' }
 
         Context 'When platform is not installed' {
 
@@ -41,6 +45,7 @@ InModuleScope -ModuleName OutSystems.SetupTools {
             It 'Should call the GetServerVersion' { Assert-MockCalled @assGetServerVersion }
             It 'Should not call the GetServerMachineName' { Assert-MockCalled @assNotGetServerMachineName }
             It 'Should not call the GetServerSerialNumber' { Assert-MockCalled @assNotGetServerSerialNumber }
+            It 'Should not call the GetLifetimeVersion' { Assert-MockCalled @assNotGetLifetimeVersion }
             It 'Should output an error' { $err[-1] | Should Be 'Outsystems platform is not installed' }
             It 'Should not throw' { { Get-OSServerInfo -ErrorAction SilentlyContinue } | Should Not throw }
         }
@@ -54,33 +59,25 @@ InModuleScope -ModuleName OutSystems.SetupTools {
             It 'Should return the correct machine name' { $output.MachineName | Should Be 'MYMACHINE' }
             It 'Should return the correct serial number' { $output.SerialNumber | Should Be 'XBI-NMO-IL5-OYI-9SO-LCU-4SQ-QUT' }
             It 'Should return the correct private key' { $output.PrivateKey | Should Be 'v4iwANAsGDRpjiEpO8Kt3Q==' }
+            It 'Should return the correct lifetime version' { $output.LifetimeVersion| Should Be $null }
             It 'Should output a version type property' { ($output.Version).GetType().Name | Should Be 'Version' }
             It 'Should call the GetServerInstallDir' { Assert-MockCalled @assGetServerInstallDir }
             It 'Should call the GetServerVersion' { Assert-MockCalled @assGetServerVersion }
             It 'Should call the GetServerMachineName' { Assert-MockCalled @assGetServerMachineName }
             It 'Should call the GetServerSerialNumber' { Assert-MockCalled @assGetServerSerialNumber }
+            It 'Should call the GetLifetimeVersion' { Assert-MockCalled @assGetLifetimeVersion }
             It 'Should not output an error' { $err.Count | Should Be 0 }
             It 'Should not throw' { { Get-OSServerInfo -ErrorAction SilentlyContinue } | Should Not throw }
         }
 
-        Context 'When the platform server is installed but NOT configured' {
+        Context 'When lifetime is installed' {
 
-            Mock GetServerMachineName { return $null }
-            Mock GetServerSerialNumber { return $null }
-            Mock Test-Path { return $false }
+            Mock GetLifetimeVersion { return '11.0.0.1' }
 
             $output = Get-OSServerInfo -ErrorAction SilentlyContinue -ErrorVariable err
 
-            It 'Should return the correct install directory' { $output.InstallDir | Should Be 'C:\Program Files\OutSystems\Platform Server' }
-            It 'Should return the correct server version' { $output.Version| Should Be '11.0.0.0' }
-            It 'Should return an empty machine name' { $output.MachineName | Should Be $null }
-            It 'Should return an empty serial number' { $output.SerialNumber | Should Be $null }
-            It 'Should return an empty private key' { $output.PrivateKey | Should Be '' }
-            It 'Should output a version type property' { ($output.Version).GetType().Name | Should Be 'Version' }
-            It 'Should call the GetServerInstallDir' { Assert-MockCalled @assGetServerInstallDir }
-            It 'Should call the GetServerVersion' { Assert-MockCalled @assGetServerVersion }
-            It 'Should call the GetServerMachineName' { Assert-MockCalled @assGetServerMachineName }
-            It 'Should call the GetServerSerialNumber' { Assert-MockCalled @assGetServerSerialNumber }
+            It 'Should return the correct server version' { $output.LifetimeVersion| Should Be '11.0.0.1' }
+            It 'Should output a version type property for lifetime' { ($output.LifetimeVersion).GetType().Name | Should Be 'Version' }
             It 'Should not output an error' { $err.Count | Should Be 0 }
             It 'Should not throw' { { Get-OSServerInfo -ErrorAction SilentlyContinue } | Should Not throw }
         }
diff --git a/test/unit/Install-OSServer.Tests.ps1 b/test/unit/Install-OSServer.Tests.ps1
@@ -8,6 +8,7 @@ InModuleScope -ModuleName OutSystems.SetupTools {
         Mock IsAdmin { return $true }
         Mock GetServerVersion { return '10.0.0.1' }
         Mock GetServerInstallDir { return 'C:\Program Files\OutSystems\Platform Server' }
+        Mock GetLifetimeVersion { return $null }
         Mock DownloadOSSources {}
         Mock Start-Process { return @{ 'Output' = 'All good'; 'ExitCode' = 0} }
 
@@ -236,11 +237,14 @@ InModuleScope -ModuleName OutSystems.SetupTools {
         Context 'When lifetime switch is specified' {
 
             Mock GetServerVersion { return $null }
-            Mock GetServerInstallDir { return $null }
+
+            # Here we are testing also that the version used to compare is the lifetime version and not the platform server version
+            Mock GetServerInstallDir { return '11.1.0.0' }
+            Mock GetLifetimeVersion { return '11.0.0.0' }
 
             $assRunParams = @{ 'CommandName' = 'Start-Process'; 'Times' = 1; 'Exactly' = $true; 'Scope' = 'Context'; 'ParameterFilter' = { $FilePath -eq "$ENV:TEMP\LifeTimeWithPlatformServer-11.0.0.1.exe" } }
 
-            $result = Install-OSServer -Version '11.0.0.1' -WithLifeTime -ErrorVariable err -ErrorAction SilentlyContinue
+            $null = Install-OSServer -Version '11.0.0.1' -WithLifeTime -ErrorVariable err -ErrorAction SilentlyContinue
 
             It 'Should run the installation using the lifetime installer' { Assert-MockCalled @assRunParams }
         }
@@ -252,7 +256,7 @@ InModuleScope -ModuleName OutSystems.SetupTools {
 
             $assRunParams = @{ 'CommandName' = 'Start-Process'; 'Times' = 1; 'Exactly' = $true; 'Scope' = 'Context'; 'ParameterFilter' = { $FilePath -eq "$ENV:TEMP\PlatformServer-11.0.0.1.exe" } }
 
-            $result = Install-OSServer -Version '11.0.0.1' -ErrorVariable err -ErrorAction SilentlyContinue
+            $null = Install-OSServer -Version '11.0.0.1' -ErrorVariable err -ErrorAction SilentlyContinue
 
             It 'Should run the installation using the normal installer' { Assert-MockCalled @assRunParams }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 3.8.0.{build}`
	`1`	`+version: 3.9.0.{build}`
`2`	`2`
`3`	`3`	`only_commits:`
`4`	`4`	`files:`
Original file line number	Diff line number	Diff line change
`@@ -119,13 +119,16 @@ function Install-OSServer`
`119`	`119`
`120`	`120`	`$osVersion = GetServerVersion`
`121`	`121`	`$osInstallDir = GetServerInstallDir`
`122`		`-`
`123`		`- # Installer name`
`124`	`122`	`$osInstaller = "PlatformServer-$Version.exe"`
	`123`	`+`
	`124`	`+ # Lifetime with platform server`
`125`	`125`	`if ($WithLifetime.IsPresent)`
`126`	`126`	`{`
`127`		`- # Lifetime installer instead`
	`127`	`+ # Replace the installer name`
`128`	`128`	`$osInstaller = "LifeTimeWithPlatformServer-$Version.exe"`
	`129`	`+`
	`130`	`+ # Get lifetime version instead of platform server`
	`131`	`+ $osVersion = GetLifetimeVersion`
`129`	`132`	`}`
`130`	`133`	`}`
`131`	`134`