upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-20 23:00:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix web requests for repos not using icinga Cmdlet

Browse source
This commit is contained in:
Lord Hepipud 2021-11-11 10:18:28 +01:00
parent 6d51f01570
commit 737a8fe80c
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/100-General/10-Changelog.md
View file

@ -11,9 +11,14 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
[Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/19?closed=1)
## 1.7.1 (2021-11-11)
[Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/22?closed=1)
### Bugfixes
* [#398](https://github.com/Icinga/icinga-powershell-framework/pull/398) Fixes String.Builder object output, while creating new components by using `New-IcingaForWindowsComponent`
* [#401](https://github.com/Icinga/icinga-powershell-framework/pull/401) Fixes the repository manager by now using Icinga WebRequests instead of Windows WebRequests, allowing the usage of the internal proxy feature
## 1.7.0 (2021-11-09)

2
lib/core/repository/Read-IcingaRepositoryFile.psm1
View file

@ -49,7 +49,7 @@ function Read-IcingaRepositoryFile()
$RepoPath = (Join-WebPath -Path $Repository.RemotePath -ChildPath 'ifw.repo.json');
}
$WebContent = Invoke-WebRequest -UseBasicParsing -Uri $RepoPath;
$WebContent = Invoke-IcingaWebRequest -UseBasicParsing -Uri $RepoPath;
if ($null -ne $WebContent) {
if ($WebContent.RawContent.Contains('application/octet-stream')) {

6
lib/core/repository/Sync-IcingaRepository.psm1
View file

@ -97,10 +97,10 @@ function Sync-IcingaRepository()
} else { # Sync Source is web path
$ProgressPreference = "SilentlyContinue";
try {
Invoke-WebRequest -USeBasicParsing -Uri $Source -OutFile $RepoFile;
Invoke-IcingaWebRequest -UseBasicParsing -Uri $Source -OutFile $RepoFile;
} catch {
try {
Invoke-WebRequest -USeBasicParsing -Uri (Join-WebPath -Path $Source -ChildPath 'ifw.repo.json') -OutFile $RepoFile;
Invoke-IcingaWebRequest -UseBasicParsing -Uri (Join-WebPath -Path $Source -ChildPath 'ifw.repo.json') -OutFile $RepoFile;
} catch {
Write-IcingaConsoleError 'Unable to download repository file from "{0}". Exception: "{1}"' -Objects $Source, $_.Exception.Message;
$Success = Remove-Item -Path $TmpDir -Recurse -Force;
@ -145,7 +145,7 @@ function Sync-IcingaRepository()
try {
Write-IcingaConsoleNotice 'Syncing repository component "{0}" as file "{1}" into temp directory' -Objects $component, $package.Location;
Invoke-WebRequest -USeBasicParsing -Uri $DownloadLink -OutFile $TargetLocation;
Invoke-IcingaWebRequest -USeBasicParsing -Uri $DownloadLink -OutFile $TargetLocation;
} catch {
Write-IcingaConsoleError 'Failed to download repository component "{0}". Exception: "{1}"' -Objects $DownloadLink, $_.Exception.Message;
continue;