Dedupe $ProductNames

PowerShell/ScubaGear/Modules/Orchestrator.psm1

@@ -258,7 +258,7 @@ function Invoke-SCuBA {
         if ($PSCmdlet.ParameterSetName -eq 'Report'){
 
             $ProvidedParameters = @{
-                'ProductNames' = $ProductNames | Sort-Object
+                'ProductNames' = $ProductNames | Sort-Object -Unique
                 'M365Environment' = $M365Environment
                 'OPAPath' = $OPAPath
                 'LogIn' = $LogIn
@@ -1536,7 +1536,7 @@ function Invoke-RunCached {
                 New-Item -ItemType "Directory" -Path $OutPath | Out-Null
             }
             $OutFolderPath = $OutPath
-            $ProductNames = $ProductNames | Sort-Object
+            $ProductNames = $ProductNames | Sort-Object -Unique
 
             Remove-Resources
             Import-Resources # Imports Providers, RunRego, CreateReport, Connection

PowerShell/ScubaGear/Modules/ScubaConfig/ScubaConfig.psm1

@@ -79,7 +79,7 @@ class ScubaConfig {
             }
             else{
                 Write-Debug "ProductNames provided - using as is."
-                $this.Configuration.ProductNames = $this.Configuration.ProductNames | Sort-Object
+                $this.Configuration.ProductNames = $this.Configuration.ProductNames | Sort-Object -Unique
             }
         }
 

PowerShell/ScubaGear/Testing/Unit/PowerShell/Orchestrator/Invoke-Scuba.Tests.ps1

@@ -83,6 +83,10 @@ InModuleScope Orchestrator {
                 }
                 {Invoke-Scuba @SplatParams} | Should -Not -Throw
             }
+            It 'Should only run each baseline once if provider names contains duplicates' {
+                {Invoke-Scuba -ProductNames aad,aad} | Should -Not -Throw
+                Should -Invoke Invoke-ReportCreation -ParameterFilter {$ProductNames -eq 'aad'}
+            }
         }
         Context 'Service Principal provided'{
             It 'All items given as not null or empty'{
@@ -116,4 +120,4 @@ InModuleScope Orchestrator {
 }
 AfterAll {
     Remove-Module Orchestrator -ErrorAction SilentlyContinue
-}
+}

PowerShell/ScubaGear/Testing/Unit/PowerShell/ScubaConfig/ScubaConfigJsonDuplicateProviderTests.ps1

@@ -0,0 +1,20 @@
+using module '..\..\..\..\Modules\ScubaConfig\ScubaConfig.psm1'
+
+InModuleScope ScubaConfig {
+    Describe -tag "Utils" -name 'ScubaConfigJson' {
+        context 'JSON Configuration' {
+            BeforeEach{
+                [ScubaConfig]::ResetInstance()
+                $Config = [ScubaConfig]::GetInstance()
+                $Config.Configuration.ProductNames = @('aad', 'aad')
+            }
+            It 'Should not contain duplicate product names'{
+                $Config.Configuration.ProductNames | Should -BeExactly @('aad')
+            }
+	    AfterAll {
+              [ScubaConfig]::ResetInstance()
+            }
+        }
+    }
+}
+