Skip to content

Commit fcf7fad

Browse files
committed
Adding backward compatibility with AzureRM version
1 parent 2b5b55a commit fcf7fad

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

CanaryValidator/Canary.Tests.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ while ($runCount -le $NumberOfIterations)
407407
$asTenantSubscription = New-AzureRmTenantSubscription -OfferId $asCanaryOffer.Id -DisplayName $tenantSubscriptionName -ErrorAction Stop
408408
if ($asTenantSubscription)
409409
{
410-
$asTenantSubscription | Select-AzureRmSubscription -ErrorAction Stop
411-
}
410+
Get-AzureRmSubscription -SubscriptionName $asTenantSubscription.DisplayName | Select-AzureRmSubscription -ErrorAction Stop
411+
}
412412
}
413413

414414
Invoke-Usecase -Name 'RoleAssignmentAndCustomRoleDefinition' -Description "Assign a reader role and create a custom role definition" -UsecaseBlock `
@@ -502,11 +502,13 @@ while ($runCount -le $NumberOfIterations)
502502

503503
Invoke-Usecase -Name 'RemoveReaderRoleAssignment' -Description "Remove Reader role assignment from Service Principle - $($servicePrincipal.DisplayName)" -UsecaseBlock `
504504
{
505+
$parameters = @{}
506+
if ((Get-Module AzureRM -ListAvailable).Version -le "1.2.10") {$parameters = @{"Force" = $True}}
505507
$readerRole = Get-AzureRmRoleDefinition -Name Reader
506508
$subscriptionID = (Get-AzureRmSubscription -SubscriptionName $tenantSubscriptionName).SubscriptionId
507509
if ($subscriptionID -and $readerRole -and (Get-AzureRmRoleAssignment -RoleDefinitionName $readerRole.Name -Scope "/Subscriptions/$subscriptionID" -ErrorAction Stop))
508510
{
509-
Remove-AzureRmRoleAssignment -Scope "/Subscriptions/$subscriptionID" -RoleDefinitionName $readerRole.Name -ObjectId $servicePrincipal.Id -Force -ErrorAction Stop
511+
Remove-AzureRmRoleAssignment -Scope "/Subscriptions/$subscriptionID" -RoleDefinitionName $readerRole.Name -ObjectId $servicePrincipal.Id -ErrorAction Stop @parameters
510512
}
511513
}
512514

0 commit comments

Comments
 (0)