Merge branch 'main' into main

Azure · Aug 13, 2024 · 85621e0 · 85621e0
2 parents e85e322 + cbbf394
commit 85621e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/actions-pester/Test-ModifiedPolicies.Tests.ps1 b/.github/actions-pester/Test-ModifiedPolicies.Tests.ps1
@@ -109,6 +109,21 @@ Describe 'UnitTest-ModifiedPolicies' {
             }
         }
 
+        It "Check policy metadata name matches policy filename" {
+            $ModifiedAddedFiles | ForEach-Object {
+                $PolicyJson = Get-Content -Path $_ -Raw | ConvertFrom-Json
+                $PolicyFile = Split-Path $_ -Leaf
+                $PolicyMetadataName = $PolicyJson.name
+                $PolicyFileNoExt = [System.IO.Path]::GetFileNameWithoutExtension($PolicyFile)
+                if ($PolicyFileNoExt.Contains("AzureChinaCloud") -or $PolicyFileNoExt.Contains("AzureUSGovernment"))
+                {
+                    $PolicyFileNoExt = $PolicyFileNoExt.Substring(0, $PolicyFileNoExt.IndexOf("."))
+                }
+                Write-Warning "$($PolicyFileNoExt) - This is the policy metadata name: $($PolicyMetadataName)"
+                $PolicyMetadataName | Should -Be $PolicyFileNoExt
+            }
+        }
+
         }
 
         Context "Validate policy parameters" {

diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json
@@ -6298,7 +6298,7 @@
                         {
                             "name": "enableWsKeyVaultSupInitiatives",
                             "type": "Microsoft.Common.OptionsGroup",
-                            "label": "Key Vault - Supplementry",
+                            "label": "Key Vault - Supplementary",
                             "defaultValue": "No",
                             "visible": true,
                             "toolTip": "If 'Yes' is selected you will have the option to selected additional policy initiatives for regulated industries. Check initiative <a href=\"https://www.azadvertizer.net/azpolicyinitiativesadvertizer/Enforce-Guardrails-KeyVault-Sup.html\">here</a>.",
@@ -6318,7 +6318,7 @@
                         {
                             "name": "wsKeyVaultSupSelectorMG",
                             "type": "Microsoft.Common.DropDown",
-                            "label": "Select Management Group scopes to assign the Key Vault - Supplementry initiative to:",
+                            "label": "Select Management Group scopes to assign the Key Vault - Supplementary initiative to:",
                             "toolTip": "",
                             "multiselect": true,
                             "selectAll": false,