|
12 | 12 | # limitations under the License.
|
13 | 13 | # ----------------------------------------------------------------------------------
|
14 | 14 |
|
| 15 | +$PLACEHOLDER = "PLACEHOLDER" |
| 16 | + |
15 | 17 | <#
|
16 | 18 | .SYNOPSIS
|
17 | 19 | Gets valid resource name for compute test
|
@@ -113,7 +115,7 @@ function Create-VirtualMachine($rgname, $vmname, $loc)
|
113 | 115 | $rgname = if ([string]::IsNullOrEmpty($rgname)) { Get-ComputeTestResourceName } else { $rgname }
|
114 | 116 | $vmname = if ([string]::IsNullOrEmpty($vmname)) { 'vm' + $rgname } else { $vmname }
|
115 | 117 | $loc = if ([string]::IsNullOrEmpty($loc)) { Get-ComputeVMLocation } else { $loc }
|
116 |
| - Write-Host $vmname |
| 118 | + Write-Host $vmname |
117 | 119 |
|
118 | 120 | # Common
|
119 | 121 | $g = New-AzureRmResourceGroup -Name $rgname -Location $loc -Force;
|
@@ -479,17 +481,17 @@ function Get-SasUri
|
479 | 481 | {
|
480 | 482 | param ([string] $storageAccount, [string] $storageKey, [string] $container, [string] $file, [TimeSpan] $duration, [Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPermissions] $type)
|
481 | 483 |
|
482 |
| - $uri = [string]::Format("https://{0}.blob.core.windows.net/{1}/{2}", $storageAccount, $container, $file); |
| 484 | + $uri = [string]::Format("https://{0}.blob.core.windows.net/{1}/{2}", $storageAccount, $container, $file); |
483 | 485 |
|
484 |
| - $destUri = New-Object -TypeName System.Uri($uri); |
485 |
| - $cred = New-Object -TypeName Microsoft.WindowsAzure.Storage.Auth.StorageCredentials($storageAccount, $storageKey); |
486 |
| - $destBlob = New-Object -TypeName Microsoft.WindowsAzure.Storage.Blob.CloudPageBlob($destUri, $cred); |
487 |
| - $policy = New-Object Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy; |
488 |
| - $policy.Permissions = $type; |
489 |
| - $policy.SharedAccessExpiryTime = [DateTime]::UtcNow.Add($duration); |
490 |
| - $uri += $destBlob.GetSharedAccessSignature($policy); |
| 486 | + $destUri = New-Object -TypeName System.Uri($uri); |
| 487 | + $cred = New-Object -TypeName Microsoft.WindowsAzure.Storage.Auth.StorageCredentials($storageAccount, $storageKey); |
| 488 | + $destBlob = New-Object -TypeName Microsoft.WindowsAzure.Storage.Blob.CloudPageBlob($destUri, $cred); |
| 489 | + $policy = New-Object Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy; |
| 490 | + $policy.Permissions = $type; |
| 491 | + $policy.SharedAccessExpiryTime = [DateTime]::UtcNow.Add($duration); |
| 492 | + $uri += $destBlob.GetSharedAccessSignature($policy); |
491 | 493 |
|
492 |
| - return $uri; |
| 494 | + return $uri; |
493 | 495 | }
|
494 | 496 |
|
495 | 497 | # Get a Location according to resource provider.
|
@@ -564,13 +566,13 @@ function Get-SubscriptionIdFromResourceGroup
|
564 | 566 | {
|
565 | 567 | param ([string] $rgname)
|
566 | 568 |
|
567 |
| - $rg = Get-AzureRmResourceGroup -ResourceGroupName $rgname; |
| 569 | + $rg = Get-AzureRmResourceGroup -ResourceGroupName $rgname; |
568 | 570 |
|
569 |
| - $rgid = $rg.ResourceId; |
| 571 | + $rgid = $rg.ResourceId; |
570 | 572 |
|
571 |
| - # ResouceId is a form of "/subscriptions/<subId>/resourceGroups/<resourgGroupName>" |
572 |
| - # So return the second part to get subscription Id |
573 |
| - $first = $rgid.IndexOf('/', 1); |
574 |
| - $last = $rgid.IndexOf('/', $first + 1); |
575 |
| - return $rgid.Substring($first + 1, $last - $first - 1); |
| 573 | + # ResouceId is a form of "/subscriptions/<subId>/resourceGroups/<resourgGroupName>" |
| 574 | + # So return the second part to get subscription Id |
| 575 | + $first = $rgid.IndexOf('/', 1); |
| 576 | + $last = $rgid.IndexOf('/', $first + 1); |
| 577 | + return $rgid.Substring($first + 1, $last - $first - 1); |
576 | 578 | }
|
0 commit comments