Skip to content

Commit 992ad31

Browse files
authored
Merge pull request #560 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents a76c2ca + 99bbde8 commit 992ad31

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/AzureRM.Resources.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
} else {
2020
$getTask = $client.ResourceGroups.GetAsync($Name, [System.Threading.CancellationToken]::None)
2121
$rg = $getTask.Result
22-
$resourceGroup = Get-ResourceGroup $Name $Location $rg.ResourceGroup.Id
22+
if($rg -eq $null) {
23+
$resourceGroup = $null
24+
} else {
25+
$resourceGroup = Get-ResourceGroup $Name $Location $rg.ResourceGroup.Id
26+
}
2327
Write-Output $resourceGroup
2428
}
2529
}
@@ -38,7 +42,11 @@ function Get-AzureRmResourceProvider
3842
PROCESS {
3943
$getTask = $client.Providers.GetAsync($ProviderNamespace, [System.Threading.CancellationToken]::None)
4044
$pr = $getTask.Result
41-
$provider = Get-Provider $pr.Provider.Namespace
45+
if($pr -eq $null) {
46+
$provider = $null
47+
} else {
48+
$provider = Get-Provider $pr.Provider.Namespace
49+
}
4250
Write-Output $provider
4351
}
4452
END {}

0 commit comments

Comments
 (0)