Skip to content

Commit da6585c

Browse files
authored
Merge pull request #8748 from wastoresh/lifecycle
[Storage] Support Lifecycle GA
2 parents 177a336 + c978daf commit da6585c

File tree

51 files changed

+10018
-8103
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

+10018
-8103
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,12 @@ public void TestNewAzureStorageAccountBlockBlobStorage()
134134
{
135135
TestRunner.RunTestScript("Test-NewAzureStorageAccountBlockBlobStorage");
136136
}
137+
138+
[Fact]
139+
[Trait(Category.AcceptanceType, Category.CheckIn)]
140+
public void TestStorageAccountManagementPolicy()
141+
{
142+
TestRunner.RunTestScript("Test-StorageAccountManagementPolicy");
143+
}
137144
}
138145
}

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

Lines changed: 124 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,4 +755,127 @@ function Test-NewAzureStorageAccountBlockBlobStorage
755755
# Cleanup
756756
Clean-ResourceGroup $rgname
757757
}
758-
}
758+
}
759+
760+
<#
761+
.SYNOPSIS
762+
Test Set/Get/Remove-AzureStorageAccountManagementPolicy
763+
.Description
764+
AzureAutomationTest
765+
#>
766+
function Test-StorageAccountManagementPolicy
767+
{
768+
# Setup
769+
$rgname = Get-StorageManagementTestResourceName;
770+
771+
try
772+
{
773+
# Test
774+
$stoname = 'sto' + $rgname;
775+
$stotype = 'Standard_GRS';
776+
$loc = Get-ProviderLocation ResourceManagement;
777+
$kind = 'StorageV2'
778+
779+
New-AzureRmResourceGroup -Name $rgname -Location $loc;
780+
781+
$loc = Get-ProviderLocation_Stage;
782+
New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind;
783+
784+
Retry-IfException { $global:sto = Get-AzureRmStorageAccount -ResourceGroupName $rgname -Name $stoname; }
785+
$stotype = 'StandardGRS';
786+
Assert-AreEqual $stoname $sto.StorageAccountName;
787+
Assert-AreEqual $stotype $sto.Sku.Name;
788+
Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
789+
Assert-AreEqual $kind $sto.Kind;
790+
791+
# create Rule1
792+
$action1 = Add-AzStorageAccountManagementPolicyAction -BaseBlobAction Delete -daysAfterModificationGreaterThan 100
793+
$action1 = Add-AzStorageAccountManagementPolicyAction -InputObject $action1 -BaseBlobAction TierToArchive -daysAfterModificationGreaterThan 50
794+
$action1 = Add-AzStorageAccountManagementPolicyAction -InputObject $action1 -BaseBlobAction TierToCool -daysAfterModificationGreaterThan 30
795+
$action1 = Add-AzStorageAccountManagementPolicyAction -InputObject $action1 -SnapshotAction Delete -daysAfterCreationGreaterThan 100
796+
$filter1 = New-AzStorageAccountManagementPolicyFilter -PrefixMatch ab,cd
797+
$rule1 = New-AzStorageAccountManagementPolicyRule -Name Test -Action $action1 -Filter $filter1
798+
799+
# create Rule2
800+
$action2 = Add-AzStorageAccountManagementPolicyAction -BaseBlobAction Delete -daysAfterModificationGreaterThan 100
801+
$filter2 = New-AzStorageAccountManagementPolicyFilter
802+
$rule2 = New-AzStorageAccountManagementPolicyRule -Name Test2 -Action $action2 -Filter $filter2 -Disabled
803+
804+
# Set policy
805+
$policy = Set-AzStorageAccountManagementPolicy -ResourceGroupName $rgname -StorageAccountName $stoname -Rule $rule1, $rule2
806+
Assert-AreEqual 2 $policy.Rules.Count
807+
Assert-AreEqual $rule1.Enabled $policy.Rules[0].Enabled
808+
Assert-AreEqual $rule1.Name $policy.Rules[0].Name
809+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
810+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan
811+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan
812+
Assert-AreEqual $rule1.Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan $policy.Rules[0].Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan
813+
Assert-AreEqual $rule1.Definition.Filters.BlobTypes[0] $policy.Rules[0].Definition.Filters.BlobTypes[0]
814+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch.Count $policy.Rules[0].Definition.Filters.PrefixMatch.Count
815+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[0] $policy.Rules[0].Definition.Filters.PrefixMatch[0]
816+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[1] $policy.Rules[0].Definition.Filters.PrefixMatch[1]
817+
Assert-AreEqual $rule2.Enabled $policy.Rules[1].Enabled
818+
Assert-AreEqual $rule2.Name $policy.Rules[1].Name
819+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[1].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
820+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToArchive $policy.Rules[1].Definition.Actions.BaseBlob.TierToArchive
821+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToCool $policy.Rules[1].Definition.Actions.BaseBlob.TierToCool
822+
Assert-AreEqual $rule2.Definition.Actions.Snapshot $policy.Rules[1].Definition.Actions.Snapshot
823+
Assert-AreEqual $rule2.Definition.Filters.BlobTypes[0] $policy.Rules[1].Definition.Filters.BlobTypes[0]
824+
Assert-AreEqual $rule2.Definition.Filters.PrefixMatch $policy.Rules[1].Definition.Filters.PrefixMatch
825+
826+
$policy = Get-AzStorageAccountManagementPolicy -ResourceGroupName $rgname -StorageAccountName $stoname
827+
Assert-AreEqual 2 $policy.Rules.Count
828+
Assert-AreEqual $rule1.Enabled $policy.Rules[0].Enabled
829+
Assert-AreEqual $rule1.Name $policy.Rules[0].Name
830+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
831+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan
832+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan
833+
Assert-AreEqual $rule1.Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan $policy.Rules[0].Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan
834+
Assert-AreEqual $rule1.Definition.Filters.BlobTypes[0] $policy.Rules[0].Definition.Filters.BlobTypes[0]
835+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch.Count $policy.Rules[0].Definition.Filters.PrefixMatch.Count
836+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[0] $policy.Rules[0].Definition.Filters.PrefixMatch[0]
837+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[1] $policy.Rules[0].Definition.Filters.PrefixMatch[1]
838+
Assert-AreEqual $rule2.Enabled $policy.Rules[1].Enabled
839+
Assert-AreEqual $rule2.Name $policy.Rules[1].Name
840+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[1].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
841+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToArchive $policy.Rules[1].Definition.Actions.BaseBlob.TierToArchive
842+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToCool $policy.Rules[1].Definition.Actions.BaseBlob.TierToCool
843+
Assert-AreEqual $rule2.Definition.Actions.Snapshot $policy.Rules[1].Definition.Actions.Snapshot
844+
Assert-AreEqual $rule2.Definition.Filters.BlobTypes[0] $policy.Rules[1].Definition.Filters.BlobTypes[0]
845+
Assert-AreEqual $rule2.Definition.Filters.PrefixMatch $policy.Rules[1].Definition.Filters.PrefixMatch
846+
847+
Remove-AzStorageAccountManagementPolicy -ResourceGroupName $rgname -StorageAccountName $stoname
848+
849+
$policy| Set-AzStorageAccountManagementPolicy -ResourceGroupName $rgname -StorageAccountName $stoname
850+
851+
$policy = Get-AzStorageAccountManagementPolicy -ResourceGroupName $rgname -StorageAccountName $stoname
852+
Assert-AreEqual 2 $policy.Rules.Count
853+
Assert-AreEqual $rule1.Enabled $policy.Rules[0].Enabled
854+
Assert-AreEqual $rule1.Name $policy.Rules[0].Name
855+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
856+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToArchive.DaysAfterModificationGreaterThan
857+
Assert-AreEqual $rule1.Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan $policy.Rules[0].Definition.Actions.BaseBlob.TierToCool.DaysAfterModificationGreaterThan
858+
Assert-AreEqual $rule1.Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan $policy.Rules[0].Definition.Actions.Snapshot.Delete.DaysAfterCreationGreaterThan
859+
Assert-AreEqual $rule1.Definition.Filters.BlobTypes[0] $policy.Rules[0].Definition.Filters.BlobTypes[0]
860+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch.Count $policy.Rules[0].Definition.Filters.PrefixMatch.Count
861+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[0] $policy.Rules[0].Definition.Filters.PrefixMatch[0]
862+
Assert-AreEqual $rule1.Definition.Filters.PrefixMatch[1] $policy.Rules[0].Definition.Filters.PrefixMatch[1]
863+
Assert-AreEqual $rule2.Enabled $policy.Rules[1].Enabled
864+
Assert-AreEqual $rule2.Name $policy.Rules[1].Name
865+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan $policy.Rules[1].Definition.Actions.BaseBlob.Delete.DaysAfterModificationGreaterThan
866+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToArchive $policy.Rules[1].Definition.Actions.BaseBlob.TierToArchive
867+
Assert-AreEqual $rule2.Definition.Actions.BaseBlob.TierToCool $policy.Rules[1].Definition.Actions.BaseBlob.TierToCool
868+
Assert-AreEqual $rule2.Definition.Actions.Snapshot $policy.Rules[1].Definition.Actions.Snapshot
869+
Assert-AreEqual $rule2.Definition.Filters.BlobTypes[0] $policy.Rules[1].Definition.Filters.BlobTypes[0]
870+
Assert-AreEqual $rule2.Definition.Filters.PrefixMatch $policy.Rules[1].Definition.Filters.PrefixMatch
871+
872+
$policy| Remove-AzStorageAccountManagementPolicy
873+
874+
Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
875+
}
876+
finally
877+
{
878+
# Cleanup
879+
Clean-ResourceGroup $rgname
880+
}
881+
}

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function Test-StorageBlobContainerImmutabilityPolicy
210210

