Skip to content

Commit 76570c0

Browse files
bluewwblueww
authored
[Storage] Add preview code change (Azure#11474)
## Upcoming Release * Support create/update/get/list EncryptionScope of a Storage account - New-AzStorageEncryptionScope - Update-AzStorageEncryptionScope - Get-AzStorageEncryptionScope * Support create Storage Container with EncryptionScope settings - New-AzRmStorageContainer * Support update Storage account with encryted by Keyvault without Keyversion - Set-AzStorageAccount ## Version 1.13.3 * Upgrade DataLake Gen2 cmdlets to use new SDK "Azure.Storage.Files.DataLake", and remove 2 parameter -ServerTimeoutPerRequest, -ClientTimeoutPerRequest - New-AzDataLakeGen2Item - Get-AzDataLakeGen2Item - Get-AzDataLakeGen2ChildItem - Move-AzDataLakeGen2Item - Set-AzDataLakeGen2ItemAclObject - Update-AzDataLakeGen2Item - Get-AzDataLakeGen2ItemContent - Remove-AzDataLakeGen2Item * Change cmdlet name from New-AzDataLakeGen2ItemAclObject to Set-AzDataLakeGen2ItemAclObject, and when InputObject already has an ACL entry with same AccessControlType/EntityId/DefaultScope, will update permission of ACL entry instead of adding new ACL entry. - Set-AzDataLakeGen2ItemAclObject * Change -Path parameter to optional, don't set -Path will get/update FileSystem root Directory - Get-AzDataLakeGen2Item - Update-AzDataLakeGen2Item * In list DataLakeGen2 items, support -OutputUserPrincipalName, and change -FetchPermission to -Fetchproperties - Get-AzDataLakeGen2ChildItem * In move DataLakeGen2 item, remove 2 parameters -Umask, -PathRenameMode, and add -Force to skip overwrite confirmation prompt. - Move-AzDataLakeGen2Item ## Version 1.13.1 * Support Point In Time Restore - Enable-AzStorageBlobRestorePolicy - Disable-AzStorageBlobRestorePolicy - New-AzStorageBlobRangeToRestore - Restore-AzStorageBlobRange * Support get blob restore status of Storage account by run get-AzureRMStorageAccount with parameter -IncludeBlobRestoreStatus - Get-AzureRMStorageAccount
1 parent d9dd75c commit 76570c0

File tree

118 files changed

+19443
-218
lines changed

Some content is hidden

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

118 files changed

+19443
-218
lines changed

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<!-- Delete powershell runtime files -->
174174
<PropertyGroup>
175175
<RuntimeDllsIncludeList>Microsoft.Powershell.*.dll,System*.dll,Microsoft.VisualBasic.dll,Microsoft.CSharp.dll,Microsoft.CodeAnalysis.dll,Microsoft.CodeAnalysis.CSharp.dll</RuntimeDllsIncludeList>
176-
<RuntimeDllsExcludeList>System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll</RuntimeDllsExcludeList>
176+
<RuntimeDllsExcludeList>System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll,System.Text.Json.dll,System.Threading.Tasks.Extensions.dll</RuntimeDllsExcludeList>
177177
</PropertyGroup>
178178
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include $(RuntimeDllsIncludeList) -Exclude $(RuntimeDllsExcludeList) | Where-Object {$_.FullName -notlike '*PreloadAssemblies*' -and $_.FullName -notlike '*NetCoreAssemblies*'} | Remove-Item -Force&quot;" />
179179
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include 'runtimes' | Remove-Item -Recurse -Force&quot;" Condition="'$(CodeSign)' == 'true'" />

‎src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
1717
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
18-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
18+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="15.0.0" />
1919
</ItemGroup>
2020

2121
</Project>

‎src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,13 @@ public void TestNewAzureStorageAccountBlockBlobStorage()
142142
TestRunner.RunTestScript("Test-NewAzureStorageAccountBlockBlobStorage");
143143
}
144144

