Skip to content

Commit 2506d4a

Browse files
ashwinikarkeashwinikarke
committed
added code
2 parents 0b26428 + ee8c8a8 commit 2506d4a

19 files changed

+1123
-577
lines changed

‎build/powershell/Resolve-PSDependencies.ps1‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
param (
2+
[Parameter()]
3+
[string]
4+
$ModuleManifestPath = '{0}\..\src\powershell\ZeroTrustAssessment.psd1' -f (Split-Path -Parent $PSScriptRoot).TrimEnd([io.path]::DirectorySeparatorChar),
5+
6+
[Parameter()]
7+
[string]
8+
$OutputPath = '{0}\..\output\RequiredModules' -f (Split-Path -Parent $PSScriptRoot).TrimEnd([io.path]::DirectorySeparatorChar),
9+
10+
[Parameter()]
11+
[switch]
12+
$DoNotUpdatePSModulePath,
13+
14+
[Parameter()]
15+
[switch]
16+
$SkipModuleInstallation,
17+
18+
[Parameter()]
19+
[switch]
20+
$AllowPrerelease
21+
)
22+
23+
if (-not (Test-Path -Path $OutputPath -PathType Container))
24+
{
25+
Write-Verbose -Message "Output path not found: $OutputPath"
26+
$OutputPath = (New-Item -Path $OutputPath -ItemType Directory -Force -ErrorAction Stop).FullName
27+
Write-Verbose -Message "Created output directory: $OutputPath"
28+
}
29+
else
30+
{
31+
$OutputPath = (Get-Item -Path $OutputPath -ErrorAction Stop).FullName
32+
Write-Verbose -Message "Output path already exists: $OutputPath"
33+
}
34+
35+
if (-not $DoNotUpdatePSModulePath.IsPresent)
36+
{
37+
Write-Information -MessageData "Updating PSModulePath to include $OutputPath..."
38+
$modulePath = $env:PSModulePath.Split([System.IO.Path]::PathSeparator).ForEach{$_.TrimEnd([io.path]::DirectorySeparatorChar)}
39+
if ($OutputPath.TrimEnd([io.path]::DirectorySeparatorChar) -notin $modulePath)
40+
{
41+
Write-Verbose -Message "Adding $OutputPath to PSModulePath."
42+
$env:PSModulePath = (@($OutputPath) + $modulePath) -join [System.IO.Path]::PathSeparator
43+
Write-Verbose -Message "Updated PSModulePath to:`r`n$env:PSModulePath"
44+
}
45+
else
46+
{
47+
Write-Information -MessageData "PSModulePath already contains $OutputPath. No update needed."
48+
}
49+
}
50+
51+
if (-not $SkipModuleInstallation.IsPresent)
52+
{
53+
Write-Verbose -Message "Installing required modules to $OutputPath..."
54+
$moduleManifest = Import-PowerShellDataFile -Path $ModuleManifestPath -ErrorAction Stop
55+
[Microsoft.PowerShell.Commands.ModuleSpecification[]]$requiredModules = $moduleManifest.RequiredModules
56+
[Microsoft.PowerShell.Commands.ModuleSpecification[]]$externalModuleDependencies = $moduleManifest.PrivateData.ExternalModuleDependencies
57+
# [Microsoft.PowerShell.Commands.ModuleSpecification[]]$windowsPowerShellRequiredModules = $moduleManifest.PrivateData.WindowsPowerShellRequiredModules
58+
59+
$requiredModuleToSave = $requiredModules.Where{$_.Name -notin $externalModuleDependencies.Name}
60+
# $requiredModuleToSave += $windowsPowerShellRequiredModules.Where{ $_.Name -notin $requiredModules.Name -and $_.Name -notin $externalModuleDependencies.Name }
61+
62+
if (-not $SkipModuleInstallation.IsPresent)
63+
{
64+
Write-Host -Object "`r`n"
65+
Write-Host -Object 'Resolving dependencies...' -ForegroundColor Green
66+
67+
$saveModuleCmdParams = @{
68+
Path = $OutputPath
69+
}
70+
71+
if ($saveModuleCmd = (Get-Command -Name Save-PSResource -ErrorAction Ignore))
72+
{
73+
$saveModuleCmdParams.Add('TrustRepository', $true)
74+
$saveModuleCmdParams.Add('Prerelease', $AllowPrerelease.IsPresent)
75+
Write-Verbose -Message "Saving required modules using Save-PSResource..."
76+
}
77+
elseif ($saveModuleCmd = (Get-Command -Name Save-Module -ErrorAction Ignore))
78+
{
79+
$saveModuleCmdParams.Add('Force', $true)
80+
$saveModuleCmdParams.Add('AllowPrerelease', $AllowPrerelease.IsPresent)
81+
Write-Verbose -Message "Saving required modules using Save-Module..."
82+
}
83+
else
84+
{
85+
Write-Error -Message 'Neither Save-PSResource nor Save-Module is available. Please install the PowerShellGet module to save required modules.'
86+
return
87+
}
88+
89+
foreach ($moduleSpec in $requiredModuleToSave)
90+
{
91+
Write-Verbose -Message ("Saving module {0} with version {1}..." -f $moduleSpec.Name, $moduleSpec.Version)
92+
$saveModuleCmdParamsClone = $saveModuleCmdParams.Clone()
93+
$isModulePresent = Get-Module -Name $moduleSpec.Name -ListAvailable -ErrorAction Ignore | Where-Object {
94+
$isValid = $true
95+
if ($moduleSpec.Guid)
96+
{
97+
$isValid = $_.Guid -eq $moduleSpec.Guid
98+
}
99+
100+
if ($moduleSpec.Version)
101+
{
102+
$isValid = $isValid -and $_.Version -ge [Version]$moduleSpec.Version
103+
}
104+
elseif ($moduleSpec.RequiredVersion)
105+
{
106+
$isValid = $isValid -and $_.Version -eq [Version]$moduleSpec.RequiredVersion
107+
}
108+
109+
$isValid
110+
}
111+
112+
if ($isModulePresent)
113+
{
114+
Write-Host -Object (' ✅ Module {0} found (v{1}).' -f $moduleSpec.Name,$isModulePresent[0].Version) -ForegroundColor Green
115+
continue
116+
}
117+
118+
try
119+
{
120+
$saveModuleCmdParamsClone['Name'] = $moduleSpec.Name
121+
if ($moduleSpec.Version -and $saveModuleCmd.Name -eq 'Save-Module')
122+
{
123+
$saveModuleCmdParamsClone['MinimumVersion'] = $moduleSpec.Version
124+
}
125+
elseif ($moduleSpec.Version -and $saveModuleCmd.Name -eq 'Save-PSResource')
126+
{
127+
$saveModuleCmdParamsClone['Version'] = '[{0}, ]' -f $moduleSpec.Version
128+
}
129+
130+
& $saveModuleCmd @saveModuleCmdParamsClone
131+
Write-Host -Object (' ⬇️ Module {0} saved successfully.' -f $moduleSpec.Name) -ForegroundColor Green
132+
}
133+
catch
134+
{
135+
Write-Host -Object (' ❌ Failed to save module {0}: {1}' -f $moduleSpec.Name, $_) -ForegroundColor Red
136+
}
137+
}
138+
}
139+
140+
}
141+
else
142+
{
143+
Write-Verbose -Message "Skipping module installation as per parameter. Required modules will not be saved to $OutputPath."
144+
return
145+
}

