Skip to content

Commit d1eacc4

Browse files
yifanz7yifanz7
committed
upgrade to beta10
1 parent 7e8fe7b commit d1eacc4

13 files changed

+61
-53
lines changed

‎src/Storage/Storage.Management/Models/PSDataPolicy.cs

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// ----------------------------------------------------------------------------------
2+
// ----------------------------------------------------------------------------------
23
//
34
// Copyright Microsoft Corporation
45
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,8 @@
1213
// limitations under the License.
1314
// ----------------------------------------------------------------------------------
1415

15-
using Track2 = global::Azure.ResourceManager.Storage;
16+
using Track2 = Azure.ResourceManager.Storage;
17+
using Track2Models = Azure.ResourceManager.Storage.Models;
1618
using Azure.ResourceManager.Storage.Models;
1719
using Microsoft.WindowsAzure.Commands.Common.Attributes;
1820
using System;
@@ -67,16 +69,16 @@ public PSManagementPolicyRule()
6769
{
6870
}
6971

70-
public PSManagementPolicyRule(global::Azure.ResourceManager.Storage.Models.ManagementPolicyRule rule)
72+
public PSManagementPolicyRule(Track2Models.ManagementPolicyRule rule)
7173
{
7274
this.Enabled = rule.Enabled;
7375
this.Name = rule.Name;
7476
this.Definition = rule.Definition is null ? null : new PSManagementPolicyDefinition(rule.Definition);
7577
}
7678