211211
$policy = Get-AzRmStorageContainerImmutabilityPolicy -ResourceGroupName $rgname -StorageAccountName $stoname -ContainerName $containerName
212212
Assert-AreEqual 0 $policy.ImmutabilityPeriodSinceCreationInDays
213-
Assert-AreEqual Unlocked $policy.State
213+
Assert-AreEqual Deleted $policy.State
214214
Assert-AreEqual "" $policy.Etag
215215

216216
$immutabilityPeriod =3
@@ -252,9 +252,7 @@ function Test-StorageBlobContainerImmutabilityPolicy
252252
Assert-AreEqual "" $policy.Etag
253253
$container = Get-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname -Name $containerName
254254
Assert-AreEqual $containerName $container.Name
255-
Assert-AreEqual 0 $container.ImmutabilityPolicy.ImmutabilityPeriodSinceCreationInDays
256-
Assert-AreEqual Deleted $container.ImmutabilityPolicy.State
257-
Assert-AreEqual 0 $container.ImmutabilityPolicy.UpdateHistory.Count
255+
Assert-AreEqual $null $container.ImmutabilityPolicy
258256

259257
$immutabilityPeriod =7
260258
Set-AzRmStorageContainerImmutabilityPolicy -inputObject $policy -ImmutabilityPeriod $immutabilityPeriod

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageAccount.json

