Skip to content

Commit 86429af

Browse files
author
unknown
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 75c1733 + 40ff809 commit 86429af

File tree

51 files changed

+1986
-1114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1986
-1114
lines changed

‎ChangeLog.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
##2016.05.03 version 1.4.0
2+
* Azure Storage
3+
* Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
4+
* Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
5+
- New-AzureRmStorageAccount
6+
- Set-AzureRmStorageAccount
7+
* Add "Add" and "Create" permission to Blob SAS cmdlets
8+
- New-AzureStorageBlobSASToken
9+
- New-AzureStorageContainerSASToken
10+
- New-AzureStorageContainerStoredAccessPolicy
11+
- Set-AzureStorageContainerStoredAccessPolicy
12+
* Add "Create" permission to File SAS cmdlets
13+
- New-AzureStorageFileSASToken
14+
- New-AzureStorageShareSASToken
15+
- New-AzureStorageShareStoredAccessPolicy
16+
- Set-AzureStorageShareStoredAccessPolicy
17+
118
##2016.04.19 version 1.3.2
219
* Add support for specifying NIC/VMSS as application gateway backend address
320
* Fix HDI ADL cluster creation and live test

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2538,6 +2538,9 @@
25382538
<Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
25392539
<File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
25402540
</Component>
2541+
<Component Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" Guid="*">
2542+
<File Id="fil6C5492894C2F4DDD80E710891D53B6D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
2543+
</Component>
25412544
<Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
25422545
<File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
25432546
</Component>
@@ -5798,6 +5801,7 @@
57985801
<ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
57995802
<ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
58005803
<ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
5804+
<ComponentRef Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" />
58015805
<ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
58025806
<ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
58035807
<ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />

‎src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<Compile Include="Interfaces\IClientFactory.cs" />
150150
<Compile Include="Interfaces\IDataStore.cs" />
151151
<Compile Include="Interfaces\IProfileSerializer.cs" />
152+
<Compile Include="LegacySupport.cs" />
152153
<Compile Include="Models\AzureAccount.cs" />
153154
<Compile Include="Models\AzureAccount.Methods.cs" />
154155
<Compile Include="Models\AzureContext.cs" />

‎src/Common/Commands.Common.Authentication/LegacySupport.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.Azure.Commands.Common.Authentication;
16+
17+
namespace Microsoft.Azure.Common.Authentication
18+
{
19+
/// <summary>
20+
/// Provide backward compatibility for setting User Agent values
21+
/// </summary>
22+
public static class AzureSession
23+
{
24+
/// <summary>
25+
/// The ClientFactory used to produce management clients in this session
26+
/// </summary>
27+
public static IClientFactory ClientFactory
28+
{
29+
get { return Commands.Common.Authentication.AzureSession.ClientFactory; }
30+
}
31+
}
32+
}

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@
179179
</ProjectReference>
180180
</ItemGroup>
181181
<ItemGroup>
182+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
183+
<Link>ScenarioTests\AzureRM.Storage.ps1</Link>
184+
</None>
182185
<None Include="packages.config">
183186
<SubType>Designer</SubType>
184187
</None>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ private void RunPowerShellTest(params string[] scripts)
176176
_helper.RMProfileModule,
177177
_helper.RMResourceModule,
178178
_helper.RMStorageDataPlaneModule,
179-
_helper.RMStorageModule,
180-
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"));
179+
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"),
180+
"AzureRM.Storage.ps1");
181181