77-
public Track2.Models.ManagementPolicyRule ParseManagementPolicyRule()
79+
public Track2Models.ManagementPolicyRule ParseManagementPolicyRule()
7880
{
79-
Track2.Models.ManagementPolicyRule rule = new Track2.Models.ManagementPolicyRule(
81+
Track2Models.ManagementPolicyRule rule = new Track2Models.ManagementPolicyRule(
8082
this.Name,
8183
RuleType.Lifecycle,
8284
this.Definition?.ParseManagementPolicyDefination()
@@ -85,7 +87,7 @@ public Track2.Models.ManagementPolicyRule ParseManagementPolicyRule()
8587
return rule;
8688
}
8789

88-
public static PSManagementPolicyRule[] GetPSManagementPolicyRules(IList<Track2.Models.ManagementPolicyRule> rules)
90+
public static PSManagementPolicyRule[] GetPSManagementPolicyRules(IList<Track2Models.ManagementPolicyRule> rules)
8991
{
9092
if (rules == null)
9193
{
@@ -273,9 +275,9 @@ public PSManagementPolicySnapShot()
273275
public PSManagementPolicySnapShot(Track2.Models.ManagementPolicySnapShot blobAction)
274276
{
275277

276-
this.Delete = blobAction.DeleteDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.DeleteDaysAfterCreationGreaterThan);
277-
this.TierToCool = blobAction.TierToCoolDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToCoolDaysAfterCreationGreaterThan);
278-
TierToArchive = blobAction.TierToArchiveDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchiveDaysAfterCreationGreaterThan);
278+
this.Delete = blobAction.Delete is null ? null : new PSDateAfterCreation((int)blobAction.Delete.DaysAfterCreationGreaterThan);
279+
this.TierToCool = blobAction.TierToCool is null ? null : new PSDateAfterCreation((int)blobAction.TierToCool.DaysAfterCreationGreaterThan);
280+
TierToArchive = blobAction.TierToArchive is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchive.DaysAfterCreationGreaterThan);
279281
}
280282
public Track2.Models.ManagementPolicySnapShot ParseManagementPolicySnapShot()
281283
{
@@ -284,15 +286,17 @@ public Track2.Models.ManagementPolicySnapShot ParseManagementPolicySnapShot()
284286

285287
if (this.Delete != null)
286288
{
287-
snapShot.DeleteDaysAfterCreationGreaterThan = this.Delete.DaysAfterCreationGreaterThan;
289+
snapShot.Delete = new Track2.Models.DateAfterCreation(this.Delete.DaysAfterCreationGreaterThan);
288290
}
289291
if (this.TierToCool != null)
290292
{
291-
snapShot.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
293+
snapShot.TierToCool = new Track2.Models.DateAfterCreation(this.TierToCool.DaysAfterCreationGreaterThan);
294+
//snapShot.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
292295
}
293296
if (this.TierToArchive != null)
294297
{
295-
snapShot.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
298+
snapShot.TierToArchive = new Track2.Models.DateAfterCreation(this.TierToArchive.DaysAfterCreationGreaterThan);
299+
//snapShot.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
296300
}
297301

298302
return snapShot;
@@ -313,24 +317,27 @@ public PSManagementPolicyVersion()
313317

314318
public PSManagementPolicyVersion(Track2.Models.ManagementPolicyVersion blobAction)
315319
{
316-
this.Delete = blobAction.DeleteDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.DeleteDaysAfterCreationGreaterThan);
317-
this.TierToCool = blobAction.TierToCoolDaysAfterCreationGreaterThan is null ? null :new PSDateAfterCreation((int)blobAction.TierToCoolDaysAfterCreationGreaterThan);
318-
this.TierToArchive = blobAction.TierToArchiveDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchiveDaysAfterCreationGreaterThan);
320+
this.Delete = blobAction.Delete is null ? null : new PSDateAfterCreation((int)blobAction.Delete.DaysAfterCreationGreaterThan);
321+
this.TierToCool = blobAction.TierToCool is null ? null :new PSDateAfterCreation((int)blobAction.TierToCool.DaysAfterCreationGreaterThan);
322+
this.TierToArchive = blobAction.TierToArchive is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchive.DaysAfterCreationGreaterThan);
319323
}
320324
public Track2.Models.ManagementPolicyVersion ParseManagementPolicyVersion()
321325
{
322326
Track2.Models.ManagementPolicyVersion policyVersion = new Track2.Models.ManagementPolicyVersion();
323327
if (this.Delete != null)
324328
{
325-
policyVersion.DeleteDaysAfterCreationGreaterThan = this.Delete.DaysAfterCreationGreaterThan;
329+
policyVersion.Delete = new DateAfterCreation(this.Delete.DaysAfterCreationGreaterThan);
330+
//policyVersion.DeleteDaysAfterCreationGreaterThan = this.Delete.DaysAfterCreationGreaterThan;
326331
}
327332
if (this.TierToCool != null)
328333
{
329-
policyVersion.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
334+
policyVersion.TierToCool = new DateAfterCreation(this.TierToCool.DaysAfterCreationGreaterThan);
335+
//policyVersion.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
330336
}
331337
if (this.TierToArchive != null)
332338
{
333-
policyVersion.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
339+
policyVersion.TierToArchive = new DateAfterCreation(this.TierToArchive.DaysAfterCreationGreaterThan);
340+
//policyVersion.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
334341
}
335342

336343
return policyVersion;

‎src/Storage/Storage.Management/Models/PSNetworkRule.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public struct PSVirtualNetworkRule
5959

6060
public struct PSResourceAccessRule
6161
{
62-
public string TenantId;
62+
public Guid? TenantId;
6363
public string ResourceId;
6464
}
6565

@@ -201,7 +201,7 @@ public static PSIpRule ParsePSNetworkRuleIPRule(Track2Models.IPRule ipRule)
201201
{
202202
PSIpRule returnRule = new PSIpRule
203203
{
204-
Action = ipRule.Action != null ? ParsePSNetworkRuleAction(ipRule.Action) : null,
204+
Action = ipRule.Action != null ? ParsePSNetworkRuleAction(ipRule.Action?.ToString()) : null,
205205
IPAddressOrRange = ipRule.IPAddressOrRange
206206
};
207207
return returnRule;
@@ -242,7 +242,7 @@ public static Track2Models.ResourceAccessRule ParseStorageResourceAccessRule(PSR
242242
public static PSVirtualNetworkRule ParsePSNetworkRuleVirtualNetworkRule(Track2Models.VirtualNetworkRule virtualNetworkRule)
243243
{
244244
PSVirtualNetworkRule returnRule = new PSVirtualNetworkRule();
245-
returnRule.Action = ParsePSNetworkRuleAction(virtualNetworkRule.Action);
245+
returnRule.Action = ParsePSNetworkRuleAction(virtualNetworkRule.Action?.ToString());
246246
returnRule.VirtualNetworkResourceId = virtualNetworkRule.VirtualNetworkResourceId;
247247
returnRule.State = virtualNetworkRule.State.ToString();
248248

‎src/Storage/Storage.Management/Storage.Management.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</ItemGroup>
2323
<ItemGroup>
2424
<!-- <PackageReference Include="Azure.Core" Version="1.24.0" /> -->
25-
<PackageReference Include="Azure.ResourceManager" Version="1.0.0" />
26-
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.0.0-beta.9" />
25+
<PackageReference Include="Azure.ResourceManager" Version="1.1.1" />
26+
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.0.0-beta.10" />
2727
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="24.0.0" />
2828
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
2929
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.2.2" />

‎src/Storage/Storage.Management/StorageAccount/AddAzureStorageAccountNetworkRule.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.Management.Storage.Models;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
18+
using System;
1819
using System.Collections;
1920
using System.Collections.Generic;
2021
using System.Management.Automation;
@@ -112,7 +113,7 @@ public class AddAzureStorageAccountNetworkRuleCommand : StorageAccountBaseCmdlet
112113
Mandatory = true,
113114
HelpMessage = "Storage Account ResourceAccessRule TenantId in string.",
114115
ParameterSetName = ResourceAccessRuleStringParameterSet)]
115-
public string TenantId { get; set; }
116+
public Guid? TenantId { get; set; }
116117

117118
[Parameter(
118119
Mandatory = true,
@@ -189,7 +190,7 @@ public override void ExecuteCmdlet()
189190
bool ResourceAccessruleExist = false;
190191
foreach (Track2Models.ResourceAccessRule originRule in storageACL.ResourceAccessRules)
191192
{
192-
if (originRule.TenantId.Equals(this.TenantId, System.StringComparison.InvariantCultureIgnoreCase)
193+
if (originRule.TenantId.Equals(this.TenantId)
193194
&& originRule.ResourceId.Equals(this.ResourceId, System.StringComparison.InvariantCultureIgnoreCase))
194195
{
195196
ResourceAccessruleExist = true;
@@ -233,7 +234,7 @@ public override void ExecuteCmdlet()
233234
bool ruleExist = false;
234235
foreach (Track2Models.ResourceAccessRule originRule in storageACL.ResourceAccessRules)
235236
{
236-
if (originRule.TenantId.Equals(rule.TenantId, System.StringComparison.InvariantCultureIgnoreCase)
237+
if (originRule.TenantId.Equals(rule.TenantId)
237238
&& originRule.ResourceId.Equals(rule.ResourceId, System.StringComparison.InvariantCultureIgnoreCase))
238239
{
239240
ruleExist = true;

‎src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ public class GetAzureStorageBlobInventoryPolicyCommand : StorageAccountBaseCmdle
3939
/// </summary>
4040
private const string AccountResourceIdParameterSet = "AccountResourceId";
4141

42-
/// <summary>
43-
/// Default policy name
44-
/// </summary>
45-
private const string DefaultPolicyName = "default";
46-
4742
[Parameter(
4843
Position = 0,
4944
Mandatory = true,

‎src/Storage/Storage.Management/StorageAccount/NewAzStorageBlobRangeToRestore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
using Microsoft.Azure.Commands.Management.Storage.Models;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
17-
using Microsoft.Azure.Management.Storage;
18-
using Microsoft.Azure.Management.Storage.Models;
17+
//using Microsoft.Azure.Management.Storage;
18+
//using Microsoft.Azure.Management.Storage.Models;
1919
using System.Management.Automation;
2020

2121
namespace Microsoft.Azure.Commands.Management.Storage

‎src/Storage/Storage.Management/StorageAccount/NewAzureStorageAccount.cs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ public override void ExecuteCmdlet()
553553

554554
Track2Models.CheckNameAvailabilityResult checkNameAvailabilityResult =
555555
this.StorageClientTrack2.GetSubscription(this.SubscriptionId).CheckStorageAccountNameAvailability(
556-
new Track2Models.StorageAccountCheckNameAvailabilityContent(this.Name));
556+
new Track2Models.StorageAccountNameAvailabilityContent(this.Name));
557557

558558
if (!checkNameAvailabilityResult.NameAvailable.Value)
559559
{
@@ -622,7 +622,7 @@ public override void ExecuteCmdlet()
622622
{
623623
if (enableAzureActiveDirectoryDomainServicesForFile != null && enableAzureActiveDirectoryDomainServicesForFile.Value)
624624
{
625-
createContent.AzureFilesIdentityBasedAuthentication = new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOptions.Aadds);
625+
createContent.AzureFilesIdentityBasedAuthentication = new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOption.Aadds);
626626
}
627627
else if (enableActiveDirectoryDomainServicesForFile != null && enableActiveDirectoryDomainServicesForFile.Value)
628628
{
@@ -639,7 +639,7 @@ public override void ExecuteCmdlet()
639639
}
640640

641641
createContent.AzureFilesIdentityBasedAuthentication =
642-
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOptions.AD);
642+
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOption.AD);
643643
createContent.AzureFilesIdentityBasedAuthentication.ActiveDirectoryProperties =
644644
new Track2Models.ActiveDirectoryProperties(this.ActiveDirectoryDomainName, this.ActiveDirectoryNetBiosDomainName,
645645
this.ActiveDirectoryForestName, this.ActiveDirectoryDomainGuid, this.ActiveDirectoryDomainSid, this.ActiveDirectoryAzureStorageSid);
@@ -652,7 +652,7 @@ public override void ExecuteCmdlet()
652652
else
653653
{
654654
createContent.AzureFilesIdentityBasedAuthentication =
655-
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOptions.None);
655+
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOption.None);
656656
}
657657
}
658658

@@ -665,7 +665,7 @@ public override void ExecuteCmdlet()
665665
if (createContent.AzureFilesIdentityBasedAuthentication == null)
666666
{
667667
createContent.AzureFilesIdentityBasedAuthentication =
668-
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOptions.None);
668+
new Track2Models.AzureFilesIdentityBasedAuthentication(Track2Models.DirectoryServiceOption.None);
669669
}
670670

671671
createContent.AzureFilesIdentityBasedAuthentication.DefaultSharePermission = this.DefaultSharePermission;
@@ -676,9 +676,11 @@ public override void ExecuteCmdlet()
676676
}
677677
if (this.EncryptionKeyTypeForQueue != null || this.EncryptionKeyTypeForTable != null || this.RequireInfrastructureEncryption.IsPresent)
678678
{
679-
680-
createContent.Encryption = new Track2Models.Encryption(Track2Models.KeySource.MicrosoftStorage);
681-
679+
createContent.Encryption = new Track2Models.Encryption
680+
{
681+
KeySource = Track2Models.KeySource.MicrosoftStorage
682+
};
683+
682684
if (this.EncryptionKeyTypeForQueue != null || this.EncryptionKeyTypeForTable != null)
683685
{
684686
createContent.Encryption.Services = new Track2Models.EncryptionServices();
@@ -729,8 +731,10 @@ public override void ExecuteCmdlet()
729731

730732
if (createContent.Encryption == null)
731733
{
732-
createContent.Encryption = new Track2Models.Encryption(
733-
Track2Models.KeySource.MicrosoftStorage);
734+
createContent.Encryption = new Track2Models.Encryption
735+
{
736+
KeySource = Track2Models.KeySource.MicrosoftStorage,
737+
};
734738
}
735739

736740
if (createContent.Encryption.Services == null)
@@ -792,7 +796,7 @@ public override void ExecuteCmdlet()
792796
createContent.ExtendedLocation = new Track2Models.ExtendedLocation
793797
{
794798
Name = this.EdgeZone,
795-
ExtendedLocationType = Track2Models.ExtendedLocationTypes.EdgeZone,
799+
ExtendedLocationType = Track2Models.ExtendedLocationType.EdgeZone,
796800
};
797801
}
798802
if (sasExpirationPeriod != null)

‎src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageAccountNetworkRule.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Microsoft.Azure.Commands.Management.Storage.Models;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
18+
using Microsoft.Azure.Management.WebSites.Version2016_09_01.Models;
1819
using System;
1920
using System.Collections;
2021
using System.Collections.Generic;
@@ -114,7 +115,7 @@ public class RemoveAzureStorageAccountNetworkRuleCommand : StorageAccountBaseCmd
114115
Mandatory = true,
115116
HelpMessage = "Storage Account ResourceAccessRule TenantId in string.",
116117
ParameterSetName = ResourceAccessRuleStringParameterSet)]
117-
public string TenantId { get; set; }
118+
public Guid? TenantId { get; set; }
118119

119120
[Parameter(
120121
Mandatory = true,
@@ -248,7 +249,7 @@ public bool RemoveResourceAccessRule(IList<Track2Models.ResourceAccessRule> rule
248249
{
249250
foreach (Track2Models.ResourceAccessRule rule in ruleList)
250251
{
251-
if (rule.TenantId.Equals(ruleToRemove.TenantId, System.StringComparison.InvariantCultureIgnoreCase)
252+
if (rule.TenantId.ToString().Equals(ruleToRemove.TenantId.ToString(), System.StringComparison.InvariantCultureIgnoreCase)
252253
&& rule.ResourceId.Equals(ruleToRemove.ResourceId, System.StringComparison.InvariantCultureIgnoreCase))
253254
{
254255
ruleList.Remove(rule);

‎src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageBlobInventoryPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public override void ExecuteCmdlet()
114114
// For AccountNameParameterSet, the ResourceGroupName and StorageAccountName can get from input directly
115115
break;
116116
}
117-
this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default").Delete(WaitUntil.Completed);
117+
this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, DefaultPolicyName).Delete(WaitUntil.Completed);
118118

119119
if (PassThru.IsPresent)
120120
{

0 commit comments

Comments
 (0)