Lines changed: 288 additions & 279 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestGetAzureStorageAccountKey.json

Lines changed: 153 additions & 333 deletions
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/45b60d85-fd72-427a-a708-f994d26e593e/providers/Microsoft.Storage/locations/eastus2(stage)/usages?api-version=2018-07-01",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDViNjBkODUtZmQ3Mi00MjdhLWE3MDgtZjk5NGQyNmU1OTNlL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMiUyOHN0YWdlJTI5L3VzYWdlcz9hcGktdmVyc2lvbj0yMDE4LTA3LTAx",
4+
"RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.Storage/locations/eastus2%28stage%29/usages?api-version=2018-11-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzMiUyOHN0YWdlJTI5L3VzYWdlcz9hcGktdmVyc2lvbj0yMDE4LTExLTAx",
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"b34cbc04-3ee0-4df1-ac68-0e0f2998f6a0"
10+
"4b708fff-fea3-4c66-b96c-71341772642e"
1111
],
12-
"accept-language": [
12+
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.7.3132.0",
17-
"OSName/Windows10Enterprise",
18-
"OSVersion/6.3.17134",
19-
"Microsoft.Azure.Management.Storage.StorageManagementClient/9.0.0.0"
16+
"FxVersion/4.6.27207.03",
17+
"OSName/Windows",
18+
"OSVersion/Microsoft.Windows.10.0.17763.",
19+
"Microsoft.Azure.Management.Storage.StorageManagementClient/10.0.0.0"
2020
]
2121
},
22-
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"unit\": \"Count\",\r\n \"currentValue\": 51,\r\n \"limit\": 250,\r\n \"name\": {\r\n \"value\": \"StorageAccounts\",\r\n \"localizedValue\": \"Storage Accounts\"\r\n }\r\n }\r\n ]\r\n}",
2322
"ResponseHeaders": {
24-
"Content-Length": [
25-
"129"
26-
],
27-
"Content-Type": [
28-
"application/json"
29-
],
30-
"Expires": [
31-
"-1"
23+
"Cache-Control": [
24+
"no-cache"
3225
],
3326
"Pragma": [
3427
"no-cache"
3528
],
3629
"x-ms-request-id": [
37-
"8e1205bf-aa9e-482a-8961-d334da5b2a1d"
30+
"8eb8990a-0a7c-44bb-95a4-48066cc59dce"
3831
],
3932
"Strict-Transport-Security": [
4033
"max-age=31536000; includeSubDomains"
4134
],
35+
"Server": [
36+
"Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
37+
],
4238
"x-ms-ratelimit-remaining-subscription-reads": [
43-
"11996"
39+
"11999"
4440
],
4541
"x-ms-correlation-request-id": [
46-
"ec250fb5-bdfe-4855-9043-7f67201f2859"
42+
"d61c8bda-857e-4dbf-8ce5-d19a0bb251d3"
4743
],
4844
"x-ms-routing-request-id": [
49-
"SOUTHEASTASIA:20180914T030318Z:ec250fb5-bdfe-4855-9043-7f67201f2859"
45+
"SOUTHEASTASIA:20190306T095939Z:d61c8bda-857e-4dbf-8ce5-d19a0bb251d3"
5046
],
5147
"X-Content-Type-Options": [
5248
"nosniff"
5349
],
54-
"Cache-Control": [
55-
"no-cache"
56-
],
5750
"Date": [
58-
"Fri, 14 Sep 2018 03:03:18 GMT"
51+
"Wed, 06 Mar 2019 09:59:38 GMT"
5952
],
60-
"Server": [
61-
"Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0 Microsoft-HTTPAPI/2.0"
53+
"Content-Length": [
54+
"129"
55+
],
56+
"Content-Type": [
57+
"application/json"
58+
],
59+
"Expires": [
60+
"-1"
6261
]
6362
},
63+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"unit\": \"Count\",\r\n \"currentValue\": 13,\r\n \"limit\": 250,\r\n \"name\": {\r\n \"value\": \"StorageAccounts\",\r\n \"localizedValue\": \"Storage Accounts\"\r\n }\r\n }\r\n ]\r\n}",
6464
"StatusCode": 200
6565
}
6666
],
6767
"Names": {},
6868
"Variables": {
69-
"SubscriptionId": "45b60d85-fd72-427a-a708-f994d26e593e"
69+
"SubscriptionId": "ce4a7590-4722-4bcf-a2c6-e473e9f11778"
7070
}
7171
}

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNetworkRule.json