182182
_helper.RunPowerShellTest(scripts);
183183
}

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

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
2+
function Get-AzureRmStorageAccount
3+
{
4+
5+
[CmdletBinding()]
6+
param(
7+
[string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
8+
[string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
9+
BEGIN {
10+
$context = Get-Context
11+
$client = Get-StorageClient $context
12+
}
13+
PROCESS {
14+
$getTask = $client.StorageAccounts.GetPropertiesAsync($ResourceGroupName, $name, [System.Threading.CancellationToken]::None)
15+
$sa = $getTask.Result
16+
$account = Get-StorageAccount $ResourceGroupName $Name
17+
Write-Output $account
18+
}
19+
END {}
20+
21+
}
22+
23+
function New-AzureRmStorageAccount
24+
{
25+
[CmdletBinding()]
26+
param(
27+
[string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
28+
[string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)][alias("StorageAccountName")] $Name,
29+
[string] [Parameter(Position=2, ValueFromPipelineByPropertyName=$true)] $Location,
30+
[string] [Parameter(Position=3, ValueFromPipelineByPropertyName=$true)] $Type)
31+
BEGIN {
32+
$context = Get-Context
33+
$client = Get-StorageClient $context
34+
}
35+
PROCESS {
36+
$createParms = New-Object -Type Microsoft.Azure.Management.Storage.Models.StorageAccountCreateParameters
37+
$createParms.AccountType = [Microsoft.Azure.Management.Storage.Models.AccountType]::StandardLRS
38+
$createParms.Location = $Location
39+
$getTask = $client.StorageAccounts.CreateAsync($ResourceGroupName, $name, $createParms, [System.Threading.CancellationToken]::None)
40+
$sa = $getTask.Result
41+
}
42+
END {}
43+
44+
}
45+
46+
function Get-AzureRmStorageAccountKey
47+
{
48+
[CmdletBinding()]
49+
param(
50+
[string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
51+
[string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
52+
BEGIN {
53+
$context = Get-Context
54+
$client = Get-StorageClient $context
55+
}
56+
PROCESS {
57+
$getTask = $client.StorageAccounts.ListKeysAsync($ResourceGroupName, $name, [System.Threading.CancellationToken]::None)
58+
Write-Output $getTask.Result.StorageAccountKeys
59+
}
60+
END {}
61+
}
62+
63+
function Remove-AzureRmStorageAccount
64+
{
65+
66+
[CmdletBinding()]
67+
param(
68+
[string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
69+
[string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
70+
BEGIN {
71+
$context = Get-Context
72+
$client = Get-StorageClient $context
73+
}
74+
PROCESS {
75+
$getTask = $client.StorageAccounts.DeleteAsync($ResourceGroupName, $name, [System.Threading.CancellationToken]::None)
76+
$sa = $getTask.Result
77+
}
78+
END {}
79+
80+
}
81+
82+
function Get-Context
83+
{
84+
[Microsoft.Azure.Commands.Common.Authentication.Models.AzureContext]$context = $null
85+
$profile = [Microsoft.WindowsAzure.Commands.Common.AzureRmProfileProvider]::Instance.Profile
86+
if ($profile -ne $null)
87+
{
88+
$context = $profile.Context
89+
}
90+
91+
return $context
92+
}
93+
94+
function Get-StorageClient
95+
{
96+
param([Microsoft.Azure.Commands.Common.Authentication.Models.AzureContext] $context)
97+
$factory = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::ClientFactory
98+
[System.Type[]]$types = [Microsoft.Azure.Commands.Common.Authentication.Models.AzureContext], [Microsoft.Azure.Commands.Common.Authentication.Models.AzureEnvironment+Endpoint]
99+
$method = [Microsoft.Azure.Commands.Common.Authentication.IClientFactory].GetMethod("CreateClient", $types)
100+
$closedMethod = $method.MakeGenericMethod([Microsoft.Azure.Management.Storage.StorageManagementClient])
101+
$arguments = $context, [Microsoft.Azure.Commands.Common.Authentication.Models.AzureEnvironment+Endpoint]::ResourceManager
102+
$client = $closedMethod.Invoke($factory, $arguments)
103+
return $client
104+
}
105+
106+
function Get-StorageAccount {
107+
param([string] $resourceGroupName, [string] $name)
108+
$endpoints = New-Object PSObject -Property @{"Blob" = "https://$name.blob.core.windows.net/"}
109+
$sa = New-Object PSObject -Property @{"Name" = $name; "ResourceGroupName" = $resourceGroupName;
110+
"PrimaryEndpoints" = $endpoints
111+
}
112+
return $sa
113+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@
161161
<None Include="Assert.ps1">
162162
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
163163
</None>
164+
<None Include="AzureRM.Storage.ps1">
165+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
166+
</None>
164167
<None Include="Common.ps1">
165168
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
166169
</None>

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@
218218
<Link>ScenarioTests\Assert.ps1</Link>
219219
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
220220
</None>
221+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
222+
<Link>ScenarioTests\AzureRM.Storage.ps1</Link>
223+
</None>
221224
<None Include="..\..\Resources\Commands.Resources.Test\ScenarioTests\Common.ps1">
222225
<Link>ScenarioTests\Common.ps1</Link>
223226
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ public void RunPsTestWorkflow(
134134
helper.RMStorageDataPlaneModule,
135135
helper.RMStorageModule,
136136
helper.GetRMModulePath("AzureRM.Compute.psd1"),
137-
helper.GetRMModulePath("AzureRM.Network.psd1"));
137+
helper.GetRMModulePath("AzureRM.Network.psd1"),
138+
"AzureRM.Storage.ps1");
138139

139140
try
140141
{

‎src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/RemoveAzureResourceLockCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
2020
/// <summary>
2121
/// The remove azure resource lock cmdlet.
2222
/// </summary>
23-
[Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true), OutputType(typeof(PSObject))]
23+
[Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.LockIdParameterSet), OutputType(typeof(PSObject))]
2424
public class RemoveAzureResourceLockCmdlet : ResourceLockManagementCmdletBase
2525
{
2626
/// <summary>

‎src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll-Help.xml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4861,17 +4861,26 @@
48614861
</maml:alertSet>
48624862
<command:examples>
48634863
<command:example>
4864-
<maml:title>-------------------------- RemoveLock1 --------------------------</maml:title>
4864+
<maml:title>-------------------------- Example 1: RemoveLock using ResourceId --------------------------</maml:title>
48654865
<maml:introduction>
4866-
<maml:paragraph>PS C:\&gt;</maml:paragraph>
48674866
</maml:introduction>
48684867
<dev:code>Remove-AzureRmResourceLock -ResourceId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
48694868
<dev:remarks>
4870-
<maml:para />
4871-
<maml:para />
4872-
<maml:para />
4873-
<maml:para>
4874-
</maml:para>
4869+
</dev:remarks>
4870+
<command:commandLines>
4871+
<command:commandLine>
4872+
<command:commandText>
4873+
<maml:para />
4874+
</command:commandText>
4875+
</command:commandLine>
4876+
</command:commandLines>
4877+
</command:example>
4878+
<command:example>
4879+
<maml:title>-------------------------- Example 2: RemoveLock using LockId --------------------------</maml:title>
4880+
<maml:introduction>
4881+
</maml:introduction>
4882+
<dev:code>Remove-AzureRmResourceLock -LockId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
4883+
<dev:remarks>
48754884
</dev:remarks>
48764885
<command:commandLines>
48774886
<command:commandLine>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ function Test-ResourceLockCRUD
4141
$removed = Remove-AzureRMResourceLock -LockId $expectedSet.LockId -Force
4242
Assert-AreEqual True $removed
4343

44+
$actual = New-AzureRMResourceLock -LockName $rname -LockLevel CanNotDelete -Force -Scope $rg.ResourceId
45+
$removed = Remove-AzureRMResourceLock -ResourceId $actual.ResourceId -Force
46+
Assert-AreEqual True $removed
47+
4448
}

‎src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceLockTests/TestResourceLockCRUDTest.json

Lines changed: 162 additions & 168 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,5 +295,9 @@ function Get-SqlDatabaseImportExportTestEnvironmentParameters ($testSuffix)
295295
importBacpacUri = $importBacpacUri;
296296
location = "Australia East";
297297
version = "12.0";
298+
databaseEdition = "Standard";
299+
serviceObjectiveName = "S0";
300+
databaseMaxSizeBytes = "5000000";
301+
authType = "Sql";
298302
}
299303
}

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ImportExportTests.ps1

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,36 @@ function Test-ImportDatabase
7676

7777
if($operationName -eq $export){
7878
# Export database.
79-
$exportResponse = New-AzureRmSqlDatabaseExport -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageKeyType $params.storageKeyType -StorageKey $params.storageKey -StorageUri $params.exportBacpacUri -AdministratorLogin $params.userName -AdministratorLoginPassword $secureString -AuthenticationType Sql
79+
$exportResponse = New-AzureRmSqlDatabaseExport -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageKeyType $params.storageKeyType -StorageKey $params.storageKey -StorageUri $params.exportBacpacUri -AdministratorLogin $params.userName -AdministratorLoginPassword $secureString -AuthenticationType $params.authType
8080
Assert-NotNull $exportResponse
81-
$operationStatusLink = $exportResponse.OperationStatusLink
81+
$operationStatusLink = $exportResponse.OperationStatusLink
82+
Assert-AreEqual $exportResponse.ResourceGroupName $params.rgname
83+
Assert-AreEqual $exportResponse.ServerName $params.serverName
84+
Assert-AreEqual $exportResponse.DatabaseName $params.databaseName
85+
Assert-AreEqual $exportResponse.StorageKeyType $params.storageKeyType
86+
Assert-Null $exportResponse.StorageKey
87+
Assert-AreEqual $exportResponse.StorageUri $params.exportBacpacUri
88+
Assert-AreEqual $exportResponse.AdministratorLogin $params.userName
89+
Assert-Null $exportResponse.AdministratorLoginPassword
90+
Assert-AreEqual $exportResponse.AuthenticationType $params.authType
8291
}
8392

8493
if($operationName -eq $import){
85-
$importResponse = New-AzureRmSqlDatabaseImport -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageKeyType $params.storageKeyType -StorageKey $params.storageKey -StorageUri $params.importBacpacUri -AdministratorLogin $params.userName -AdministratorLoginPassword $secureString -Edition Standard -ServiceObjectiveName S0 -DatabaseMaxSizeBytes 5000000 -AuthenticationType Sql
94+
$importResponse = New-AzureRmSqlDatabaseImport -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageKeyType $params.storageKeyType -StorageKey $params.storageKey -StorageUri $params.importBacpacUri -AdministratorLogin $params.userName -AdministratorLoginPassword $secureString -Edition $params.databaseEdition -ServiceObjectiveName $params.serviceObjectiveName -DatabaseMaxSizeBytes $params.databaseMaxSizeBytes -AuthenticationType $params.authType
8695
Assert-NotNull $importResponse
8796
$operationStatusLink = $importResponse.OperationStatusLink
97+
Assert-AreEqual $importResponse.ResourceGroupName $params.rgname
98+
Assert-AreEqual $importResponse.ServerName $params.serverName
99+
Assert-AreEqual $importResponse.DatabaseName $params.databaseName
100+
Assert-AreEqual $importResponse.StorageKeyType $params.storageKeyType
101+
Assert-Null $importResponse.StorageKey
102+
Assert-AreEqual $importResponse.StorageUri $params.importBacpacUri
103+
Assert-AreEqual $importResponse.AdministratorLogin $params.userName
104+
Assert-Null $importResponse.AdministratorLoginPassword
105+
Assert-AreEqual $importResponse.AuthenticationType $params.authType
106+
Assert-AreEqual $importResponse.Edition $params.databaseEdition
107+
Assert-AreEqual $importResponse.ServiceObjectiveName $params.serviceObjectiveName
108+
Assert-AreEqual $importResponse.DatabaseMaxSizeBytes $params.databaseMaxSizeBytes
88109
}
89110

90111
Assert-NotNull $operationStatusLink
@@ -98,8 +119,14 @@ function Test-ImportDatabase
98119
Write-Output "Getting Status"
99120
while($status -eq $statusInProgress){
100121
$statusResponse = Get-AzureRmSqlDatabaseImportExportStatus -OperationStatusLink $operationStatusLink
101-
Write-Output "Import Export Status Message:" + $statusResponse.StatusMessage
122+
Write-Output "Import Export Status Message:" + $statusResponse.StatusMessage
123+
Assert-AreEqual $statusResponse.OperationStatusLink $operationStatusLink
102124
$status = $statusResponse.Status
125+
if($status -eq $statusInProgress){
126+
Assert-NotNull $statusResponse.LastModifiedTime
127+
Assert-NotNull $statusResponse.QueuedTime
128+
Assert-NotNull $statusResponse.StatusMessage
129+
}
103130
}
104131
Assert-AreEqual $status $statusSucceeded
105132
Write-Output "ImportExportStatus:" + $status

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ protected void RunPowerShellTest(params string[] scripts)
8484
"ScenarioTests\\" + this.GetType().Name + ".ps1",
8585
helper.RMProfileModule,
8686
helper.RMResourceModule,
87-
helper.RMStorageDataPlaneModule,
88-
helper.RMStorageModule,
87+
helper.RMStorageDataPlaneModule,
8988
helper.GetRMModulePath(@"AzureRM.Insights.psd1"),
90-
helper.GetRMModulePath(@"AzureRM.Sql.psd1"));
89+
helper.GetRMModulePath(@"AzureRM.Sql.psd1"),
90+
"AzureRM.Storage.ps1");
9191
helper.RunPowerShellTest(scripts);
9292
}
9393
}

0 commit comments

Comments
 (0)