Skip to content

Commit eb5be21

Browse files
committed
Update monkeyruleset
1 parent b298eb7 commit eb5be21

9 files changed

Lines changed: 35 additions & 455 deletions

core/modules/monkeyruleset/private/Get-AvailableRule.ps1

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,36 @@ Function Get-AvailableRule{
6868
}
6969
#Select path
7070
$_path = $rule.rule | Select-Object -ExpandProperty path | Select-Object -Unique
71-
$exists = $Script:Dataset | Select-Object -ExpandProperty $_path -ErrorAction Ignore
72-
If($exists){
73-
$ruleObj.path = $_path;
74-
$ruleObj.skipped = $false;
75-
$ruleObj.reason = "Data exists in dataset";
71+
If($null -eq $_path){
72+
#removing rule
73+
Write-Verbose -Message ($Script:messages.UnitItemNotFound -f $rule.displayName)
74+
$ruleObj.path = $null;
75+
$ruleObj.skipped = $true;
76+
$ruleObj.reason = "Data is not present in dataset";
77+
7678
}
77-
Else{
79+
ElseIf($_path.Length -eq 0){
7880
#removing rule
7981
Write-Verbose -Message ($Script:messages.UnitItemNotFound -f $rule.displayName)
80-
$ruleObj.path = $_path;
82+
$ruleObj.path = $null;
8183
$ruleObj.skipped = $true;
8284
$ruleObj.reason = "Data is not present in dataset";
8385
}
86+
Else{
87+
$exists = $Script:Dataset | Select-Object -ExpandProperty $_path -ErrorAction Ignore
88+
If($exists){
89+
$ruleObj.path = $_path;
90+
$ruleObj.skipped = $false;
91+
$ruleObj.reason = "Data exists in dataset";
92+
}
93+
Else{
94+
#removing rule
95+
Write-Verbose -Message ($Script:messages.UnitItemNotFound -f $rule.displayName)
96+
$ruleObj.path = $_path;
97+
$ruleObj.skipped = $true;
98+
$ruleObj.reason = "Data is not present in dataset";
99+
}
100+
}
84101
#Add to array
85102
$formattedRules.Add($ruleObj)
86103
}

core/modules/monkeyruleset/private/Get-NewFilter2.ps1

Lines changed: 0 additions & 137 deletions
This file was deleted.

core/modules/monkeyruleset/private/Get-ObjectFromDataset.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ Function Get-ObjectFromDataset{
117117
Write-Warning -Message ($Script:messages.PathNotFoundErrorMessage -f $InputObject.rule.path.Trim().ToString())
118118
}
119119
}
120+
ElseIf($InputObject -is [System.String]){
121+
$_objects = Get-ObjectPropertyByPath -InputObject $Script:Dataset -Property $InputObject
122+
If($null -ne $_objects){
123+
$_objects | Select-Object -ExpandProperty Data -ErrorAction Ignore
124+
}
125+
}
120126
}
121127
}
122128
Else{

core/modules/monkeyruleset/private/Get-StatusCode.ps1

Lines changed: 0 additions & 62 deletions
This file was deleted.

core/modules/monkeyruleset/private/Get-ValidRule.ps1

Lines changed: 0 additions & 62 deletions
This file was deleted.

core/modules/monkeyruleset/private/New-MonkeyFindingObject.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ Function New-MonkeyFindingObject {
6666
If($null -eq $Metadata){
6767
$Metadata = New-EmptyMetadataObject
6868
}
69+
#Normalize IdSuffix
70+
$InputObject.idSuffix = $InputObject.idSuffix.Replace('.','_').Replace(' ','_').ToLower();
71+
#Add properties
6972
$InputObject | Add-Member -Type NoteProperty -name metadata -value $Metadata -Force
7073
$InputObject | Add-Member -Type NoteProperty -name affectedResources -value $AffectedObjects -Force
7174
$InputObject | Add-Member -Type NoteProperty -name resources -value $Resources -Force
@@ -170,7 +173,7 @@ Function New-MonkeyFindingObject {
170173
$InputObject | Add-Member -Type ScriptMethod -Name getNewIdSuffix -Value {
171174
If($null -ne $this.idSuffix.Replace(' ','_')){
172175
$guid = [System.Guid]::NewGuid().ToString('N')
173-
return ("{0}_{1}" -f $this.idSuffix, $guid)
176+
return ("{0}_{1}" -f $this.idSuffix, $guid).ToLower()
174177
}
175178
} -Force
176179
return $InputObject

core/modules/monkeyruleset/private/Resolve-Include.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Function Resolve-Include{
6868
Catch{
6969
Write-Warning $_.Exception.Message
7070
Write-Verbose $_.Exception
71+
Write-Warning -Message ($Script:messages.FileNotFoundGenericMessage -f $includeFile)
7172
}
7273
}
7374
Else{

0 commit comments

Comments
 (0)