Merge pull request #1817 from microsoft/dpaul-EpUpdate

Moved Get-ExtendedProtectionConfiguration to shared folder
microsoft · Aug 23, 2023 · bf4ddaa · bf4ddaa
2 parents 969e92f + 0305dd5
commit bf4ddaa
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 23 deletions.
diff --git a/Diagnostics/HealthChecker/DataCollection/ExchangeInformation/Get-ExchangeInformation.ps1 b/Diagnostics/HealthChecker/DataCollection/ExchangeInformation/Get-ExchangeInformation.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-. $PSScriptRoot\..\..\..\..\Security\src\ExchangeExtendedProtectionManagement\DataCollection\Get-ExtendedProtectionConfiguration.ps1
+. $PSScriptRoot\..\..\..\..\Shared\Get-ExtendedProtectionConfiguration.ps1
 . $PSScriptRoot\..\..\..\..\Shared\ErrorMonitorFunctions.ps1
 . $PSScriptRoot\..\..\..\..\Shared\Get-ExchangeBuildVersionInformation.ps1
 . $PSScriptRoot\..\..\..\..\Shared\Get-ExchangeSettingOverride.ps1

diff --git a/...geExtendedProtectionManagement/ConfigurationAction/Invoke-ConfigureExtendedProtection.ps1 b/...geExtendedProtectionManagement/ConfigurationAction/Invoke-ConfigureExtendedProtection.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-. $PSScriptRoot\..\DataCollection\Get-ExtendedProtectionConfiguration.ps1
+. $PSScriptRoot\..\..\..\..\Shared\Get-ExtendedProtectionConfiguration.ps1
 . $PSScriptRoot\..\..\..\..\Shared\Invoke-ScriptBlockHandler.ps1
 . $PSScriptRoot\..\..\..\..\Shared\Write-ErrorInformation.ps1
 

