Skip to content

Commit 8c23ac4

Browse files
author
Stephen Tramer
committed
Update AzureRM scripts
1 parent f261146 commit 8c23ac4

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

docs-conceptual/azurermps-5.7.0/uninstall-azurerm-ps.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,26 @@ function Uninstall-AllModules {
5454
5555
[switch]$WhatIf
5656
)
57-
57+
5858
$AllModules = @()
59-
59+
6060
'Creating list of dependencies...'
6161
$target = Find-Module $TargetModule -RequiredVersion $version
6262
$target.Dependencies | ForEach-Object {
63-
if ($_.requiredVersion) {
63+
if ($_.PSObject.Properties.Name -contains 'requiredVersion') {
6464
$AllModules += New-Object -TypeName psobject -Property @{name=$_.name; version=$_.requiredVersion}
6565
}
6666
else { # Assume minimum version
6767
# Minimum version actually reports the installed dependency
6868
# which is used, not the actual "minimum dependency." Check to
6969
# see if the requested version was installed as a dependency earlier.
70-
$candidate = Get-InstalledModule $_.name -RequiredVersion $version
70+
$candidate = Get-InstalledModule $_.name -RequiredVersion $version -ErrorAction Ignore
7171
if ($candidate) {
7272
$AllModules += New-Object -TypeName psobject -Property @{name=$_.name; version=$version}
7373
}
7474
else {
75-
Write-Warning ("Could not find uninstall candidate for {0}:{1} - module may require manual uninstall" -f $_.name,$version)
75+
$availableModules = Get-InstalledModule $_.name -AllVersions
76+
Write-Warning ("Could not find uninstall candidate for {0}:{1} - module may require manual uninstall. Available versions are: {2}" -f $_.name,$version,($availableModules.Version -join ', '))
7677
}
7778
}
7879
}

docs-conceptual/azurermps-6.13.0/uninstall-azurerm-ps.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,20 @@ function Uninstall-AllModules {
7474
'Creating list of dependencies...'
7575
$target = Find-Module $TargetModule -RequiredVersion $version
7676
$target.Dependencies | ForEach-Object {
77-
if ($_.requiredVersion) {
77+
if ($_.PSObject.Properties.Name -contains 'requiredVersion') {
7878
$AllModules += New-Object -TypeName psobject -Property @{name=$_.name; version=$_.requiredVersion}
7979
}
8080
else { # Assume minimum version
8181
# Minimum version actually reports the installed dependency
8282
# which is used, not the actual "minimum dependency." Check to
8383
# see if the requested version was installed as a dependency earlier.
84-
$candidate = Get-InstalledModule $_.name -RequiredVersion $version
84+
$candidate = Get-InstalledModule $_.name -RequiredVersion $version -ErrorAction Ignore
8585
if ($candidate) {
8686
$AllModules += New-Object -TypeName psobject -Property @{name=$_.name; version=$version}
8787
}
8888
else {
89-
Write-Warning ("Could not find uninstall candidate for {0}:{1} - module may require manual uninstall" -f $_.name,$version)
89+
$availableModules = Get-InstalledModule $_.name -AllVersions
90+
Write-Warning ("Could not find uninstall candidate for {0}:{1} - module may require manual uninstall. Available versions are: {2}" -f $_.name,$version,($availableModules.Version -join ', '))
9091
}
9192
}
9293
}

0 commit comments

Comments
 (0)