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

Merge pull request #373 from Icinga:fix/repository_name_with_dot

Browse source 
Fix: Repository names with dots fail to load

Fixes repository names with dots (`.`) by replacing them with `-`, as otherwise the config parser will fail finding the config object
This commit is contained in:
Lord Hepipud 2021-09-14 10:10:46 +02:00 committed by GitHub
commit 14ee09cb84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#368](https://github.com/Icinga/icinga-powershell-framework/issues/368) Fixes repository lookup on local path for ifw.repo.json, in the json file was added to the file path during repository add
* [#369](https://github.com/Icinga/icinga-powershell-framework/issues/369) Fixes experimental feature warning for API-Check Forwarder feature, which is fully supported since v1.6.0 and replaces it with proper information and link to docs
* [#371](https://github.com/Icinga/icinga-powershell-framework/issues/371) Fixes wrong indention on Icinga parent host address at IMC configuration summary overview
* [#373](https://github.com/Icinga/icinga-powershell-framework/issues/373) Fixes repository names with dots (`.`) by replacing them with `-`, as otherwise the config parser will fail finding the config object
### Enhancements

27
lib/config/Get-IcingaPowerShellConfig.psm1
View file

@ -36,4 +36,31 @@ function Get-IcingaPowerShellConfig()
}
return $ConfigObject;
<#
# Alternate config parser. Might come handy in the future, requires to redesign
# Set-IcingaPowerShellConfig including all calls for full coverage
$Config = Read-IcingaPowerShellConfig;
$PathArray = $Path.Split('.');
$ConfigObject = $Config;
[int]$Index = 0;
$entry = $PathArray[$Index];
while ($Index -lt $PathArray.Count) {
if (-Not (Test-IcingaPowerShellConfigItem -ConfigObject $ConfigObject -ConfigKey $entry) -And $Index -lt $PathArray.Count) {
$Index += 1;
$entry = [string]::Format('{0}.{1}', $entry, $PathArray[$Index]);
continue;
} elseif (-Not (Test-IcingaPowerShellConfigItem -ConfigObject $ConfigObject -ConfigKey $entry) -And $Index -ge $PathArray.Count) {
return $null;
}
$ConfigObject = $ConfigObject.$entry;
$Index += 1;
$entry = $PathArray[$Index];
}
return $ConfigObject;
#>
}

12
lib/config/Test-IcingaPowerShellConfigItem.psm1
View file

@ -26,5 +26,15 @@ function Test-IcingaPowerShellConfigItem()
$ConfigKey
);
return ([bool]($ConfigObject.PSObject.Properties.Name -eq $ConfigKey) -eq $TRUE);
if ($null -eq $ConfigObject -Or [string]::IsNullOrEmpty($ConfigKey)) {
return $FALSE;
}
foreach ($entry in $ConfigObject.PSObject.Properties) {
if ($entry.Name.ToLower() -eq $ConfigKey.ToLower()) {
return $TRUE;
}
}
return $FALSE;
}

2
lib/core/repository/Add-IcingaRepository.psm1
View file

@ -11,6 +11,8 @@ function Add-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
if ([string]::IsNullOrEmpty($RemotePath)) {
Write-IcingaConsoleError 'You have to provide a remote path for the repository';
return;

2
lib/core/repository/Disable-IcingaRepository.psm1
View file

@ -9,6 +9,8 @@ function Disable-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
$CurrentRepositories = Get-IcingaPowerShellConfig -Path ([string]::Format('Framework.Repository.Repositories.{0}', $Name));
if ($null -eq $CurrentRepositories) {

2
lib/core/repository/Enable-IcingaRepository.psm1
View file

@ -9,6 +9,8 @@ function Enable-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
$CurrentRepositories = Get-IcingaPowerShellConfig -Path ([string]::Format('Framework.Repository.Repositories.{0}', $Name));
if ($null -eq $CurrentRepositories) {

2
lib/core/repository/New-IcingaRepository.psm1
View file

@ -12,6 +12,8 @@ function New-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
if ([string]::IsNullOrEmpty($Path) -Or (Test-Path $Path) -eq $FALSE) {
Write-IcingaConsoleError 'The provided path "{0}" does not exist' -Objects $Path;
return;

2
lib/core/repository/Pop-IcingaRepository.psm1
View file

@ -9,6 +9,8 @@ function Pop-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
$CurrentRepositories = Get-IcingaPowerShellConfig -Path 'Framework.Repository.Repositories';
if ($null -eq $CurrentRepositories) {

2
lib/core/repository/Push-IcingaRepository.psm1
View file

@ -12,6 +12,8 @@ function Push-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
$CurrentRepositories = Get-IcingaPowerShellConfig -Path 'Framework.Repository.Repositories';
if ($null -eq $CurrentRepositories) {

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

@ -10,6 +10,8 @@ function Read-IcingaRepositoryFile()
return $null;
}
$Name = $Name.Replace('.', '-');
$Repository = Get-IcingaPowerShellConfig -Path ([string]::Format('Framework.Repository.Repositories.{0}', $Name));
if ($null -eq $Repository) {

2
lib/core/repository/Remove-IcingaRepository.psm1
View file

@ -9,6 +9,8 @@ function Remove-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
$CurrentRepositories = Get-IcingaPowerShellConfig -Path 'Framework.Repository.Repositories';
if ((Test-IcingaPowerShellConfigItem -ConfigObject $CurrentRepositories -ConfigKey $Name) -eq $FALSE) {

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

@ -16,6 +16,8 @@ function Sync-IcingaRepository()
return;
}
$Name = $Name.Replace('.', '-');
if ($UseSCP -And $null -eq (Get-Command 'scp' -ErrorAction SilentlyContinue) -And $null -eq (Get-Command 'ssh' -ErrorAction SilentlyContinue)) {
Write-IcingaConsoleWarning 'You cannot use SCP on this system, as SCP and/or SSH seem not to be installed';
return;

3
lib/core/repository/Update-IcingaRepository.psm1
View file

@ -18,6 +18,9 @@ function Update-IcingaRepository()
}
if ([string]::IsNullOrEmpty($Name) -eq $FALSE) {
$Name = $Name.Replace('.', '-');
if ((Test-IcingaPowerShellConfigItem -ConfigObject $CurrentRepositories -ConfigKey $Name) -eq $FALSE -And $CreateNew -eq $FALSE) {
Write-IcingaConsoleError 'A repository with the given name "{0}" does not exist. Use "New-IcingaRepository" or "Sync-IcingaForWindowsRepository" to create a new one.' -Objects $Name;
return;