From 85ae55cbf2b9db181b306d1577d88e0e5374fcf0 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 13:09:10 -0500 Subject: [PATCH 1/6] Update Dependency parsing logic to account for Az packages with Az* naming --- src/code/PSResourceInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code/PSResourceInfo.cs b/src/code/PSResourceInfo.cs index 409665edc..0e5aabc85 100644 --- a/src/code/PSResourceInfo.cs +++ b/src/code/PSResourceInfo.cs @@ -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 (packageName.StartsWith("Az", StringComparison.OrdinalIgnoreCase)) { if (rootDom.TryGetProperty("ModuleList", out JsonElement moduleListDepsElement)) { From 53562a4a1ea6ee8dad0791d89f91998ee90f981b Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 13:58:33 -0500 Subject: [PATCH 2/6] specify Azpreview explicitly in condition --- src/code/PSResourceInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code/PSResourceInfo.cs b/src/code/PSResourceInfo.cs index 0e5aabc85..547828393 100644 --- a/src/code/PSResourceInfo.cs +++ b/src/code/PSResourceInfo.cs @@ -972,7 +972,7 @@ public static bool TryConvertFromContainerRegistryJson( metadata["Dependencies"] = ParseContainerRegistryDependencies(requiredModulesElement, out errorMsg).ToArray(); } - if (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)) { From d175eaa1a7a2852cc3b2022346a0e0f040f34e43 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 14:04:01 -0500 Subject: [PATCH 3/6] add test for Azpreview from MAR --- .../FindPSResourceContainerRegistryServer.Tests.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 index b7ffdfb8e..43eca7a25 100644 --- a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 +++ b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 @@ -255,4 +255,9 @@ Describe 'Test Find-PSResource for MAR Repository' -tags 'CI' { $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 "Az.Storage" -Version "13.2.0" -Repository "MAR" + $res.Dependencies.Length | Should -Not -Be 0 + } } From 0f13698eb97c60e3197936546bc92d12d8cc14c8 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 15:42:04 -0500 Subject: [PATCH 4/6] fix test for Azpreview from MAR --- .../FindPSResourceContainerRegistryServer.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 index 43eca7a25..69ca8c717 100644 --- a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 +++ b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 @@ -257,7 +257,7 @@ Describe 'Test Find-PSResource for MAR Repository' -tags 'CI' { } It "Should find Azpreview resource and it's dependency given specific Name and Version" { - $res = Find-PSResource -Name "Az.Storage" -Version "13.2.0" -Repository "MAR" + $res = Find-PSResource -Name "Azpreview" -Version "13.2.0" -Repository "MAR" $res.Dependencies.Length | Should -Not -Be 0 } } From e3cce0a2507df8994bae69a514b858b89b29cb44 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 17:08:56 -0500 Subject: [PATCH 5/6] update outdated az FindName() from MAR test --- .../FindPSResourceContainerRegistryServer.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 index 69ca8c717..db2d5f0a2 100644 --- a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 +++ b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 @@ -247,7 +247,7 @@ 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" { From ab2781076bea7be094ea09459459350a1421615c Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 12 Feb 2025 18:56:31 -0500 Subject: [PATCH 6/6] check if version is greaterthan not equal --- .../FindPSResourceContainerRegistryServer.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 index db2d5f0a2..ccc0142cb 100644 --- a/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 +++ b/test/FindPSResourceTests/FindPSResourceContainerRegistryServer.Tests.ps1 @@ -247,7 +247,7 @@ 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.2" + $res.Version | Should -BeGreaterThan "4.0.0" } It "Should find resource and its dependency given specific Name and Version" {