Skip to content

Commit e3b7006

Browse files
committed
Parse out ModuleList for dependencies if it exists in metadata
1 parent 3e23ecb commit e3b7006

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/code/PSResourceInfo.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -970,13 +970,18 @@ public static bool TryConvertFromContainerRegistryJson(
970970
{
971971
metadata["Dependencies"] = ParseContainerRegistryDependencies(requiredModulesElement, out errorMsg).ToArray();
972972
}
973+
973974
if (string.Equals(packageName, "Az", StringComparison.OrdinalIgnoreCase) || packageName.StartsWith("Az.", StringComparison.OrdinalIgnoreCase))
974975
{
975-
if (rootDom.TryGetProperty("PrivateData", out JsonElement privateDataElement) && privateDataElement.TryGetProperty("PSData", out JsonElement psDataElement))
976+
if (rootDom.TryGetProperty("ModuleList", out JsonElement moduleListDepsElement))
977+
{
978+
metadata["Dependencies"] = ParseContainerRegistryDependencies(moduleListDepsElement, out errorMsg).ToArray();
979+
}
980+
else if (rootDom.TryGetProperty("PrivateData", out JsonElement privateDataElement) && privateDataElement.TryGetProperty("PSData", out JsonElement psDataElement))
976981
{
977-
if (psDataElement.TryGetProperty("ModuleList", out JsonElement moduleListDepsElement))
982+
if (psDataElement.TryGetProperty("ModuleList", out JsonElement privateDataModuleListDepsElement))
978983
{
979-
metadata["Dependencies"] = ParseContainerRegistryDependencies(moduleListDepsElement, out errorMsg).ToArray();
984+
metadata["Dependencies"] = ParseContainerRegistryDependencies(privateDataModuleListDepsElement, out errorMsg).ToArray();
980985
}
981986
}
982987
}

0 commit comments

Comments
 (0)