Skip to content

Commit a26044a

Browse files
markcowlmarkcowl
authored
Merge pull request #5425 from maddieclayton/getlocation
Fix Get-Location
2 parents b5f78c5 + b1e930d commit a26044a

29 files changed

+4187
-75997
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ function Get-AzureRmResourceProvider
4141
}
4242
PROCESS {
4343
$getTask = $client.Providers.GetAsync($ProviderNamespace, [System.Threading.CancellationToken]::None)
44-
$pr = $getTask.Result
45-
if($pr -eq $null) {
46-
$provider = $null
47-
} else {
48-
$provider = Get-Provider $pr.Provider.Namespace
49-
}
50-
Write-Output $provider
44+
Write-Output $getTask.Result.Provider
5145
}
5246
END {}
5347
}
@@ -143,13 +137,6 @@ function Get-ResourceGroup {
143137
return $rg
144138
}
145139

146-
function Get-Provider {
147-
param([string] $name)
148-
$rtype = New-Object PSObject -Property @{"ResourceTypeName" = "virtualMachines"; "Locations" = @("East US"); "ApiVersions" = @("2015-01-01"); }
149-
$pr = New-Object PSObject -Property @{"ProviderNamespace" = $name; "RegistrationState" = "Registered"; "Locations" = @("East US"); "ResourceTypes" = $rtype;}
150-
return $pr
151-
}
152-
153140
function List-ResourceGroup {
154141
$rg = New-Object PSObject -Property @{"ResourceGroupName" = $name; "Location" = $location; }
155142
return $rg

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ function Get-Location
584584
{
585585
param([string]$providerNamespace, [string]$resourceType, [string]$preferredLocation)
586586
$provider = Get-AzureRmResourceProvider -ProviderNamespace $providerNamespace
587-
$resourceTypes = $provider.ResourceTypes | Where-Object { $_.ResourceTypeName -eq $resourceType}
587+
$resourceTypes = $provider.ResourceTypes | Where-Object { $_.Name -eq $resourceType}
588588
$location = $resourceTypes.Locations | Where-Object { $_ -eq $preferredLocation }
589589
if ($location -eq $null)
590590
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,47 +505,47 @@ function Get-ResourceProviderLocation
505505

506506
function Get-ComputeVMLocation
507507
{
508-
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines";
508+
Get-Location "Microsoft.Compute" "virtualMachines" "East US";
509509
}
510510

511511
function Get-ComputeAvailabilitySetLocation
512512
{
513-
Get-ResourceProviderLocation "Microsoft.Compute/availabilitySets";
513+
Get-Location "Microsoft.Compute" "availabilitySets" "West US";
514514
}
515515

516516
function Get-ComputeVMExtensionLocation
517517
{
518-
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/extensions";
518+
Get-Location "Microsoft.Compute" "virtualMachines/extensions" "West US";
519519
}
520520

521521
function Get-ComputeVMDiagnosticSettingLocation
522522
{
523-
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/diagnosticSettings";
523+
Get-Location "Microsoft.Compute" "virtualMachines/diagnosticSettings" "West US";
524524
}
525525

526526
function Get-ComputeVMMetricDefinitionLocation
527527
{
528-
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/metricDefinitions";
528+
Get-Location "Microsoft.Compute" "virtualMachines/metricDefinitions" "West US";
529529
}
530530

531531
function Get-ComputeOperationLocation
532532
{
533-
Get-ResourceProviderLocation "Microsoft.Compute/locations/operations";
533+
Get-Location "Microsoft.Compute" "locations/operations" "West US";
534534
}
535535

536536
function Get-ComputeVMSizeLocation
537537
{
538-
Get-ResourceProviderLocation "Microsoft.Compute/locations/vmSizes";
538+
Get-Location "Microsoft.Compute" "locations/vmSizes" "West US";
539539
}
540540

541541
function Get-ComputeUsageLocation
542542
{
543-
Get-ResourceProviderLocation "Microsoft.Compute/locations/usages";
543+
Get-Location "Microsoft.Compute" "locations/usages" "West US";
544544
}
545545

546546
function Get-ComputePublisherLocation
547547
{
548-
Get-ResourceProviderLocation "Microsoft.Compute/locations/publishers";
548+
Get-Location "Microsoft.Compute" "locations/publishers" "West US";
549549
}
550550

551551
function Get-SubscriptionIdFromResourceGroup

‎src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/DRConfigurationTests.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ function WaitforStatetoBeSucceded_namespace
4949

5050
}
5151

52-
5352
<#
5453
.SYNOPSIS
5554
Tests EventHubs DRConfiguration Create List Remove operations.
@@ -58,8 +57,8 @@ Tests EventHubs DRConfiguration Create List Remove operations.
5857
function DRConfigurationTests
5958
{
6059
# Setup
61-
$location_south = "South Central US" #Get-Location "Microsoft.ServiceBus" "namespaces" "South Central US"
62-
$location_north = "North Central US" #Get-Location "Microsoft.ServiceBus" "namespaces" "North Central US"
60+
$location_south = Get-Location "Microsoft.ServiceBus" "namespaces" "South Central US"
61+
$location_north = Get-Location "Microsoft.ServiceBus" "namespaces" "North Central US"
6362
$resourceGroupName = getAssetName
6463
$namespaceName1 = getAssetName "Eventhub-Namespace-"
6564
$namespaceName2 = getAssetName "Eventhub-Namespace-"

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/Common.ps1

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,6 @@ function Get-ResourceName
3030
return getAssetName
3131
}
3232

33-
<#
34-
.SYNOPSIS
35-
Gets the default location for a provider
36-
#>
37-
function Get-ProviderLocation($provider)
38-
{
39-
$assemblies = [AppDomain]::Currentdomain.GetAssemblies() | Select-Object FullName | ForEach-Object { $_.FullName.Substring(0, $_.FullName.IndexOf(',')) }
40-
if ($assemblies -notcontains 'Microsoft.Azure.Test.HttpRecorder.HttpMockServer' `
41-
-or $assemblies -notcontains 'Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode' `
42-
-or [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
43-
{
44-
$namespace = $provider.Split("/")[0]
45-
if($provider.Contains("/"))
46-
{
47-
$type = $provider.Substring($namespace.Length + 1)
48-
$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
49-
50-
if ($location -eq $null)
51-
{
52-
return "West US"
53-
} else
54-
{
55-
return $location.Locations[0]
56-
}
57-
}
58-
59-
return "West US"
60-
}
61-
62-
return "WestUS"
63-
}
64-
6533
<#
6634
.SYNOPSIS
6735
Gets valid application display name

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function Test-CreatesNewSimpleResourceGroup
2020
{
2121
# Setup
2222
$rgname = Get-ResourceGroupName
23-
$location = Get-ProviderLocation ResourceManagement
23+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
2424

2525
try
2626
{
@@ -47,7 +47,7 @@ function Test-UpdatesExistingResourceGroup
4747
{
4848
# Setup
4949
$rgname = Get-ResourceGroupName
50-
$location = Get-ProviderLocation ResourceManagement
50+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
5151

5252
try
5353
{
@@ -82,7 +82,7 @@ function Test-CreatesAndRemoveResourceGroupViaPiping
8282
# Setup
8383
$rgname1 = Get-ResourceGroupName
8484
$rgname2 = Get-ResourceGroupName
85-
$location = Get-ProviderLocation ResourceManagement
85+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
8686

8787
# Test
8888
New-AzureRmResourceGroup -Name $rgname1 -Location $location
@@ -201,7 +201,7 @@ function Test-NewDeploymentAndProviderRegistration
201201
# Setup
202202
$rgname = Get-ResourceGroupName
203203
$rname = Get-ResourceName
204-
$location = Get-ProviderLocation ResourceManagement
204+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
205205
$template = "Microsoft.Cache.0.4.0-preview"
206206
$provider = "microsoft.cache"
207207

@@ -271,7 +271,7 @@ function Test-FindResourceGroup
271271
# Setup
272272
$rgname = Get-ResourceGroupName
273273
$rgname2 = Get-ResourceGroupName
274-
$location = Get-ProviderLocation ResourceManagement
274+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
275275
$originalResorcrGroups = Find-AzureRmResourceGroup
276276
$originalCount = @($originalResorcrGroups).Count
277277

@@ -337,7 +337,7 @@ function Test-ExportResourceGroup
337337
# Setup
338338
$rgname = Get-ResourceGroupName
339339
$rname = Get-ResourceName
340-
$rglocation = Get-ProviderLocation ResourceManagement
340+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
341341
$apiversion = "2014-04-01"
342342
$resourceType = "Providers.Test/statefulResources"
343343

@@ -370,7 +370,7 @@ function Test-ResourceGroupWithPositionalParams
370370
{
371371
# Setup
372372
$rgname = Get-ResourceGroupName
373-
$location = "West US"
373+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
374374

375375
try
376376
{

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceLockTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Test-ResourceLockCRUD
2121
# Setup
2222
$rgname = Get-ResourceGroupName
2323
$rname = Get-ResourceName
24-
$rglocation = Get-ProviderLocation ResourceManagement
24+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
2525
$apiversion = "2014-04-01"
2626

2727
$rg = New-AzureRMResourceGroup -Name $rgname -Location $rglocation
@@ -64,7 +64,7 @@ function Test-ResourceLockNonExisting
6464
{
6565
# Setup
6666
$rgname = Get-ResourceGroupName
67-
$rglocation = Get-ProviderLocation ResourceManagement
67+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
6868

6969
$rg = New-AzureRMResourceGroup -Name $rgname -Location $rglocation
7070
Assert-AreEqual $rgname $rg.ResourceGroupName

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function Test-CreatesNewSimpleResource
2323
# Setup
2424
$rgname = Get-ResourceGroupName
2525
$rname = Get-ResourceName
26-
$rglocation = Get-ProviderLocation ResourceManagement
27-
$location = Get-ProviderLocation "Microsoft.Sql/servers"
26+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
27+
$location = Get-Location "Microsoft.Sql" "servers" "West US"
2828
$apiversion = "2014-04-01"
2929
$resourceType = "Microsoft.Sql/servers"
3030

@@ -57,10 +57,9 @@ function Test-CreatesNewComplexResource
5757
$rgname = Get-ResourceGroupName
5858
$rnameParent = Get-ResourceName
5959
$rnameChild = Get-ResourceName
60-
$resourceTypeParent = "Microsoft.Sql/servers"
6160
$resourceTypeChild = "Microsoft.Sql/servers/databases"
62-
$rglocation = Get-ProviderLocation ResourceManagement
63-
$location = Get-ProviderLocation $resourceTypeParent
61+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
62+
$location = Get-Location "Microsoft.Sql" "servers" "West US"
6463
$apiversion = "2014-04-01"
6564

6665
# Test
@@ -108,10 +107,9 @@ function Test-GetResourcesViaPiping
108107
$rgname = Get-ResourceGroupName
109108
$rnameParent = Get-ResourceName
110109
$rnameChild = Get-ResourceName
111-
$resourceTypeParent = "Microsoft.Sql/servers"
112110
$resourceTypeChild = "Microsoft.Sql/servers/databases"
113-
$rglocation = Get-ProviderLocation ResourceManagement
114-
$location = Get-ProviderLocation $resourceTypeParent
111+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
112+
$location = Get-Location "Microsoft.Sql" "servers" "West US"
115113
$apiversion = "2014-04-01"
116114

117115
# Test
@@ -140,7 +138,7 @@ function Test-GetResourcesFromEmptyGroup
140138
{
141139
# Setup
142140
$rgname = Get-ResourceGroupName
143-
$location = Get-ProviderLocation ResourceManagement
141+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
144142

145143
# Test
146144
New-AzureRmResourceGroup -Name $rgname -Location $location
@@ -187,7 +185,7 @@ function Test-GetResourceForNonExisingResource
187185
# Setup
188186
$rgname = Get-ResourceGroupName
189187
$rname = Get-ResourceGroupName
190-
$location = Get-ProviderLocation ResourceManagement
188+
$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
191189
$resourceTypeWeb = "Microsoft.Web/sites"
192190
$resourceTypeSql = "Microsoft.Sql/servers"
193191
$apiversion = "2014-04-01"
@@ -211,10 +209,9 @@ function Test-GetResourcesViaPipingFromAnotherResource
211209
$rgname = Get-ResourceGroupName
212210
$rnameParent = Get-ResourceName
213211
$rnameChild = Get-ResourceName
214-
$resourceTypeParent = "Microsoft.Sql/servers"
215212
$resourceTypeChild = "Microsoft.Sql/servers/databases"
216-
$rglocation = Get-ProviderLocation ResourceManagement
217-
$location = Get-ProviderLocation $resourceTypeParent
213+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
214+
$location = Get-Location "Microsoft.Sql" "servers" "West US"
218215
$apiversion = "2014-04-01"
219216

220217
# Test
@@ -241,7 +238,7 @@ function Test-MoveAResource
241238
$rgname = Get-ResourceGroupName
242239
$rgname2 = Get-ResourceGroupName + "test3"
243240
$rname = Get-ResourceName
244-
$rglocation = Get-ProviderLocation ResourceManagement
241+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
245242
$apiversion = "2014-04-01"
246243
$resourceType = "Providers.Test/statefulResources"
247244

@@ -295,7 +292,7 @@ function Test-SetAResource
295292
# Setup
296293
$rgname = Get-ResourceGroupName
297294
$rname = Get-ResourceName
298-
$rglocation = Get-ProviderLocation ResourceManagement
295+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
299296
$apiversion = "2014-04-01"
300297
$resourceType = "Providers.Test/statefulResources"
301298

@@ -337,7 +334,7 @@ function Test-SetAResourceWithPatch
337334
# Setup
338335
$rgname = Get-ResourceGroupName
339336
$rname = Get-ResourceName
340-
$rglocation = Get-ProviderLocation ResourceManagement
337+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
341338
$apiversion = "2014-04-01"
342339
$resourceType = "Providers.Test/statefulResources"
343340

@@ -366,7 +363,7 @@ function Test-FindAResource
366363
$rgname = Get-ResourceGroupName
367364
$rname = "testname"
368365
$rname2 = "test2name"
369-
$rglocation = Get-ProviderLocation ResourceManagement
366+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
370367
$apiversion = "2014-04-01"
371368
$resourceType = "Providers.Test/statefulResources"
372369

@@ -409,7 +406,7 @@ function Test-FindAResource-ByTag
409406
$rgname = Get-ResourceGroupName
410407
$rname = "testname"
411408
$rname2 = "test2name"
412-
$rglocation = Get-ProviderLocation ResourceManagement
409+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
413410
$apiversion = "2014-04-01"
414411
$resourceType = "Providers.Test/statefulResources"
415412

@@ -451,7 +448,7 @@ function Test-GetResourceExpandProperties
451448
# Setup
452449
$rgname = Get-ResourceGroupName
453450
$rname = Get-ResourceName
454-
$rglocation = Get-ProviderLocation ResourceManagement
451+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
455452
$apiversion = "2014-04-01"
456453
$resourceType = "Providers.Test/statefulResources"
457454

@@ -504,7 +501,7 @@ function Test-ManageResourceWithZones
504501
# Setup
505502
$rgname = Get-ResourceGroupName
506503
$rname = Get-ResourceName
507-
$rglocation = Get-ProviderLocation ResourceManagement
504+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
508505
$location = "Central US"
509506
$apiversion = "2014-04-01"
510507
$resourceType = "Providers.Test/statefulResources"
@@ -551,7 +548,7 @@ function Test-RemoveAResource
551548
# Setup
552549
$rgname = Get-ResourceGroupName
553550
$rname = "testname"
554-
$rglocation = Get-ProviderLocation ResourceManagement
551+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
555552
$apiversion = "2014-04-01"
556553
$resourceType = "Providers.Test/statefulResources"
557554

@@ -580,7 +577,7 @@ function Test-RemoveASetOfResources
580577
$rgname = Get-ResourceGroupName
581578
$rname = "testname"
582579
$rname2 = "test2name"
583-
$rglocation = Get-ProviderLocation ResourceManagement
580+
$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
584581
$apiversion = "2014-04-01"
585582
$resourceType = "Providers.Test/statefulResources"
586583

0 commit comments

Comments
 (0)