Skip to content

Commit 086b22a

Browse files
authored
Fix error when repository is not provided (Azure#20210)
Fix the Azure#20209 (Repository is not set but used in installation and updating)
1 parent 1342a1f commit 086b22a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

tools/Az.Tools.Installer/Az.Tools.Installer.psm1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ function Get-AzModuleFromRemote {
341341
if ($modules.Count -gt 1) {
342342
Throw "[$Invoker] You have multiple modules matched 'Az' in the registered reposistory $($modules.Repository). Please specify a single -Repository."
343343
}
344+
$Repository = $modules.Repository
344345

345346
$accountVersion = 0
346347
if (!$UseExactAccountVersion) {
@@ -365,16 +366,16 @@ function Get-AzModuleFromRemote {
365366
elseif ($module.Keys -Contains 'RequiredVersion') {
366367
$version = $module.RequiredVersion
367368
}
368-
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $version}
369+
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $version; Repository = $Repository}
369370
}
370371
else {
371-
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $accountVersion}
372+
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $accountVersion; Repository = $Repository}
372373
}
373374
}
374375
elseif (!$Name -or $Name -Contains $module.Name)
375376
{
376377
if ($module.RequiredVersion) {
377-
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $module.RequiredVersion}
378+
$modulesWithVersion += [PSCustomObject]@{Name = $module.Name; Version = $module.RequiredVersion; Repository = $Repository}
378379
$containValidModule = $true
379380
}
380381
}

tools/Az.Tools.Installer/exports/Update-AzModule.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ function Update-AzModule {
9191
$findModuleParams.Add('Repository', $Repository)
9292
}
9393
$modulesToUpdate = Get-AzModuleFromRemote @findModuleParams
94+
$Repository = $modulesToUpdate.Repository | Select-Object -First 1
9495
$moduleUpdateTable = $modulesToUpdate | Foreach-Object { [PSCustomObject]@{
9596
Name = $_.Name
9697
VersionBeforeUpdate = [Version] ($groupSet[$_.Name] | Select-Object -First 1)

tools/Az.Tools.Installer/internal/Install-AzModule_Default.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ function Install-AzModule_Default {
8080

8181
$modules = @()
8282
$modules += Get-AzModuleFromRemote @findModuleParams | Sort-Object -Property Name
83+
$Repository = $modules.Repository | Select-Object -First 1
8384

8485
if($Name) {
8586
$moduleExcluded = $Name | Where-Object {!$modules -or $modules.Name -NotContains $_}

0 commit comments

Comments
 (0)