Skip to content

Commit 454bbf8

Browse files
committed
Refactor output
1 parent 8f778e9 commit 454bbf8

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

validations/Validator.ps1

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ class Validator {
3333
$scriptSubModules = @(Get-ChildItem -Path $this.ScriptsFolderPath -Directory)
3434
$docSubModules = @(Get-ChildItem -Path $this.DocsFolderPath -Directory)
3535
if($scriptSubModules.Count -ne $docSubModules.Count){
36-
Write-Error "Script submodules folders count ($($scriptSubModules.Count)) does not match docs submodules folders count ($($docSubModules.Count))."
36+
$this.WriteWarning("Script submodules folders count ($($scriptSubModules.Count)) does not match docs submodules folders count ($($docSubModules.Count)).")
3737
}
3838

3939
$missingScriptFolders = @()
4040
$missingDocFolders = @()
4141
foreach($scriptSubModule in $scriptSubModules){
4242
if($docSubModules.Name -notcontains $scriptSubModule.Name){
43-
Write-Error "Script submodule folder '$($scriptSubModule.Name)' does not have a corresponding docs submodule folder."
43+
$this.WriteWarning("Script submodule folder '$($scriptSubModule.Name)' does not have a corresponding docs submodule folder.")
4444
}
4545
}
4646
foreach($docSubModule in $docSubModules){
4747
if($scriptSubModules.Name -notcontains $docSubModule.Name){
48-
Write-Error "Doc submodule folder '$($docSubModule.Name)' does not have a corresponding script submodule folder."
48+
$this.WriteWarning("Doc submodule folder '$($docSubModule.Name)' does not have a corresponding script submodule folder.")
4949
}
5050
}
5151
}
@@ -56,20 +56,30 @@ class Validator {
5656
$scriptFiles = @(Get-ChildItem -Path (Join-Path $this.ScriptsFolderPath $subModule) -Filter *.ps1 | Where-Object { $_.Name -ne "New-EntraCustomHeaders.ps1" -and $_.Name -ne "New-EntraBetaCustomHeaders.ps1" })
5757
$docFiles = @(Get-ChildItem -Path (Join-Path $this.DocsFolderPath $subModule) -File)
5858
if($scriptFiles.Count -ne $docFiles.Count){
59-
Write-Error "Script submodule folder '$subModule' files count ($($scriptFiles.Count)) does not match docs submodule folder '$subModule' files count ($($docFiles.Count))."
59+
$this.WriteWarning("Script submodule folder '$subModule' files count ($($scriptFiles.Count)) does not match docs submodule folder '$subModule' files count ($($docFiles.Count)).")
6060
}
6161

6262
foreach($scriptFile in $scriptFiles){
6363
if($docFiles.BaseName -notcontains $scriptFile.BaseName){
64-
Write-Error "Script file '$($scriptFile.BaseName)' in subfolder '$subModule' does not have a corresponding doc file."
64+
$this.WriteWarning("Script file '$($scriptFile.BaseName)' in subfolder '$subModule' does not have a corresponding doc file.")
6565
}
6666
}
6767

6868
foreach($docFile in $docFiles){
6969
if($scriptFiles.BaseName -notcontains $docFile.BaseName){
70-
Write-Error "Doc file '$($docFile.BaseName)' in subfolder '$subModule' does not have a corresponding script file."
70+
$this.WriteWarning("Doc file '$($docFile.BaseName)' in subfolder '$subModule' does not have a corresponding script file.")
7171
}
7272
}
7373
}
7474
}
75+
76+
hidden WriteWarning([string] $message) {
77+
#Write-Host "WARNING: $message" -ForegroundColor Yellow
78+
Write-Warning "$message"
79+
}
80+
81+
hidden WriteError([string] $message) {
82+
Write-Host "ERROR: $message" -ForegroundColor Red
83+
throw $message
84+
}
7585
}

0 commit comments

Comments
 (0)