‎build/powershell/Set-Version.ps1‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,21 @@ if ( -not (Test-Path $ManifestPath )) {
4242

4343
$previewLabel = if ($preview) { '-preview' } else { '' }
4444

45+
# Save original manifest content before Update-ModuleManifest corrupts
46+
# custom PrivateData keys containing hashtable arrays (it serializes them as type name strings).
47+
$originalManifestContent = Get-Content $ManifestPath -Raw
48+
4549
Update-ModuleManifest -Path $ManifestPath -ModuleVersion $NewVersion -FunctionsToExport $FunctionNames -Prerelease $previewLabel
50+
51+
# Restore WindowsPowerShellRequiredModules that Update-ModuleManifest corrupted
52+
if ($originalManifestContent -match '(?s)(WindowsPowerShellRequiredModules\s*=\s*@\([^)]*\))') {
53+
$originalBlock = $Matches[1]
54+
$updatedContent = Get-Content $ManifestPath -Raw
55+
if ($updatedContent -match '(?s)(WindowsPowerShellRequiredModules\s*=\s*@\([^)]*\))') {
56+
$updatedContent = $updatedContent.Replace($Matches[1], $originalBlock)
57+
Set-Content $ManifestPath -Value $updatedContent -NoNewline
58+
}
59+
}
4660
}
4761

4862
$NewVersion += $previewLabel

‎build/powershell/Update-PSModuleManifest.ps1‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,19 @@ foreach ($Module in $ModuleManifest['RequiredModules']) {
7575
}
7676
}
7777

78+
## Save original manifest content before Update-ModuleManifest corrupts
79+
## custom PrivateData keys containing hashtable arrays (it serializes them as type name strings).
80+
$originalManifestContent = Get-Content $ModuleManifestFileInfo.FullName -Raw
81+
7882
## Update Module Manifest in Module Output Directory
7983
Update-ModuleManifest -Path $ModuleManifestFileInfo.FullName -ErrorAction Stop @paramUpdateModuleManifest
84+
85+
## Restore WindowsPowerShellRequiredModules that Update-ModuleManifest corrupted
86+
if ($originalManifestContent -match '(?s)(WindowsPowerShellRequiredModules\s*=\s*@\([^)]*\))') {
87+
$originalBlock = $Matches[1]
88+
$updatedContent = Get-Content $ModuleManifestFileInfo.FullName -Raw
89+
if ($updatedContent -match '(?s)(WindowsPowerShellRequiredModules\s*=\s*@\([^)]*\))') {
90+
$updatedContent = $updatedContent.Replace($Matches[1], $originalBlock)
91+
Set-Content $ModuleManifestFileInfo.FullName -Value $updatedContent -NoNewline
92+
}
93+
}

‎code-tests/test-assessments/Test-Assessment.35004.Tests.ps1‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ Describe "Test-Assessment-35004" {
107107
Name = "Global Policy"
108108
Enabled = $true
109109
Labels = @("Label1", "Label2")
110-
ExchangeLocation = @("All")
110+
ExchangeLocation = @(
111+
[PSCustomObject]@{ Name = "All" }
112+
)
111113
ModernGroupLocation = @()
112114
SharePointLocation = @()
113115
OneDriveLocation = @()
@@ -135,8 +137,13 @@ Describe "Test-Assessment-35004" {
135137
Name = "Specific Policy"
136138
Enabled = $true
137139
Labels = @("Label1")
138-
ExchangeLocation = @("user1@contoso.com", "user2@contoso.com")
139-
ModernGroupLocation = @("group1@contoso.com")
140+
ExchangeLocation = @(
141+
[PSCustomObject]@{ Name = "user1@contoso.com" },
142+
[PSCustomObject]@{ Name = "user2@contoso.com" }
143+
)
144+
ModernGroupLocation = @(
145+
[PSCustomObject]@{ Name = "group1@contoso.com" }
146+
)
140147
SharePointLocation = @()
141148
OneDriveLocation = @()
142149
}

0 commit comments

Comments
 (0)