Add mandatory parameter and Linux style folder (#958)

Co-authored-by: Anthony Watherston <Anthony.Watherston@microsoft.com>

Author: anwather

Docs/integrating-with-alz-library.md

@@ -49,16 +49,16 @@ This file contains information that drives the sync process. The file includes m
 
 ```ps1
 # Create a default file for ALZ policies using the latest version of the ALZ Library 
-New-ALZPolicyDefaultStructure -Type ALZ
+New-ALZPolicyDefaultStructure -DefinitionsRootFolder .\Definitions -Type ALZ
 
 # Create a default file for ALZ policies specifiying a tagged version of the ALZ Library 
-New-ALZPolicyDefaultStructure -Type ALZ -Tag "platform/alz/2025.02.0"
+New-ALZPolicyDefaultStructure -DefinitionsRootFolder .\Definitions -Type ALZ -Tag "platform/alz/2025.02.0"
 
 # Create a default file for ALZ policies by provising a path to a cloned/modified library 
-New-ALZPolicyDefaultStructure -Type ALZ -LibraryPath <<path to library>>
+New-ALZPolicyDefaultStructure -DefinitionsRootFolder .\Definitions -Type ALZ -LibraryPath <<path to library>>
 
 # Create a default file for AMBA policies using the latest version of the ALZ Library 
-New-ALZPolicyDefaultStructure -Type AMBA
+New-ALZPolicyDefaultStructure -DefinitionsRootFolder .\Definitions -Type AMBA
 ```
 
 3. The file generated contains a representation of a management group structure, enforcement mode settings and required default parameter values. Update these values to match your environment.
@@ -101,16 +101,16 @@ The next command will generate policy assignments based on the values in this fi
 
 ```ps1
 # Sync the ALZ policies and assign to the "epac-dev" PAC environment.
-Sync-ALZPolicyFromLibrary -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev"
+Sync-ALZPolicyFromLibrary -DefinitionsRootFolder .\Definitions -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev"
 
 # Sync the ALZ policies and assign to the "epac-dev" PAC environment. Specify a tagged version of the ALZ library
-Sync-ALZPolicyFromLibrary -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev" -Tag "platform/alz/2025.02.0"
+Sync-ALZPolicyFromLibrary -DefinitionsRootFolder .\Definitions -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev" -Tag "platform/alz/2025.02.0"
 
 # Sync the ALZ policies from a cloned/modified library
-Sync-ALZPolicyFromLibrary -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev" -LibraryPath <<path to library>>
+Sync-ALZPolicyFromLibrary -DefinitionsRootFolder .\Definitions -Type ALZ -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev" -LibraryPath <<path to library>>
 
 # Sync the AMBA policies and assign to the "epac-dev" PAC environment.
-Sync-ALZPolicyFromLibrary -Type AMBA -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev"
+Sync-ALZPolicyFromLibrary -DefinitionsRootFolder .\Definitions -Type AMBA -DefinitionsRootFolder .\Definitions -PacEnvironmentSelector "epac-dev"
 ```
 
 Carefully review the generated policy assigments and ensure all parameter and scope information is correct.

Scripts/CloudAdoptionFramework/New-ALZPolicyDefaultStructure.ps1

@@ -1,6 +1,6 @@
 Param(
 
-    [Parameter(Mandatory = $false)]
+    [Parameter(Mandatory = $true)]
     [string] $DefinitionsRootFolder,
 
     [ValidateSet('ALZ', 'FSI', 'AMBA', 'SLZ')]
@@ -28,11 +28,11 @@ if ($DefinitionsRootFolder -eq "") {
 if ($LibraryPath -eq "") {
     if ($Tag) {
         git clone --depth 1 --branch $Tag https://github.com/anwather/Azure-Landing-Zones-Library.git .\temp
-        $LibraryPath = ".\temp"
+        $LibraryPath = "./temp"
     }
     else {
         git clone --depth 1 https://github.com/anwather/Azure-Landing-Zones-Library.git .\temp
-        $LibraryPath = ".\temp"
+        $LibraryPath = "./temp"
     }
 }
 
@@ -77,8 +77,8 @@ foreach ($parameter in $policyDefaultFile.defaults) {
 Out-File "$DefinitionsRootFolder\$($Type.ToLower()).policy_default_structure.json" -InputObject ($jsonOutput | ConvertTo-Json -Depth 10) -Encoding utf8 -Force
 
 
-if ($LibraryPath -eq ".\temp") {
-    Remove-Item .\temp -Recurse -Force -ErrorAction SilentlyContinue
+if ($LibraryPath -eq "./temp") {
+    Remove-Item ./temp -Recurse -Force -ErrorAction SilentlyContinue
 }
 
 

Scripts/CloudAdoptionFramework/Sync-ALZPolicyFromLibrary.ps1

@@ -1,6 +1,6 @@
 Param(
 
-    [Parameter(Mandatory = $false)]
+    [Parameter(Mandatory = $true)]
     [string] $DefinitionsRootFolder,
 
     [ValidateSet("ALZ", "AMBA")]
@@ -15,11 +15,11 @@ Param(
 if ($LibraryPath -eq "") {
     if ($Tag) {
         git clone --depth 1 --branch $Tag https://github.com/anwather/Azure-Landing-Zones-Library.git .\temp
-        $LibraryPath = ".\temp"
+        $LibraryPath = "./temp"
     }
     else {
         git clone --depth 1 https://github.com/anwather/Azure-Landing-Zones-Library.git .\temp
-        $LibraryPath = ".\temp"
+        $LibraryPath = "./temp"
     }
 }
 
@@ -142,6 +142,7 @@ foreach ($file in Get-ChildItem -Path "$LibraryPath\platform\$($Type.ToLower())\
 
 
         $baseTemplate = @{
+            "`$schema"      = "https://raw.githubusercontent.com/Azure/enterprise-azure-policy-as-code/main/Schemas/policy-assignment-schema.json"
             nodeName        = "$($archetypeContent.name)/$($fileContent.name)"
             assignment      = @{
                 name        = $fileContent.Name
@@ -235,7 +236,7 @@ foreach ($file in Get-ChildItem -Path "$LibraryPath\platform\$($Type.ToLower())\
         if (!(Test-Path $DefinitionsRootFolder\policyAssignments\$Type\$category)) {
             New-Item -Path $DefinitionsRootFolder\policyAssignments\$Type\$category -ItemType Directory -Force -ErrorAction SilentlyContinue
         }
-        $baseTemplate | Select-Object nodeName, assignment, definitionEntry, definitionVersion, enforcementMode, parameters, nonComplianceMessages, scope | ConvertTo-Json -Depth 50 | Out-File -FilePath $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json -Force
+        $baseTemplate | Select-Object "`$schema", nodeName, assignment, definitionEntry, definitionVersion, enforcementMode, parameters, nonComplianceMessages, scope | ConvertTo-Json -Depth 50 | Out-File -FilePath $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json -Force
         (Get-Content $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json) -replace "\[\[", "[" | Set-Content $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json
         if ($fileContent.name -eq "Deploy-Private-DNS-Zones") {
             (Get-Content $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json) -replace "\.ne\.", ".$dnsZoneRegion." | Set-Content $DefinitionsRootFolder\policyAssignments\$Type\$category\$($fileContent.name).json
@@ -245,7 +246,7 @@ foreach ($file in Get-ChildItem -Path "$LibraryPath\platform\$($Type.ToLower())\
 
 }
 
-if ($LibraryPath -eq ".\temp") {
-    Remove-Item .\temp -Recurse -Force -ErrorAction SilentlyContinue
+if ($LibraryPath -eq "./temp") {
+    Remove-Item ./temp -Recurse -Force -ErrorAction SilentlyContinue
 }