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

Fixes array handling for ValidateSet

Browse source 
Empty arrays will now properly be rendered as empty array with @()
instead of $null. In addition the config renderer now also supports
ValidateSet for array entries
This commit is contained in:
Lord Hepipud 2020-11-18 18:14:44 +01:00
parent f31ac25edd
commit 5060dec97a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/31-Changelog.md
View file

@ -31,6 +31,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#138](https://github.com/Icinga/icinga-powershell-framework/issues/138) Fixes possible value overflow on `Convert-Bytes` while converting from anything larger than MB to Bytes * [#138](https://github.com/Icinga/icinga-powershell-framework/issues/138) Fixes possible value overflow on `Convert-Bytes` while converting from anything larger than MB to Bytes
* [#140](https://github.com/Icinga/icinga-powershell-framework/issues/140) Fixes version fetching for not loaded modules during upgrades/plugin calls with `Get-IcingaPowerShellModuleVersion` * [#140](https://github.com/Icinga/icinga-powershell-framework/issues/140) Fixes version fetching for not loaded modules during upgrades/plugin calls with `Get-IcingaPowerShellModuleVersion`
* [#143](https://github.com/Icinga/icinga-powershell-framework/issues/143) Fixes the annoying hint from the analyzer to check space before open brace * [#143](https://github.com/Icinga/icinga-powershell-framework/issues/143) Fixes the annoying hint from the analyzer to check space before open brace
* [#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
## 1.2.0 (2020-08-28) ## 1.2.0 (2020-08-28)

10
lib/core/tools/Get-IcingaCheckCommandConfig.psm1
View file

@ -165,7 +165,7 @@ function Get-IcingaCheckCommandConfig()
'value' = @{ 'value' = @{
'type' = 'Function'; 'type' = 'Function';
'body' = [string]::Format( 'body' = [string]::Format(
'var arr = macro("{0}");{1}if (len(arr) == 0) {2}{1}return "$null";{1}{3}{1}return arr.join(",");', 'var arr = macro("{0}");{1}if (len(arr) == 0) {2}{1}return "@()";{1}{3}{1}return arr.join(",");',
$IcingaCustomVariable, $IcingaCustomVariable,
"`r`n", "`r`n",
'{', '{',
@ -259,10 +259,16 @@ function Get-IcingaCheckCommandConfig()
); );
if ($IsDataList) { if ($IsDataList) {
[string]$DataListDataType = 'string';
if ($parameter.type.name -eq 'Array') {
$DataListDataType = 'array';
}
$Basket.Datafield[[string]$FieldID].Add( $Basket.Datafield[[string]$FieldID].Add(
'settings', @{ 'settings', @{
'datalist' = $DataListName; 'datalist' = $DataListName;
'data_type' = 'string'; 'data_type' = $DataListDataType;
'behavior' = 'strict'; 'behavior' = 'strict';
} }
); );