Skip to content

Commit 0fa53f9

Browse files
committed
address PR comments
1 parent d6daaa6 commit 0fa53f9

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

tools/AzureRM.Example.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $FilteredCommands | ForEach-Object {
1717
$global:PSDefaultParameterValues.Add($_,
1818
{
1919
$context = Get-AzureRmContext
20-
if ($context.ExtendedProperties.ContainsKey("Default Resource Group")) {
20+
if (($context -ne $null) -and $context.ExtendedProperties.ContainsKey("Default Resource Group")) {
2121
$context.ExtendedProperties["Default Resource Group"]
2222
}
2323
})

tools/UpdateModules.ps1

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function Find-DefaultResourceGroupCmdlets
9797
$AllCmdlets += $dllCmdlets
9898
}
9999

100-
$FilteredCommands = $AllCmdlets | Where-Object {Test-RequiredParameter -Cmdlet $_}
100+
$FilteredCommands = $AllCmdlets | Where-Object {Test-CmdletRequiredParameter -Cmdlet $_ -Parameter "ResourceGroupName"}
101101

102102
if ($FilteredCommands.Length -eq 0) {
103103
$contructedCommands = "@()"
@@ -119,20 +119,21 @@ function Find-DefaultResourceGroupCmdlets
119119
}
120120
}
121121

122-
function Test-RequiredParameter
122+
function Test-CmdletRequiredParameter
123123
{
124124
[CmdletBinding()]
125125
param(
126-
[Object]$Cmdlet
126+
[Object]$Cmdlet,
127+
[string]$Parameter
127128
)
128129

129130
PROCESS
130131
{
131-
$rgParameter = $Cmdlet.GetProperties() | Where-Object {$_.Name -eq "ResourceGroupName"}
132+
$rgParameter = $Cmdlet.GetProperties() | Where-Object {$_.Name -eq $Parameter}
132133
if ($rgParameter -ne $null) {
133-
$parameterSets = $rgParameter.CustomAttributes | Where-Object {$_.AttributeType.Name -eq "ParameterAttribute"}
134+
$parameterAttributes = $rgParameter.CustomAttributes | Where-Object {$_.AttributeType.Name -eq "ParameterAttribute"}
134135
$isMandatory = $true
135-
$parameterSets | ForEach-Object {
136+
$parameterAttributes | ForEach-Object {
136137
$hasParameterSet = $_.NamedArguments | Where-Object {$_.MemberName -eq "ParameterSetName"}
137138
$MandatoryParam = $_.NamedArguments | Where-Object {$_.MemberName -eq "Mandatory"}
138139
if (($hasParameterSet -ne $null) -or (!$MandatoryParam.TypedValue.Value)) {

0 commit comments

Comments
 (0)