Skip to content

Commit 6ec3ca3

Browse files
MiYanniMiYanni
authored
Merge pull request Azure#7091 from wastoresh/worm-preview
[Storage] Support Immunablity Policy in Official powershell release
2 parents 8ac94d8 + 1693f8c commit 6ec3ca3

File tree

58 files changed

+13798
-3203
lines changed

Some content is hidden

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

58 files changed

+13798
-3203
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
3030
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
31-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
31+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
3232
<PackageReference Include="Moq" Version="4.7.145" />
3333
</ItemGroup>
3434

‎src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,10 +1205,12 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12051205
},
12061206
'Az.Storage': {
12071207
'New-AzStorageQueueSASToken': 'New-AzureStorageQueueSASToken',
1208+
'Get-AzRmStorageContainer': 'Get-AzureRmStorageContainer',
12081209
'Get-AzStorageFileContent': 'Get-AzureStorageFileContent',
12091210
'Remove-AzStorageFile': 'Remove-AzureStorageFile',
12101211
'Set-AzCurrentStorageAccount': 'Set-AzureRmCurrentStorageAccount',
12111212
'Get-AzStorageUsage': 'Get-AzureRmStorageUsage',
1213+
'Enable-AzStorageStaticWebsite': 'Enable-AzureStorageStaticWebsite',
12121214
'Get-AzStorageQueue': 'Get-AzureStorageQueue',
12131215
'Enable-AzStorageDeleteRetentionPolicy': 'Enable-AzureStorageDeleteRetentionPolicy',
12141216
'Update-AzStorageServiceProperty': 'Update-AzureStorageServiceProperty',
@@ -1225,53 +1227,62 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12251227
'Remove-AzStorageShare': 'Remove-AzureStorageShare',
12261228
'Set-AzStorageShareQuota': 'Set-AzureStorageShareQuota',
12271229
'Get-AzStorageBlobContent': 'Get-AzureStorageBlobContent',
1230+
'Update-AzRmStorageContainer': 'Update-AzureRmStorageContainer',
12281231
'New-AzStorageDirectory': 'New-AzureStorageDirectory',
12291232
'New-AzStorageTableSASToken': 'New-AzureStorageTableSASToken',
12301233
'Set-AzStorageAccount': 'Set-AzureRmStorageAccount',
12311234
'New-AzStorageQueue': 'New-AzureStorageQueue',
12321235
'Remove-AzStorageTable': 'Remove-AzureStorageTable',
1236+
'Get-AzStorageFile': 'Get-AzureStorageFile',
12331237
'Get-AzStorageShareStoredAccessPolicy': 'Get-AzureStorageShareStoredAccessPolicy',
1238+
'Set-AzStorageContainerAcl': 'Set-AzureStorageContainerAcl',
1239+
'Remove-AzRmStorageContainer': 'Remove-AzureRmStorageContainer',
12341240
'Update-AzStorageAccountNetworkRuleSet': 'Update-AzureRmStorageAccountNetworkRuleSet',
12351241
'Set-AzStorageBlobContent': 'Set-AzureStorageBlobContent',
12361242
'Start-AzStorageBlobCopy': 'Start-AzureStorageBlobCopy',
12371243
'Set-AzStorageQueueStoredAccessPolicy': 'Set-AzureStorageQueueStoredAccessPolicy',
12381244
'New-AzStorageAccount': 'New-AzureRmStorageAccount',
12391245
'New-AzStorageAccountSASToken': 'New-AzureStorageAccountSASToken',
1240-
'Get-AzStorageServiceLoggingProperty': 'Get-AzureStorageServiceLoggingProperty',
1246+
'Get-AzStorageBlob': 'Get-AzureStorageBlob',
12411247
'New-AzStorageContainer': 'New-AzureStorageContainer',
1248+
'New-AzRmStorageContainer': 'New-AzureRmStorageContainer',
12421249
'Get-AzStorageContainer': 'Get-AzureStorageContainer',
1250+
'Get-AzStorageTableStoredAccessPolicy': 'Get-AzureStorageTableStoredAccessPolicy',
12431251
'New-AzStorageContext': 'New-AzureStorageContext',
12441252
'Enable-AzStorageSoftDelete': 'Enable-AzureStorageSoftDelete',
12451253
'Remove-AzStorageShareStoredAccessPolicy': 'Remove-AzureStorageShareStoredAccessPolicy',
12461254
'Get-AzStorageQueueStoredAccessPolicy': 'Get-AzureStorageQueueStoredAccessPolicy',
12471255
'New-AzStorageFileSASToken': 'New-AzureStorageFileSASToken',
12481256
'Remove-AzStorageAccountNetworkRule': 'Remove-AzureRmStorageAccountNetworkRule',
12491257
'Set-AzStorageServiceLoggingProperty': 'Set-AzureStorageServiceLoggingProperty',
1258+
'Get-AzRmStorageContainerImmutabilityPolicy': 'Get-AzureRmStorageContainerImmutabilityPolicy',
12501259
'New-AzStorageTableStoredAccessPolicy': 'New-AzureStorageTableStoredAccessPolicy',
12511260
'Add-AzStorageAccountNetworkRule': 'Add-AzureRmStorageAccountNetworkRule',
12521261
'Disable-AzStorageSoftDelete': 'Disable-AzureStorageSoftDelete',
1253-
'Get-AzStorageFile': 'Get-AzureStorageFile',
1262+
'Remove-AzRmStorageContainerImmutabilityPolicy': 'Remove-AzureRmStorageContainerImmutabilityPolicy',
1263+
'Set-AzStorageTableStoredAccessPolicy': 'Set-AzureStorageTableStoredAccessPolicy',
12541264
'Remove-AzStorageQueueStoredAccessPolicy': 'Remove-AzureStorageQueueStoredAccessPolicy',
12551265
'Set-AzStorageContainerStoredAccessPolicy': 'Set-AzureStorageContainerStoredAccessPolicy',
12561266
'Remove-AzStorageAccount': 'Remove-AzureRmStorageAccount',
12571267
'Get-AzStorageServiceMetricsProperty': 'Get-AzureStorageServiceMetricsProperty',
1258-
'New-AzStorageShareStoredAccessPolicy': 'New-AzureStorageShareStoredAccessPolicy',
12591268
'New-AzStorageContainerStoredAccessPolicy': 'New-AzureStorageContainerStoredAccessPolicy',
1260-
'Get-AzStorageTableStoredAccessPolicy': 'Get-AzureStorageTableStoredAccessPolicy',
1269+
'Disable-AzStorageStaticWebsite': 'Disable-AzureStorageStaticWebsite',
1270+
'Lock-AzRmStorageContainerImmutabilityPolicy': 'Lock-AzureRmStorageContainerImmutabilityPolicy',
1271+
'Add-AzRmStorageContainerLegalHold': 'Add-AzureRmStorageContainerLegalHold',
12611272
'Remove-AzStorageBlob': 'Remove-AzureStorageBlob',
12621273
'Remove-AzStorageContainerStoredAccessPolicy': 'Remove-AzureStorageContainerStoredAccessPolicy',
1274+
'Remove-AzRmStorageContainerLegalHold': 'Remove-AzureRmStorageContainerLegalHold',
12631275
'Remove-AzStorageTableStoredAccessPolicy': 'Remove-AzureStorageTableStoredAccessPolicy',
12641276
'Start-AzStorageFileCopy': 'Start-AzureStorageFileCopy',
12651277
'New-AzStorageAccountKey': 'New-AzureRmStorageAccountKey',
1266-
'Set-AzStorageTableStoredAccessPolicy': 'Set-AzureStorageTableStoredAccessPolicy',
1278+
'New-AzStorageShareStoredAccessPolicy': 'New-AzureStorageShareStoredAccessPolicy',
12671279
'Stop-CopyAzureStorageBlob': 'Stop-CopyAzureStorageBlob',
12681280
'Disable-AzStorageDeleteRetentionPolicy': 'Disable-AzureStorageDeleteRetentionPolicy',
12691281
'Set-AzStorageServiceMetricsProperty': 'Set-AzureStorageServiceMetricsProperty',
12701282
'New-AzStorageContainerSASToken': 'New-AzureStorageContainerSASToken',
12711283
'New-AzStorageShare': 'New-AzureStorageShare',
1272-
'Set-AzStorageContainerAcl': 'Set-AzureStorageContainerAcl',
1284+
'Get-AzStorageServiceLoggingProperty': 'Get-AzureStorageServiceLoggingProperty',
12731285
'New-AzStorageQueueStoredAccessPolicy': 'New-AzureStorageQueueStoredAccessPolicy',
1274-
'Get-AzStorageBlob': 'Get-AzureStorageBlob',
12751286
'Get-AzStorageServiceProperty': 'Get-AzureStorageServiceProperty',
12761287
'New-AzStorageBlobSASToken': 'New-AzureStorageBlobSASToken',
12771288
'Remove-AzStorageCORSRule': 'Remove-AzureStorageCORSRule',
@@ -1287,7 +1298,8 @@ public static Dictionary<string, object> GetCaseInsensitiveMapping()
12871298
'Remove-AzStorageContainer': 'Remove-AzureStorageContainer',
12881299
'Start-AzStorageBlobIncrementalCopy': 'Start-AzureStorageBlobIncrementalCopy',
12891300
'Get-AzStorageFileCopyState': 'Get-AzureStorageFileCopyState',
1290-
'Get-AzStorageAccount': 'Get-AzureRmStorageAccount'
1301+
'Get-AzStorageAccount': 'Get-AzureRmStorageAccount',
1302+
'Set-AzRmStorageContainerImmutabilityPolicy': 'Set-AzureRmStorageContainerImmutabilityPolicy'
12911303
},
12921304
'Az.Insights': {
12931305
'Remove-AzAlertRule': 'Remove-AzureRmAlertRule',

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.Netcore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.18.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
29+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
2930
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.2.0-preview" />
3031
</ItemGroup>
3132

‎src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.18.0-preview" />
32-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
3333
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3434
</ItemGroup>
3535

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
27+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Microsoft.Azure.Management.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.7.1.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
38+
<Reference Include="Microsoft.Azure.Management.Storage, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.8.1.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
4040
</Reference>
4141
</ItemGroup>
4242
<ItemGroup>
4343
<Compile Include="Properties\AssemblyInfo.cs" />
4444
<Compile Include="ScenarioTests\StorageAccountTests.cs" />
45+
<Compile Include="ScenarioTests\StorageBlobTests.cs" />
4546
<Compile Include="TestController.cs" />
4647
</ItemGroup>
4748
<ItemGroup>
@@ -59,48 +60,18 @@
5960
<SubType>Designer</SubType>
6061
</None>
6162
<None Include="ScenarioTests\Common.ps1">
62-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
63-
</None>
64-
<None Include="ScenarioTests\StorageAccountTests.ps1">
65-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
66-
</None>
67-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestGetAzureStorageAccount.json">
68-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69-
</None>
70-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestGetAzureStorageAccountKey.json">
71-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72-
</None>
73-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestNetworkRule.json">
74-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
75-
</None>
76-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestNewAzureStorageAccount.json">
77-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78-
</None>
79-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestNewAzureStorageAccountKey.json">
80-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81-
</None>
82-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestPipingGetAccountToGetKey.json">
83-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84-
</None>
85-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestPipingSetStorageAccount.json">
8663
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8764
</None>
88-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestRemoveAzureStorageAccount.json">
89-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90-
</None>
91-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureRmStorageAccountKeySource.json">
92-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
93-
</None>
94-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccount.json">
65+
<None Include="ScenarioTests\StorageAccountTests.ps1">
9566
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9667
</None>
97-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetCurrentStorageAccount.json">
68+
<None Include="ScenarioTests\StorageBlobTests.ps1">
9869
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9970
</None>
100-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestStorageAccount.json">
71+
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\*.json">
10172
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10273
</None>
103-
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests\TestSetAzureStorageAccountStorageV2.json">
74+
<None Include="SessionRecords\Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageBlobTests\*.json">
10475
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10576
</None>
10677
</ItemGroup>

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/ScenarioTests/StorageBlobTests.cs

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
16+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
17+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19+
using Xunit;
20+
using Xunit.Abstractions;
21+
22+
namespace Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests
23+
{
24+
public class StorageBlobTests : RMTestBase
25+
{
26+
public XunitTracingInterceptor _logger;
27+
28+
public StorageBlobTests(ITestOutputHelper output)
29+
{
30+
_logger = new XunitTracingInterceptor(output);
31+
XunitTracingInterceptor.AddToContext(_logger);
32+
}
33+
34+
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
public void TestStorageBlobContainer()
37+
{
38+
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainer");
39+
}
40+
41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
43+
public void TestStorageBlobContainerLegalHold()
44+
{
45+
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainerLegalHold");
46+
}
47+
48+
[Fact]
49+
[Trait(Category.AcceptanceType, Category.CheckIn)]
50+
public void TestStorageBlobContainerImmutabilityPolicy()
51+
{
52+
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainerImmutabilityPolicy");
53+
}
54+
}
55+
}

0 commit comments

Comments
 (0)