@@ -9,6 +9,8 @@ You must also have access to an account / directory that is an owner or contribu
99
1010#>
1111
12+ [String ]$azureResourceApiVersion = " 2017-06-01"
13+
1214function Initialize-AzEnvironment {
1315 [CmdletBinding ()]
1416 param (
@@ -165,7 +167,7 @@ function Get-RegistrationDetailsConnected {
165167 $AzureContext = (Get-AzContext )
166168 }
167169 Log- Output " Getting existing registration resource from Azure"
168- $regResourceAzure = Get-AzResource - ResourceId $azureRegResIden
170+ $regResourceAzure = Get-AzResource - ResourceId $azureRegResIden - ApiVersion $azureResourceApiVersion
169171 Log- Output " Existing registration resource in Azure: $ ( $regResourceAzure | ConvertTo-Json - Depth 2 ) "
170172 $registrationName = $regResourceAzure.Name
171173 $resourceGroupName = $regResourceAzure.ResourceGroupName
@@ -535,7 +537,7 @@ function Remove-AzsRegistration{
535537 $registrationResource = $null
536538
537539 $registrationResourceId = " /subscriptions/$ ( $AzureContext.Subscription.SubscriptionId ) /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$registrationName "
538- $registrationResource = Get-AzResource - ResourceId $registrationResourceId - ErrorAction Ignore
540+ $registrationResource = Get-AzResource - ResourceId $registrationResourceId - ApiVersion $azureResourceApiVersion - ErrorAction Ignore
539541 if ($registrationResource.Properties.cloudId -eq $stampInfo.CloudId )
540542 {
541543 Log- Output " Registration resource found: $ ( $registrationResource.ResourceId ) "
@@ -920,7 +922,7 @@ Function UnRegister-AzsEnvironment{
920922 if ($RegistrationName )
921923 {
922924 $registrationResourceId = " /subscriptions/$ ( $AzureContext.Subscription.SubscriptionId ) /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$registrationName "
923- $registrationResource = Get-AzResource - ResourceId $registrationResourceId - ErrorAction Ignore
925+ $registrationResource = Get-AzResource - ResourceId $registrationResourceId - ApiVersion $azureResourceApiVersion - ErrorAction Ignore
924926 }
925927 elseif ($CloudId )
926928 {
@@ -940,7 +942,7 @@ Function UnRegister-AzsEnvironment{
940942 try
941943 {
942944 Log- Output " Attempting to retrieve resources using command: 'Get-AzResource -ResourceType microsoft.azurestack/registrations -ResourceGroupName $ResourceGroupName '"
943- $registrationresources = Get-AzResource - ResourceType microsoft.azurestack/ registrations - ResourceGroupName $ResourceGroupName
945+ $registrationresources = Get-AzResource - ResourceType microsoft.azurestack/ registrations - ResourceGroupName $ResourceGroupName - ApiVersion $azureResourceApiVersion
944946 }
945947 catch
946948 {
@@ -951,7 +953,7 @@ Function UnRegister-AzsEnvironment{
951953 Log- Output " Found $ ( $registrationResources.Count ) registration resources. Finding a matching CloudId may take some time."
952954 foreach ($resource in $registrationResources )
953955 {
954- $resourceObject = Get-AzResource - ResourceId " /subscriptions/$ ( $AzureContext.Subscription.SubscriptionId ) /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$ ( $resource.name ) "
956+ $resourceObject = Get-AzResource - ResourceId " /subscriptions/$ ( $AzureContext.Subscription.SubscriptionId ) /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$ ( $resource.name ) " - ApiVersion $azureResourceApiVersion
955957 $resourceCloudId = $resourceObject.Properties.CloudId
956958 if ($resourceCloudId -eq $stampInfo.CloudId )
957959 {
@@ -1340,7 +1342,7 @@ function New-RegistrationResource{
13401342 Location = ' Global'
13411343 ResourceName = $RegistrationName
13421344 ResourceType = " Microsoft.AzureStack/registrations"
1343- ApiVersion = " 2017-06-01 "
1345+ ApiVersion = $azureResourceApiVersion
13441346 Properties = @ { registrationToken = " $registrationToken " }
13451347 }
13461348
@@ -1492,7 +1494,7 @@ function New-RBACAssignment{
14921494 {
14931495 try
14941496 {
1495- $registrationResource = Get-AzResource - ResourceId " /subscriptions/$SubscriptionId /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$RegistrationName "
1497+ $registrationResource = Get-AzResource - ResourceId " /subscriptions/$SubscriptionId /resourceGroups/$ResourceGroupName /providers/Microsoft.AzureStack/registrations/$RegistrationName " - ApiVersion $azureResourceApiVersion
14961498
14971499 $RoleAssigned = $false
14981500 $RoleName = " Azure Stack Registration Owner"
@@ -1877,7 +1879,7 @@ function Remove-RegistrationResource{
18771879 try
18781880 {
18791881 # # Remove any existing Resource level lock before deleting the resource
1880- $existingRegistrationResource = Get-AzResource - ResourceId $ResourceId
1882+ $existingRegistrationResource = Get-AzResource - ResourceId $ResourceId - ApiVersion $azureResourceApiVersion
18811883 $resourceName = $existingRegistrationResource.Name
18821884
18831885 $resourceType = ' Microsoft.Azurestack/registrations'
@@ -1888,7 +1890,7 @@ function Remove-RegistrationResource{
18881890 Remove-AzResourceLock - LockId $lock.LockId - Force
18891891 }
18901892
1891- Remove-AzResource - ResourceId $ResourceId - Force - Verbose
1893+ Remove-AzResource - ResourceId $ResourceId - ApiVersion $azureResourceApiVersion - Force - Verbose
18921894 break
18931895 }
18941896 catch
0 commit comments