Skip to content

Fix: Fixes release fetching of Agent with correct comparison and proper support for local sources #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Fix: Fixes release fetching of Agent with correct comparison and proper support for local sources #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/31-Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#152](https://github.com/Icinga/icinga-powershell-framework/issues/152) Fixes incorrect rendering for empty arrays which used `$null` incorrectly instead of `@()` and fixed ValidateSet which now also supports arrays as data type
* [#159](https://github.com/Icinga/icinga-powershell-framework/pull/159) Fixes crash during update of the Icinga Framework, caused by the newly introduced experimental feature for code caching
* [#165](https://github.com/Icinga/icinga-powershell-framework/pull/165) Fixes fetching for Icinga Agent certificate for REST-Api daemon on upper/lower case hostname mismatch
* [#166](https://github.com/Icinga/icinga-powershell-framework/pull/166) Fixes fetching of Icinga Agent MSI packages by correctly comparing versions to ensure we always use the latest version and fixes `release` usage for local/network drive sources

## 1.2.0 (2020-08-28)

Expand Down
81 changes: 58 additions & 23 deletions lib/core/icingaagent/getters/Get-IcingaAgentMSIPackage.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,73 @@ function Get-IcingaAgentMSIPackage()
$ProgressPreference = "SilentlyContinue";
$Architecture = Get-IcingaAgentArchitecture;
$LastUpdate = $null;
$Version = $Version.ToLower();

if ($Version -eq 'snapshot' -Or $Version -eq 'release') {
$Content = (Invoke-IcingaWebRequest -Uri $Source -UseBasicParsing).RawContent.Split("`r`n");
$UsePackage = $null;
if (Test-Path $Source) {
$Content = Get-ChildItem -Path $Source;

foreach ($entry in $Content) {
$PackageVersion = ($entry.Name.Split('-')[1]).Replace('v', '');

foreach ($line in $Content) {
if ($line -like '*.msi*' -And $line -like "*$Architecture.msi*") {
$MSIPackage = $line.SubString(
$line.IndexOf('Icinga2-'),
$line.IndexOf('.msi') - $line.IndexOf('Icinga2-')
);
$LastUpdate = $line.SubString(
$line.IndexOf('indexcollastmod">') + 17,
$line.Length - $line.IndexOf('indexcollastmod">') - 17
);
$LastUpdate = $LastUpdate.SubString(0, $LastUpdate.IndexOf(' '));
$LastUpdate = $LastUpdate.Replace('-', '');
$MSIPackage = [string]::Format('{0}.msi', $MSIPackage);
if ($Version -eq 'snapshot') {
if ($line -like '*snapshot*') {
$UsePackage = $MSIPackage;
if ($PackageVersion -eq 'snapshot') {
$UseVersion = 'snapshot';
break;
}
} elseif ($Version -eq 'release') {
if ($line -like '*snapshot*' -Or $line -like '*-rc*') {
continue;
continue;
}

if ($PackageVersion -eq 'snapshot') {
continue;
}

if ($null -eq $UseVersion -Or [version]$PackageVersion -ge [version]$UseVersion) {
$UseVersion = $PackageVersion;
}
}
} else {
$Content = (Invoke-IcingaWebRequest -Uri $Source -UseBasicParsing).RawContent.Split("`r`n");
$UsePackage = $null;
$UseVersion = $null;

foreach ($line in $Content) {
if ($line -like '*.msi*' -And $line -like "*$Architecture.msi*") {
$MSIPackage = $line.SubString(
$line.IndexOf('Icinga2-'),
$line.IndexOf('.msi') - $line.IndexOf('Icinga2-')
);
$LastUpdate = $line.SubString(
$line.IndexOf('indexcollastmod">') + 17,
$line.Length - $line.IndexOf('indexcollastmod">') - 17
);
$LastUpdate = $LastUpdate.SubString(0, $LastUpdate.IndexOf(' '));
$LastUpdate = $LastUpdate.Replace('-', '');
$MSIPackage = [string]::Format('{0}.msi', $MSIPackage);
$PackageVersion = ($MSIPackage.Split('-')[1]).Replace('v', '');

if ($Version -eq 'snapshot') {
if ($PackageVersion -eq 'snapshot') {
$UseVersion = 'snapshot';
break;
}
} elseif ($Version -eq 'release') {
if ($line -like '*snapshot*' -Or $line -like '*-rc*') {
continue;
}

if ($null -eq $UseVersion -Or [version]$PackageVersion -ge [version]$UseVersion) {
$UseVersion = $PackageVersion;
}
}
$UsePackage = $MSIPackage;
break;
}
}
}
if ($Version -eq 'snapshot') {
$UsePackage = [string]::Format('Icinga2-{0}-{1}.msi', $UseVersion, $Architecture);
} else {
$UsePackage = [string]::Format('Icinga2-v{0}-{1}.msi', $UseVersion, $Architecture);
}
} else {
$UsePackage = [string]::Format('Icinga2-v{0}-{1}.msi', $Version, $Architecture);
}
Expand All @@ -67,7 +102,7 @@ function Get-IcingaAgentMSIPackage()

return @{
'InstallerPath' = $DownloadPath;
'Version' = ($UsePackage).Replace('Icinga2-v', '').Replace([string]::Format('-{0}.msi', $Architecture), '')
'Version' = ($UsePackage).Replace('Icinga2-v', '').Replace('Icinga2-', '').Replace([string]::Format('-{0}.msi', $Architecture), '')
'LastUpdate' = $LastUpdate;
}
}