fix to work with PS5 .1 as well as 7

dataplat · Jan 9, 2020 · 0d09c3c · 0d09c3c
1 parent 1a26079
commit 0d09c3c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 1 deletion.
diff --git a/functions/Save-DbcRequiredModules.ps1 b/functions/Save-DbcRequiredModules.ps1
@@ -23,6 +23,7 @@ https://dbachecks.readthedocs.io/en/latest/functions/Save-DbcRequiredModules/
 
 #>
 function Save-DbcRequiredModules {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
     [CmdletBinding()]
     param (
         [Parameter (Mandatory)]

diff --git a/functions/Update-DbcRequiredModules.ps1 b/functions/Update-DbcRequiredModules.ps1
@@ -20,6 +20,7 @@ https://dbachecks.readthedocs.io/en/latest/functions/Update-DbcRequiredModules/
 
 #>
 function Update-DbcRequiredModules {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
     [CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = "Medium")]
     param (
         [switch]$EnableException

diff --git a/internal/assertions/Agent.Assertions.ps1 b/internal/assertions/Agent.Assertions.ps1
@@ -15,6 +15,8 @@ function Assert-JobHistoryRowsDisabled {
 }
 
 function Assert-JobHistoryRows {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
+    [CmdletBinding()]
     param (
         $AgentServer,
         $minimumJobHistoryRows
@@ -32,6 +34,8 @@ function Assert-JobHistoryRowsPerJob {
 
 
 function Assert-LongRunningJobs {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
+    [CmdletBinding()]
     Param($runningjob,$runningjobpercentage)
     [math]::Round($runningjob.Diff/$runningjob.AvgSec * 100) | Should -BeLessThan $runningjobpercentage -Because "The current running job $($runningjob.JobName) has been running for $($runningjob.Diff) seconds longer than the average run time. This is more than the $runningjobpercentage % specified as the maximum"
 }

diff --git a/internal/assertions/Database.Assertions.ps1 b/internal/assertions/Database.Assertions.ps1
@@ -62,6 +62,8 @@ function Assert-DatabaseDuplicateIndex {
 }
 
 function Assert-DatabaseExists {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
+    [CmdletBinding()]
     Param (
         [string]$Instance,
         [string]$ExpectedDB

diff --git a/internal/assertions/Instance.Assertions.ps1 b/internal/assertions/Instance.Assertions.ps1
@@ -551,10 +551,14 @@ function Assert-EngineStartTypeCluster {
 }
 
 function Assert-OleAutomationProcedures {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
+    [CmdletBinding()]
     Param($AllInstanceInfo)
     $AllInstanceInfo.OleAutomationProceduresDisabled.ConfiguredValue | Should -Be 0 -Because "We expect the OLE Automation Procedures to be disabled"
 }
 function Assert-ScanForStartupProcedures {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
+    [CmdletBinding()]
     param ($AllInstanceInfo)
     $AllInstanceInfo.ScanForStartupProceduresDisabled.ConfiguredValue | Should -Be 0 -Because "We expected the scan for startup procedures to be disabled"
 }

diff --git a/internal/functions/Get-CheckInformation.ps1 b/internal/functions/Get-CheckInformation.ps1
@@ -42,7 +42,7 @@ function Get-CheckInformation {
         @($Check).ForEach{
             if($GroupChecks -contains $psitem){
     ## BUT - This falls flat when you use a tag for a number of Checks that is not a group (like CIS) in that case all you get in $CheckInfo is CIS and not the relevant unique tags
-                @(Get-DbcCheck -Pattern $psitem).ForEach{
+                @(Get-DbcCheck -Tag $psitem).ForEach{
                     $CheckInfo += $psitem.UniqueTag
                 }
             }

diff --git a/tests/build/Install-VstsAgentOnWindowsServerCoreContainer.ps1 b/tests/build/Install-VstsAgentOnWindowsServerCoreContainer.ps1
@@ -66,6 +66,7 @@
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "")]
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidTrailingWhiteSpace", "")]
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseDeclaredVarsMoreThanAssignments", "")]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "")]
 [CmdletBinding()]
 param (