Skip to content

Commit 8b5ef8c

Browse files
markcowlmarkcowl
authored
Merge pull request #9162 from ankushbindlish2/Add-Graph-Update-In-StorageSync
Consume new Graph Library method in Az.StorageSync. Rerecord tests as well.
2 parents 260ac84 + 913ce72 commit 8b5ef8c

21 files changed

+10031
-5640
lines changed

‎src/StorageSync/StorageSync.Test/ScenarioTests/CloudEndpointTests.ps1

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ function Test-CloudEndpoint
4545
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
4646

4747
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
48-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
49-
$job | Wait-Job
48+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
5049
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
5150

5251
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
5352
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
54-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
53+
$context = $storageAccount.Context
5554
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
5655

5756
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -108,7 +107,7 @@ function Test-CloudEndpoint
108107
}
109108

110109
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
111-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
110+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
112111
}
113112
finally
114113
{
@@ -152,13 +151,12 @@ function Test-NewCloudEndpoint
152151

153152
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
154153

155-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
156-
$job | Wait-Job
154+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
157155
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
158156

159157
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
160158
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
161-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
159+
$context = $storageAccount.Context
162160
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
163161

164162
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -188,7 +186,7 @@ function Test-NewCloudEndpoint
188186
}
189187

190188
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
191-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
189+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
192190
}
193191
finally
194192
{
@@ -231,13 +229,12 @@ function Test-GetCloudEndpoint
231229
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
232230

233231
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
234-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
235-
$job | Wait-Job
232+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
236233
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
237234

238235
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
239236
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
240-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
237+
$context = $storageAccount.Context
241238
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
242239

243240
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -275,7 +272,7 @@ function Test-GetCloudEndpoint
275272
}
276273

277274
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
278-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
275+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
279276
}
280277
finally
281278
{
@@ -318,12 +315,11 @@ function Test-GetCloudEndpoints
318315
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
319316

320317
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
321-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
322-
$job | Wait-Job
318+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
323319
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
324320
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
325321
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
326-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
322+
$context = $storageAccount.Context
327323
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
328324

329325
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -364,7 +360,7 @@ function Test-GetCloudEndpoints
364360
}
365361

366362
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
367-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
363+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
368364
}
369365
finally
370366
{
@@ -407,12 +403,11 @@ function Test-GetCloudEndpointParentObject
407403
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
408404

409405
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
410-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
411-
$job | Wait-Job
406+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
412407
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
413408
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
414409
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
415-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
410+
$context = $storageAccount.Context
416411
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
417412

418413
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -449,7 +444,7 @@ function Test-GetCloudEndpointParentObject
449444
}
450445

451446
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
452-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
447+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
453448
}
454449
finally
455450
{
@@ -492,12 +487,11 @@ function Test-GetCloudEndpointParentResourceId
492487
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
493488

494489
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
495-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
496-
$job | Wait-Job
490+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
497491
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
498492
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
499493
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
500-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
494+
$context = $storageAccount.Context
501495
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
502496

503497
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -534,7 +528,7 @@ function Test-GetCloudEndpointParentResourceId
534528
}
535529

536530
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
537-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
531+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
538532
}
539533
finally
540534
{
@@ -577,12 +571,11 @@ function Test-RemoveCloudEndpoint
577571
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
578572

579573
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
580-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
581-
$job | Wait-Job
574+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
582575
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
583576
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
584577
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
585-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
578+
$context = $storageAccount.Context
586579
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
587580

588581
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -615,7 +608,7 @@ function Test-RemoveCloudEndpoint
615608
}
616609

617610
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
618-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
611+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
619612
}
620613
finally
621614
{
@@ -658,12 +651,11 @@ function Test-RemoveCloudEndpointInputObject
658651
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
659652

660653
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
661-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
662-
$job | Wait-Job
654+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
663655
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
664656
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
665657
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
666-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
658+
$context = $storageAccount.Context
667659
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
668660

669661
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -688,7 +680,7 @@ function Test-RemoveCloudEndpointInputObject
688680
}
689681

690682
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
691-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
683+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
692684
}
693685
finally
694686
{
@@ -732,12 +724,11 @@ function Test-RemoveCloudEndpointResourceId
732724
$syncGroup = New-AzStorageSyncGroup -ResourceGroupName $resourceGroupName -StorageSyncServiceName $storageSyncServiceName -Name $syncGroupName
733725

734726
Write-Verbose "Resource: $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
735-
$job = New-AzStorageAccount -SkuName Standard_LRS -ResourceGroupName $resourceGroupName -Name $StorageAccountName -Location $resourceLocation -AsJob
736-
$job | Wait-Job
727+
New-AzStorageAccount -StorageAccountName $StorageAccountName -Location $resourceLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS
737728
$storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
738729
$key = Get-AzStorageAccountKey -ResourceGroupName $resourceGroupName -Name $StorageAccountName
739730
Write-Verbose "Resource: $StorageAccountName | Key: $key[0]"
740-
$context = New-AzureStorageContext -StorageAccountName $storageAccount.StorageAccountName -StorageAccountKey $key[0].Value
731+
$context = $storageAccount.Context
741732
Write-Verbose "Resource: $AzureFileShareName | Loc: $resourceLocation | Type : AzureStorageShare"
742733

743734
$azureFileShareName = Ensure-AzureFileShareName $AzureFileShareName $context
@@ -762,7 +753,7 @@ function Test-RemoveCloudEndpointResourceId
762753
}
763754

764755
Write-Verbose "Removing $StorageAccountName | Loc: $resourceLocation | Type : StorageAccount"
765-
Remove-AzStorageAccount -Force -ResourceGroupName $resourceGroupName -Name $StorageAccountName
756+
Remove-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $StorageAccountName
766757
}
767758
finally
768759
{

0 commit comments

Comments
 (0)