Lines changed: 438 additions & 618 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccount.json

Lines changed: 158 additions & 398 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountBlockBlobStorage.json

Lines changed: 546 additions & 318 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestNewAzureStorageAccountKey.json

Lines changed: 197 additions & 377 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestPipingGetAccountToGetKey.json

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

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestPipingNewUpdateAccount.json

Lines changed: 320 additions & 257 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestPipingSetStorageAccount.json

Lines changed: 177 additions & 357 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestRemoveAzureStorageAccount.json

Lines changed: 347 additions & 299 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestSetAzureRmStorageAccountKeySource.json

Lines changed: 188 additions & 368 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestSetAzureStorageAccount.json

Lines changed: 238 additions & 418 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestSetAzureStorageAccountStorageV2.json

Lines changed: 200 additions & 440 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestSetCurrentStorageAccount.json

Lines changed: 174 additions & 354 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestStorageAccount.json

Lines changed: 331 additions & 511 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageAccountTests/TestStorageAccountManagementPolicy.json

Lines changed: 1191 additions & 0 deletions
Large diffs are not rendered by default.

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageBlobTests/TestStorageBlobContainer.json

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

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageBlobTests/TestStorageBlobContainerImmutabilityPolicy.json

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

src/Storage/Storage.Management.Test/SessionRecords/Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests.StorageBlobTests/TestStorageBlobContainerLegalHold.json

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