145+
[Fact]
146+
[Trait(Category.AcceptanceType, Category.CheckIn)]
147+
public void TestFailoverAzureStorageAccount()
148+
{
149+
TestRunner.RunTestScript("Test-FailoverAzureStorageAccount");
150+
}
151+
145152
[Fact]
146153
[Trait(Category.AcceptanceType, Category.CheckIn)]
147154
public void TestGetAzureStorageAccountGeoReplicationStats()
@@ -170,6 +177,20 @@ public void TestStorageAccountManagementPolicy()
170177
TestRunner.RunTestScript("Test-StorageAccountManagementPolicy");
171178
}
172179

180+
[Fact]
181+
[Trait(Category.AcceptanceType, Category.CheckIn)]
182+
public void TestNewSetAzureStorageAccountGZRS()
183+
{
184+
TestRunner.RunTestScript("Test-NewSetAzureStorageAccount_GZRS");
185+
}
186+
187+
[Fact]
188+
[Trait(Category.AcceptanceType, Category.CheckIn)]
189+
public void TestNewSetAzureStorageAccountRAGZRS()
190+
{
191+
TestRunner.RunTestScript("Test-NewSetAzureStorageAccount_RAGZRS");
192+
}
193+
173194
[Fact]
174195
[Trait(Category.AcceptanceType, Category.CheckIn)]
175196
public void TestNewSetAzureStorageAccount_LargeFileShare()

‎src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,52 @@ function Test-GetAzureStorageLocationUsage
836836
Assert-AreNotEqual 0 $usage.CurrentValue;
837837
}
838838

839+
<#
840+
.SYNOPSIS
841+
Test Invoke-AzStorageAccountFailover
842+
.DESCRIPTION
843+
Smoke[Broken]Test
844+
#>
845+
function Test-FailoverAzureStorageAccount
846+
{
847+
# Setup
848+
$rgname = Get-StorageManagementTestResourceName;
849+
850+
try
851+
{
852+
# Test
853+
$stoname = 'sto' + $rgname;
854+
$stotype = 'Standard_RAGRS';
855+
$kind = 'StorageV2'
856+
857+
$loc = Get-ProviderLocation_Canary ResourceManagement;
858+
New-AzResourceGroup -Name $rgname -Location $loc;
859+
860+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
861+
$sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
862+
Assert-AreEqual $stoname $sto.StorageAccountName;
863+
Assert-AreEqual $stotype $sto.Sku.Name;
864+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
865+
Assert-AreEqual $kind $sto.Kind;
866+
$seconcaryLocation = $sto.SecondaryLocation
867+
868+
#Invoke Failover
869+
$job = Invoke-AzStorageAccountFailover -ResourceGroupName $rgname -Name $stoname -Force -AsJob
870+
$job | Wait-Job
871+
872+
$sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname;
873+
Assert-AreEqual $seconcaryLocation $sto.PrimaryLocation;
874+
Assert-AreEqual 'Standard_LRS' $sto.Sku.Name;
875+
876+
Retry-IfException { Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname; }
877+
}
878+
finally
879+
{
880+
# Cleanup
881+
Clean-ResourceGroup $rgname
882+
}
883+
}
884+
839885
<#
840886
.SYNOPSIS
841887
Test Get-AzStorageAccount with -IncludeGeoReplicationStats
@@ -1098,6 +1144,102 @@ function Test-StorageAccountManagementPolicy
10981144
}
10991145
}
11001146

