WIP: DSC v3 resource for PSResourceGet #1852
Conversation
adityapatwardhan
requested review from
anamnavi,
alerickson and
SydneyhSmith
as code owners
adityapatwardhan
changed the title
SteveL-MSFT
requested review from
mgreenegit,
theJasonHelmick and
michaeltlombardi
| Add-Type -AssemblyName "$PSScriptRoot/dependencies/NuGet.Versioning.dll" | ||
|
|
||
| foreach ($resource in $allPSResources) { | ||
| foreach ($inputResource in $inputObj.resources) { | ||
| if ($resource.Name -eq $inputResource.Name) { | ||
| if ($inputResource.Version) { | ||
| # Use the NuGet.Versioning package if available, otherwise do a simple comparison | ||
| try { | ||
| $versionRange = [NuGet.Versioning.VersionRange]::Parse($inputResource.Version) | ||
| $resourceVersion = [NuGet.Versioning.NuGetVersion]::Parse($resource.Version.ToString()) | ||
| if ($versionRange.Satisfies($resourceVersion)) { | ||
| $resourcesExist += $resource | ||
| } | ||
| } | ||
| catch { | ||
| # Fallback: simple string comparison (not full NuGet range support) | ||
| if ($resource.Version.ToString() -eq $inputResource.Version) { | ||
| $resourcesExist += $resource | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This code seems very similar across different operations, can it be a helper function?
There was a problem hiding this comment.
There are subtle differences, but I will see if I can refactor
| if ($inputObj.Name) { | ||
| $splatt['Name'] = $inputObj.Name | ||
| } | ||
|
|
||
| if ($inputObj.Uri) { | ||
| $splatt['Uri'] = $inputObj.Uri | ||
| } | ||
|
|
||
| if ($inputObj.Trusted) { | ||
| $splatt['Trusted'] = $inputObj.Trusted | ||
| } | ||
|
|
||
| if ($null -ne $inputObj.Priority ) { | ||
| $splatt['Priority'] = $inputObj.Priority | ||
| } |
There was a problem hiding this comment.
Can this just be a loop like:
$properties = @('Name', 'Uri', 'Trusted', 'Priority')
for ($property in $properties) {
if ($null -ne $inputObject.$property) {
$splatt[$property] = $inputObject.$property
}
}| [string]$ResourceType | ||
| ) | ||
|
|
||
| $inputObj = $stdinput | ConvertFrom-Json -ErrorAction Stop |
There was a problem hiding this comment.
I would probably recommend defining a class for both the various input types and a function to handle both converting the input into the appropriate type and validating the input.
Right now reading $inputObj.<property> and trying to keep track is very difficult, plus we lose the IntelliSense/etc we would get from stronger typing.
| # catch any un-caught exception and write it to the error stream | ||
| trap { | ||
| Write-Trace -Level Error -message $_.Exception.Message | ||
| exit 1 |
There was a problem hiding this comment.
Future enhancement - specific exit codes for specific issues/exceptions.
|
Is the plan to add a discover extension in DSC to be able to find these resource manifests? If so, is there an issue/pr for that? |
| "type": "Microsoft.PowerShell.PSResourceGet/PSResources", | ||
| "version": "0.0.1", | ||
| "get": { | ||
| "executable": "pwsh", |
There was a problem hiding this comment.
How is Windows PowerShell handled? PSResourceGet supports both. For PSScript DSC v3 resource there are actually two different resources to account for different versions of PowerShell.
| "type": "Microsoft.PowerShell.PSResourceGet/Repository", | ||
| "version": "0.0.1", | ||
| "get": { | ||
| "executable": "pwsh", |
There was a problem hiding this comment.
How is Windows PowerShell handled? PSResourceGet supports both. For PSScript DSC v3 resource there are actually two different resources to account for different versions of PowerShell.
@ThomasNieto yup! PowerShell/DSC#913 proposes a discovery extension for finding resource and extension manifests through the |
PR Summary
The initial implementation of DSC v3 resource for PSResourceGet. It include two resources, Repository and PSResources.
PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.