src/Storage/Storage.Management.Test/Storage.Management.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="9.1.0-preview" />
14+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="10.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

src/Storage/Storage.Management/Az.Storage.psd1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,13 @@ CmdletsToExport = 'Get-AzStorageAccount', 'Get-AzStorageAccountKey',
145145
'Set-AzRmStorageContainerImmutabilityPolicy',
146146
'Get-AzRmStorageContainerImmutabilityPolicy',
147147
'Remove-AzRmStorageContainerImmutabilityPolicy',
148-
'Lock-AzRmStorageContainerImmutabilityPolicy'
148+
'Lock-AzRmStorageContainerImmutabilityPolicy',
149+
'Set-AzStorageAccountManagementPolicy',
150+
'Get-AzStorageAccountManagementPolicy',
151+
'Remove-AzStorageAccountManagementPolicy',
152+
'New-AzStorageAccountManagementPolicyFilter',
153+
'New-AzStorageAccountManagementPolicyRule',
154+
'Add-AzStorageAccountManagementPolicyAction'
149155

150156
# Variables to export from this module
151157
# VariablesToExport = @()

src/Storage/Storage.Management/ChangeLog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Support Get/Set/Remove Management Policy on a Storage account
22+
- Set-AzStorageAccountManagementPolicy
23+
- Get-AzStorageAccountManagementPolicy
24+
- Remove-AzStorageAccountManagementPolicy
25+
- Add-AzStorageAccountManagementPolicyAction
26+
- New-AzStorageAccountManagementPolicyFilter
27+
- New-AzStorageAccountManagementPolicyRule
28+
29+
## Version 1.0.4
2130
* Upgrade to Storage Client Library 9.4.2 and Microsoft.Azure.Cosmos.Table 0.10.1-preview
2231

2332
## Version 1.0.3

src/Storage/Storage.Management/Models/PSContainer.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
1616
using Microsoft.Azure.Management.Storage;
1717
using Microsoft.Azure.Management.Storage.Models;
18+
using Microsoft.WindowsAzure.Commands.Common.Attributes;
1819
using Microsoft.WindowsAzure.Commands.Common.Storage;
1920
using Microsoft.WindowsAzure.Commands.Storage.Adapters;
2021
using Microsoft.WindowsAzure.Storage;
@@ -66,12 +67,15 @@ public PSContainer(BlobContainer container)
6667
this.HasImmutabilityPolicy = container.HasImmutabilityPolicy;
6768
}
6869

70+
[Ps1Xml(Label = "ResourceGroupName", Target = ViewControl.List, Position = 0)]
6971
public string ResourceGroupName { get; set; }
7072

73+
[Ps1Xml(Label = "StorageAccountName", Target = ViewControl.List, Position = 1)]
7174
public string StorageAccountName { get; set; }
7275

7376
public string Id { get; set; }
7477

78+
[Ps1Xml(Label = "Name", Target = ViewControl.List, Position = 2)]
7579
public string Name { get; set; }
7680

7781
public string Type { get; set; }
@@ -80,12 +84,14 @@ public PSContainer(BlobContainer container)
8084

8185
public IDictionary<string, string> Metadata { get; set; }
8286

87+
[Ps1Xml(Label = "PublicAccess", Target = ViewControl.List, Position = 3)]
8388
public PSPublicAccess? PublicAccess { get; set; }
8489

8590
public PSImmutabilityPolicyProperties ImmutabilityPolicy { get; set; }
8691

8792
public PSLegalHoldProperties LegalHold { get; set; }
8893

94+
[Ps1Xml(Label = "LastModifiedTime", Target = ViewControl.List, Position = 4)]
8995
public DateTime? LastModifiedTime { get; set; }
9096

9197
public string LeaseStatus { get; set; }
@@ -94,8 +100,10 @@ public PSContainer(BlobContainer container)
94100

95101
public string LeaseDuration { get; set; }
96102

103+
[Ps1Xml(Label = "HasLegalHold", Target = ViewControl.List, Position = 5)]
97104
public bool? HasLegalHold { get; set; }
98105

106+
[Ps1Xml(Label = "HasImmutabilityPolicy", Target = ViewControl.List, Position = 6)]
99107
public bool? HasImmutabilityPolicy { get; set; }
100108

101109

0 commit comments

Comments
 (0)