Skip to content

Commit f92aaa5

Browse files
committed
Merge branch 'main' into dev
2 parents 7df6cc0 + f3afeee commit f92aaa5

37 files changed

Lines changed: 62 additions & 26 deletions

src/powershell/private/tests/Invoke-ZtTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
# Filter based on Compatible licenses
109109
$skippedTestsForLicense = $testsToRun.Where{$_.CompatibleLicense.Count -gt 0 -and (-not (Test-ZtLicense -CompatibleLicense $_.CompatibleLicense)) }
110110
$skippedTestsForLicense.ForEach{
111-
Write-Warning -Message ('Test {0} is skipped because no compatible license was found' -f $_.TestId)
111+
Write-PSFMessage -Message ('Test {0} is skipped because no compatible license was found' -f $_.TestId) -Level Verbose
112112
Add-ZtTestResultDetail -SkippedBecause NoCompatibleLicenseFound -TestId $_.TestId
113113
}
114114

src/powershell/tests/Test-Assessment.25371.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Validates that Universal Continuous Access Evaluation (Universal CAE) is enabled for network access.
44
@@ -23,6 +23,7 @@ function Test-Assessment-25371 {
2323
Category = 'Global Secure Access',
2424
ImplementationCost = 'Low',
2525
MinimumLicense = ('AAD_PREMIUM'),
26+
CompatibleLicense = ('Entra_Premium_Private_Access','Entra_Premium_Internet_Access'),
2627
Pillar = 'Network',
2728
RiskLevel = 'High',
2829
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25372.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Validates that Global Secure Access client is deployed on all managed endpoints.
44
@@ -18,6 +18,7 @@ function Test-Assessment-25372 {
1818
Category = 'Global Secure Access',
1919
ImplementationCost = 'Medium',
2020
MinimumLicense = ('AAD_PREMIUM', 'Entra_Premium_Internet_Access', 'Entra_Premium_Private_Access'),
21+
CompatibleLicense = ('Entra_Premium_Private_Access','Entra_Premium_Internet_Access'),
2122
Pillar = 'Network',
2223
RiskLevel = 'High',
2324
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25375.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Validates that GSA licenses are available in the tenant and assigned to users.
44
@@ -25,6 +25,7 @@ function Test-Assessment-25375 {
2525
Category = 'Global Secure Access',
2626
ImplementationCost = 'Low',
2727
MinimumLicense = ('Entra_Premium_Internet_Access','Entra_Premium_Private_Access'),
28+
CompatibleLicense = ('Entra_Premium_Internet_Access','Entra_Premium_Private_Access'),
2829
Pillar = 'Network',
2930
RiskLevel = 'High',
3031
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25376.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ function Test-Assessment-25376 {
1717
Category = 'Network security',
1818
ImplementationCost = 'Medium',
1919
MinimumLicense = 'Entra_Suite',
20+
CompatibleLicense = ('Entra_Premium_Private_Access','Entra_Premium_Internet_Access'),
2021
Pillar = 'Network',
2122
RiskLevel = 'High',
2223
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25377.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Validates that Universal Tenant Restrictions (UTR) are configured to block access to unauthorized external tenants.
44
@@ -18,6 +18,7 @@ function Test-Assessment-25377 {
1818
Category = 'Global Secure Access',
1919
ImplementationCost = 'Medium',
2020
MinimumLicense = ('AAD_PREMIUM','Entra_Premium_Internet_Access'),
21+
CompatibleLicense = ('Entra_Premium_Internet_Access'),
2122
Pillar = 'Network',
2223
RiskLevel = 'High',
2324
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25378.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ function Test-Assessment-25378 {
1717
Category = 'External Identities',
1818
ImplementationCost = 'Medium',
1919
MinimumLicense = 'AAD_PREMIUM',
20+
CompatibleLicense = ('AAD_PREMIUM','AAD_PREMIUM_P2'),
2021
Pillar = 'Network',
2122
RiskLevel = 'High',
2223
SfiPillar = 'Protect identities and secrets',

src/powershell/tests/Test-Assessment.25379.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Checks that compliant network controls are configured in Conditional Access policies
44
@@ -17,6 +17,7 @@ function Test-Assessment-25379 {
1717
Category = 'Global Secure Access',
1818
ImplementationCost = 'Medium',
1919
MinimumLicense = ('AAD_PREMIUM'),
20+
CompatibleLicense = ('AAD_PREMIUM','AAD_PREMIUM_P2'),
2021
Pillar = 'Network',
2122
RiskLevel = 'Medium',
2223
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25381.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#
1+
<#
22
.SYNOPSIS
33
Validates that traffic forwarding profiles are enabled in Global Secure Access.
44
@@ -18,6 +18,7 @@ function Test-Assessment-25381 {
1818
Category = 'Global Secure Access',
1919
ImplementationCost = 'Medium',
2020
MinimumLicense = ('Entra_Suite','Entra_Premium_Private_Access','Entra_Premium_Internet_Access','P2'),
21+
CompatibleLicense = ('Entra_Premium_Private_Access','Entra_Premium_Internet_Access'),
2122
Pillar = 'Network',
2223
RiskLevel = 'High',
2324
SfiPillar = 'Protect networks',

src/powershell/tests/Test-Assessment.25382.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function Test-Assessment-25382 {
1818
Category = 'Global Secure Access',
1919
ImplementationCost = 'Low',
2020
MinimumLicense = ('Entra_Premium_Private_Access', 'Entra_Premium_Internet_Access'),
21+
CompatibleLicense = ('Entra_Premium_Internet_Access','Entra_Premium_Private_Access'),
2122
Pillar = 'Network',
2223
RiskLevel = 'High',
2324
SfiPillar = 'Protect networks',

0 commit comments

Comments
 (0)