1147+
<#
1148+
.SYNOPSIS
1149+
Test Test-NewSetAzureStorageAccount_GZRS
1150+
.DESCRIPTION
1151+
SmokeTest
1152+
#>
1153+
function Test-NewSetAzureStorageAccount_GZRS
1154+
{
1155+
# Setup
1156+
$rgname = Get-StorageManagementTestResourceName;
1157+
1158+
try
1159+
{
1160+
# Test
1161+
$stoname = 'sto' + $rgname;
1162+
$stotype = 'Standard_GZRS';
1163+
$loc = Get-ProviderLocation_Canary ResourceManagement;
1164+
$kind = 'StorageV2'
1165+
1166+
New-AzResourceGroup -Name $rgname -Location $loc;
1167+
Write-Output ("Resource Group created")
1168+
1169+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype ;
1170+
1171+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1172+
Assert-AreEqual $stoname $sto.StorageAccountName;
1173+
Assert-AreEqual $stotype $sto.Sku.Name;
1174+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1175+
Assert-AreEqual $kind $sto.Kind;
1176+
1177+
$stotype = 'Standard_RAGZRS';
1178+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -SkuName $stotype ;
1179+
1180+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1181+
Assert-AreEqual $stoname $sto.StorageAccountName;
1182+
Assert-AreEqual $stotype $sto.Sku.Name;
1183+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1184+
Assert-AreEqual $kind $sto.Kind;
1185+
1186+
Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
1187+
}
1188+
finally
1189+
{
1190+
# Cleanup
1191+
Clean-ResourceGroup $rgname
1192+
}
1193+
}
1194+
1195+
<#
1196+
.SYNOPSIS
1197+
Test Test-NewAzureStorageAccount_RAGZRS
1198+
.DESCRIPTION
1199+
SmokeTest
1200+
#>
1201+
function Test-NewSetAzureStorageAccount_RAGZRS
1202+
{
1203+
# Setup
1204+
$rgname = Get-StorageManagementTestResourceName;
1205+
1206+
try
1207+
{
1208+
# Test
1209+
$stoname = 'sto' + $rgname;
1210+
$stotype = 'Standard_RAGZRS';
1211+
$loc = Get-ProviderLocation_Canary ResourceManagement;
1212+
$kind = 'StorageV2'
1213+
1214+
New-AzResourceGroup -Name $rgname -Location $loc;
1215+
Write-Output ("Resource Group created")
1216+
1217+
New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype ;
1218+
1219+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1220+
Assert-AreEqual $stoname $sto.StorageAccountName;
1221+
Assert-AreEqual $stotype $sto.Sku.Name;
1222+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1223+
Assert-AreEqual $kind $sto.Kind;
1224+
1225+
$stotype = 'Standard_GZRS';
1226+
Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -SkuName $stotype ;
1227+
1228+
Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
1229+
Assert-AreEqual $stoname $sto.StorageAccountName;
1230+
Assert-AreEqual $stotype $sto.Sku.Name;
1231+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
1232+
Assert-AreEqual $kind $sto.Kind;
1233+
1234+
Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
1235+
}
1236+
finally
1237+
{
1238+
# Cleanup
1239+
Clean-ResourceGroup $rgname
1240+
}
1241+
}
1242+
11011243
<#
11021244
.SYNOPSIS
11031245
Test Test-NewSetAzureStorageAccount_LargeFileShare

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ public void TestStorageBlobContainer()
3838
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainer");
3939
}
4040

41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
43+
public void TestStorageBlobContainerEncryptionScope()
44+
{
45+
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainerEncryptionScope");
46+
}
47+
4148
[Fact]
4249
[Trait(Category.AcceptanceType, Category.CheckIn)]
4350
public void TestStorageBlobContainerLegalHold()
@@ -57,6 +64,13 @@ public void TestStorageBlobContainerImmutabilityPolicy()
5764
public void TestStorageBlobServiceProperties()
5865
{
5966
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobServiceProperties");
60-
}
67+
}
68+
69+
[Fact]
70+
[Trait(Category.AcceptanceType, Category.CheckIn)]
71+
public void TestStorageBlobRestore()
72+
{
73+
TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobRestore");
74+
}
6175
}
6276
}

0 commit comments

Comments
 (0)