diff --git a/...eExtendedProtectionManagement/DataCollection/Get-ExtendedProtectionPrerequisitesCheck.ps1 b/...eExtendedProtectionManagement/DataCollection/Get-ExtendedProtectionPrerequisitesCheck.ps1
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 . $PSScriptRoot\..\..\..\..\Shared\TLS\Get-AllTlsSettings.ps1
-. $PSScriptRoot\Get-ExtendedProtectionConfiguration.ps1
+. $PSScriptRoot\..\..\..\..\Shared\Get-ExtendedProtectionConfiguration.ps1
 
 # This function is used to collect the required information needed to determine if a server is ready for Extended Protection
 function Get-ExtendedProtectionPrerequisitesCheck {

diff --git a/...n/Get-ExtendedProtectionConfiguration.ps1 → ...d/Get-ExtendedProtectionConfiguration.ps1 b/...n/Get-ExtendedProtectionConfiguration.ps1 → ...d/Get-ExtendedProtectionConfiguration.ps1
@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-. $PSScriptRoot\..\..\..\..\Shared\Invoke-CatchActionError.ps1
-. $PSScriptRoot\..\..\..\..\Shared\Invoke-ScriptBlockHandler.ps1
-. $PSScriptRoot\..\..\..\..\Shared\Write-ErrorInformation.ps1
+. $PSScriptRoot\Invoke-CatchActionError.ps1
+. $PSScriptRoot\Invoke-ScriptBlockHandler.ps1
+. $PSScriptRoot\Write-ErrorInformation.ps1
 
 function Get-ExtendedProtectionConfiguration {
     [CmdletBinding()]

diff --git a/...15_Configured_Both_ApplicationHost.config → ...15_Configured_Both_ApplicationHost.config b/...15_Configured_Both_ApplicationHost.config → ...15_Configured_Both_ApplicationHost.config
diff --git a/...E15_Configured_Cas_ApplicationHost.config → ...E15_Configured_Cas_ApplicationHost.config b/...E15_Configured_Cas_ApplicationHost.config → ...E15_Configured_Cas_ApplicationHost.config
diff --git a/...E15_Configured_Mbx_ApplicationHost.config → ...E15_Configured_Mbx_ApplicationHost.config b/...E15_Configured_Mbx_ApplicationHost.config → ...E15_Configured_Mbx_ApplicationHost.config
diff --git a/...NotConfigured_Both_ApplicationHost.config → ...NotConfigured_Both_ApplicationHost.config b/...NotConfigured_Both_ApplicationHost.config → ...NotConfigured_Both_ApplicationHost.config
diff --git a/..._NotConfigured_Cas_ApplicationHost.config → ..._NotConfigured_Cas_ApplicationHost.config b/..._NotConfigured_Cas_ApplicationHost.config → ..._NotConfigured_Cas_ApplicationHost.config
diff --git a/..._NotConfigured_Mbx_ApplicationHost.config → ..._NotConfigured_Mbx_ApplicationHost.config b/..._NotConfigured_Mbx_ApplicationHost.config → ..._NotConfigured_Mbx_ApplicationHost.config
diff --git a/...ata/E16_Configured_ApplicationHost.config → ...ata/E16_Configured_ApplicationHost.config b/...ata/E16_Configured_ApplicationHost.config → ...ata/E16_Configured_ApplicationHost.config
diff --git a/...onfigured_IPFilter_ApplicationHost.config → ...onfigured_IPFilter_ApplicationHost.config b/...onfigured_IPFilter_ApplicationHost.config → ...onfigured_IPFilter_ApplicationHost.config
diff --git a/.../E16_NotConfigured_ApplicationHost.config → .../E16_NotConfigured_ApplicationHost.config b/.../E16_NotConfigured_ApplicationHost.config → .../E16_NotConfigured_ApplicationHost.config
diff --git a/...ata/E19_Configured_ApplicationHost.config → ...ata/E19_Configured_ApplicationHost.config b/...ata/E19_Configured_ApplicationHost.config → ...ata/E19_Configured_ApplicationHost.config
diff --git a/...onfigured_IPFilter_ApplicationHost.config → ...onfigured_IPFilter_ApplicationHost.config b/...onfigured_IPFilter_ApplicationHost.config → ...onfigured_IPFilter_ApplicationHost.config
diff --git a/.../E19_MisConfigured_ApplicationHost.config → .../E19_MisConfigured_ApplicationHost.config b/.../E19_MisConfigured_ApplicationHost.config → .../E19_MisConfigured_ApplicationHost.config
diff --git a/.../E19_NotConfigured_ApplicationHost.config → .../E19_NotConfigured_ApplicationHost.config b/.../E19_NotConfigured_ApplicationHost.config → .../E19_NotConfigured_ApplicationHost.config
diff --git a/...tAllTlsSettings-AllTlsSettingsDefault.xml → ...tAllTlsSettings-AllTlsSettingsDefault.xml b/...tAllTlsSettings-AllTlsSettingsDefault.xml → ...tAllTlsSettings-AllTlsSettingsDefault.xml
diff --git a/...Settings-SchUseStrongCryptoConfigured.xml → ...Settings-SchUseStrongCryptoConfigured.xml b/...Settings-SchUseStrongCryptoConfigured.xml → ...Settings-SchUseStrongCryptoConfigured.xml
diff --git a/...lTlsSettings-TlsSettingsMisconfigured.xml → ...lTlsSettings-TlsSettingsMisconfigured.xml b/...lTlsSettings-TlsSettingsMisconfigured.xml → ...lTlsSettings-TlsSettingsMisconfigured.xml
diff --git a/.../DataCollection/Tests/Data/GetCommand.xml → ...ts/ExtendedProtection/Data/GetCommand.xml b/.../DataCollection/Tests/Data/GetCommand.xml → ...ts/ExtendedProtection/Data/GetCommand.xml
diff --git a/...ExtendedProtectionConfiguration.Tests.ps1 → ...ExtendedProtectionConfiguration.Tests.ps1 b/...ExtendedProtectionConfiguration.Tests.ps1 → ...ExtendedProtectionConfiguration.Tests.ps1
@@ -7,7 +7,7 @@ param()
 BeforeAll {
     $Script:parentPath = (Split-Path -Parent $PSScriptRoot)
     $Script:Server = $env:COMPUTERNAME
-    . $Script:parentPath\Get-ExtendedProtectionConfiguration.ps1
+    . $Script:parentPath\..\Get-ExtendedProtectionConfiguration.ps1
 
     function Invoke-CatchActions {
         param()
@@ -110,28 +110,28 @@ BeforeAll {
         }
     }
 
-    $Script:E15_NotConfigured_Both_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_NotConfigured_Both_ApplicationHost.config
-    $Script:E15_NotConfigured_Cas_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_NotConfigured_Cas_ApplicationHost.config
-    $Script:E15_NotConfigured_Mbx_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_NotConfigured_Mbx_ApplicationHost.config
-    $Script:E16_NotConfigured_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E16_NotConfigured_ApplicationHost.config
-    $Script:E19_NotConfigured_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E19_NotConfigured_ApplicationHost.config
-
-    $Script:E15_Configured_Both_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_Configured_Both_ApplicationHost.config
-    $Script:E15_Configured_Cas_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_Configured_Cas_ApplicationHost.config
-    $Script:E15_Configured_Mbx_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E15_Configured_Mbx_ApplicationHost.config
-    $Script:E16_Configured_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E16_Configured_ApplicationHost.config
-    $Script:E16_Configured_IPFilter_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E16_Configured_IPFilter_ApplicationHost.config
-    $Script:E19_Configured_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E19_Configured_ApplicationHost.config
-    $Script:E19_Configured_IPFilter_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E19_Configured_IPFilter_ApplicationHost.config
-
-    $Script:E19_MisConfigured_ApplicationHost = LoadApplicationHostConfig -Path $Script:parentPath\Tests\Data\E19_MisConfigured_ApplicationHost.config
+    $Script:E15_NotConfigured_Both_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_NotConfigured_Both_ApplicationHost.config
+    $Script:E15_NotConfigured_Cas_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_NotConfigured_Cas_ApplicationHost.config
+    $Script:E15_NotConfigured_Mbx_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_NotConfigured_Mbx_ApplicationHost.config
+    $Script:E16_NotConfigured_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E16_NotConfigured_ApplicationHost.config
+    $Script:E19_NotConfigured_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E19_NotConfigured_ApplicationHost.config
+
+    $Script:E15_Configured_Both_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_Configured_Both_ApplicationHost.config
+    $Script:E15_Configured_Cas_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_Configured_Cas_ApplicationHost.config
+    $Script:E15_Configured_Mbx_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E15_Configured_Mbx_ApplicationHost.config
+    $Script:E16_Configured_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E16_Configured_ApplicationHost.config
+    $Script:E16_Configured_IPFilter_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E16_Configured_IPFilter_ApplicationHost.config
+    $Script:E19_Configured_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E19_Configured_ApplicationHost.config
+    $Script:E19_Configured_IPFilter_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E19_Configured_IPFilter_ApplicationHost.config
+
+    $Script:E19_MisConfigured_ApplicationHost = LoadApplicationHostConfig -Path $PSScriptRoot\Data\E19_MisConfigured_ApplicationHost.config
 }
 
 Describe "Testing Get-ExtendedProtectionConfiguration.ps1" {
 
     Context "No ExSetupVersion Passed To The Function" {
         BeforeAll {
-            Mock Get-Command { return Import-Clixml -Path $Script:parentPath\Tests\Data\GetCommand.xml }
+            Mock Get-Command { return Import-Clixml -Path $PSScriptRoot\Data\GetCommand.xml }
 
             $mockParams = @{
                 ComputerName          = $Server