Skip to content

Update ContainerRegistry dependency parsing logic to account for AzPreview package #1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 24, 2025
Merged

Update ContainerRegistry dependency parsing logic to account for AzPreview package #1792

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85ae55c
Update Dependency parsing logic to account for Az packages with Az* n…
anamnavi Feb 12, 2025
53562a4
specify Azpreview explicitly in condition
anamnavi Feb 12, 2025
d175eaa
add test for Azpreview from MAR
anamnavi Feb 12, 2025
0f13698
fix test for Azpreview from MAR
anamnavi Feb 12, 2025
e3cce0a
update outdated az FindName() from MAR test
anamnavi Feb 12, 2025
ab27810
check if version is greaterthan not equal
anamnavi Feb 12, 2025
b7d4a0b
pull in changes from master
anamnavi Feb 19, 2025
d02dc4a
Merge branch 'master' of https://github.com/PowerShell/PSResourceGet …
anamnavi Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/code/PSResourceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ public static bool TryConvertFromContainerRegistryJson(
metadata["Dependencies"] = ParseContainerRegistryDependencies(requiredModulesElement, out errorMsg).ToArray();
}

if (string.Equals(packageName, "Az", StringComparison.OrdinalIgnoreCase) || packageName.StartsWith("Az.", StringComparison.OrdinalIgnoreCase))
if (string.Equals(packageName, "Az", StringComparison.OrdinalIgnoreCase) || string.Equals(packageName, "Azpreview", StringComparison.OrdinalIgnoreCase) || packageName.StartsWith("Az.", StringComparison.OrdinalIgnoreCase))
{
if (rootDom.TryGetProperty("ModuleList", out JsonElement moduleListDepsElement))
{
Expand Down
7 changes: 6 additions & 1 deletion test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,17 @@ Describe 'Test Find-PSResource for MAR Repository' -tags 'CI' {
It "Should find resource given specific Name, Version null" {
$res = Find-PSResource -Name "Az.Accounts" -Repository "MAR"
$res.Name | Should -Be "Az.Accounts"
$res.Version | Should -Be "4.0.0"
$res.Version | Should -Be "4.0.2"
}

It "Should find resource and its dependency given specific Name and Version" {
$res = Find-PSResource -Name "Az.Storage" -Version "8.0.0" -Repository "MAR"
$res.Dependencies.Length | Should -Be 1
$res.Dependencies[0].Name | Should -Be "Az.Accounts"
}

It "Should find Azpreview resource and it's dependency given specific Name and Version" {
$res = Find-PSResource -Name "Azpreview" -Version "13.2.0" -Repository "MAR"
$res.Dependencies.Length | Should -Not -Be 0
}
}
Loading