Skip to content

Upgrade SDK version to 1.0.0-beta.10 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2022
Merged

Upgrade SDK version to 1.0.0-beta.10 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1eacc4
upgrade to beta10
yifanz7 Jul 5, 2022
95bc3f9
add setazstorageaccount
yifanz7 Jul 5, 2022
fb94030
formatting
yifanz7 Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 43 additions & 42 deletions src/Storage/Storage.Management/Models/PSDataPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Track2 = global::Azure.ResourceManager.Storage;
using Azure.ResourceManager.Storage.Models;
using Microsoft.WindowsAzure.Commands.Common.Attributes;
using System;
using System.Collections.Generic;
using Track2 = Azure.ResourceManager.Storage;
using Track2Models = Azure.ResourceManager.Storage.Models;

namespace Microsoft.Azure.Commands.Management.Storage.Models
{
Expand Down Expand Up @@ -67,16 +68,16 @@ public PSManagementPolicyRule()
{
}

public PSManagementPolicyRule(global::Azure.ResourceManager.Storage.Models.ManagementPolicyRule rule)
public PSManagementPolicyRule(Track2Models.ManagementPolicyRule rule)
{
this.Enabled = rule.Enabled;
this.Name = rule.Name;
this.Definition = rule.Definition is null ? null : new PSManagementPolicyDefinition(rule.Definition);
}

public Track2.Models.ManagementPolicyRule ParseManagementPolicyRule()
public Track2Models.ManagementPolicyRule ParseManagementPolicyRule()
{
Track2.Models.ManagementPolicyRule rule = new Track2.Models.ManagementPolicyRule(
Track2Models.ManagementPolicyRule rule = new Track2Models.ManagementPolicyRule(
this.Name,
RuleType.Lifecycle,
this.Definition?.ParseManagementPolicyDefination()
Expand All @@ -85,27 +86,27 @@ public Track2.Models.ManagementPolicyRule ParseManagementPolicyRule()
return rule;
}

public static PSManagementPolicyRule[] GetPSManagementPolicyRules(IList<Track2.Models.ManagementPolicyRule> rules)
public static PSManagementPolicyRule[] GetPSManagementPolicyRules(IList<Track2Models.ManagementPolicyRule> rules)
{
if (rules == null)
{
return null;
}
List<PSManagementPolicyRule> psrules = new List<PSManagementPolicyRule>();
foreach (Track2.Models.ManagementPolicyRule rule in rules)
foreach (Track2Models.ManagementPolicyRule rule in rules)
{
psrules.Add(new PSManagementPolicyRule(rule));
}
return psrules.ToArray();
}

public static List<Track2.Models.ManagementPolicyRule> ParseManagementPolicyRules(PSManagementPolicyRule[] psrules)
public static List<Track2Models.ManagementPolicyRule> ParseManagementPolicyRules(PSManagementPolicyRule[] psrules)
{
if (psrules == null)
{
return null;
}
List<Track2.Models.ManagementPolicyRule> rules = new List<Track2.Models.ManagementPolicyRule>();
List<Track2Models.ManagementPolicyRule> rules = new List<Track2Models.ManagementPolicyRule>();
foreach (PSManagementPolicyRule psrule in psrules)
{
rules.Add(psrule.ParseManagementPolicyRule());
Expand All @@ -126,15 +127,15 @@ public PSManagementPolicyDefinition()
{
}

public PSManagementPolicyDefinition(Track2.Models.ManagementPolicyDefinition defination)
public PSManagementPolicyDefinition(Track2Models.ManagementPolicyDefinition defination)
{
this.Actions = defination.Actions is null ? null : new PSManagementPolicyActionGroup(defination.Actions);
this.Filters = defination.Filters is null ? null : new PSManagementPolicyRuleFilter(defination.Filters);
}
public Track2.Models.ManagementPolicyDefinition ParseManagementPolicyDefination()
public Track2Models.ManagementPolicyDefinition ParseManagementPolicyDefination()
{
Track2.Models.ManagementPolicyAction actions = this.Actions?.ParseManagementPolicyAction();
Track2.Models.ManagementPolicyDefinition policyDefinition = new Track2.Models.ManagementPolicyDefinition(actions);
Track2Models.ManagementPolicyAction actions = this.Actions?.ParseManagementPolicyAction();
Track2Models.ManagementPolicyDefinition policyDefinition = new Track2Models.ManagementPolicyDefinition(actions);
policyDefinition.Filters = this.Filters?.ParseManagementPolicyFilter();

return policyDefinition;
Expand All @@ -157,14 +158,14 @@ public class PSManagementPolicyRuleFilter
public PSManagementPolicyRuleFilter()
{ }

public PSManagementPolicyRuleFilter(Track2.Models.ManagementPolicyFilter filter)
public PSManagementPolicyRuleFilter(Track2Models.ManagementPolicyFilter filter)
{
this.PrefixMatch = StringListToArray(filter.PrefixMatch);
this.BlobTypes = StringListToArray(filter.BlobTypes);
}
public Track2.Models.ManagementPolicyFilter ParseManagementPolicyFilter()
public Track2Models.ManagementPolicyFilter ParseManagementPolicyFilter()
{
Track2.Models.ManagementPolicyFilter policyFilter = new Track2.Models.ManagementPolicyFilter(StringArrayToList(this.BlobTypes));
Track2Models.ManagementPolicyFilter policyFilter = new Track2Models.ManagementPolicyFilter(StringArrayToList(this.BlobTypes));
if (this.PrefixMatch != null)
{
foreach (string prefixMatch in this.PrefixMatch)
Expand Down Expand Up @@ -209,15 +210,15 @@ public class PSManagementPolicyActionGroup
public PSManagementPolicyActionGroup()
{ }

public PSManagementPolicyActionGroup(Track2.Models.ManagementPolicyAction action)
public PSManagementPolicyActionGroup(Track2Models.ManagementPolicyAction action)
{
this.BaseBlob = (action is null || action.BaseBlob is null) ? null : new PSManagementPolicyBaseBlob(action.BaseBlob);
this.Snapshot = (action is null || action.Snapshot is null) ? null : new PSManagementPolicySnapShot(action.Snapshot);
this.Version = (action is null || action.Version is null) ? null : new PSManagementPolicyVersion(action.Version);
}
public Track2.Models.ManagementPolicyAction ParseManagementPolicyAction()
public Track2Models.ManagementPolicyAction ParseManagementPolicyAction()
{
return new Track2.Models.ManagementPolicyAction()
return new Track2Models.ManagementPolicyAction()
{
BaseBlob = this.BaseBlob?.ParseManagementPolicyBaseBlob(),
Snapshot = this.Snapshot?.ParseManagementPolicySnapShot(),
Expand All @@ -239,16 +240,16 @@ public class PSManagementPolicyBaseBlob
public PSManagementPolicyBaseBlob()
{ }

public PSManagementPolicyBaseBlob(Track2.Models.ManagementPolicyBaseBlob blobAction)
public PSManagementPolicyBaseBlob(Track2Models.ManagementPolicyBaseBlob blobAction)
{
this.TierToCool = blobAction.TierToCool is null ? null : new PSDateAfterModification(blobAction.TierToCool);
this.TierToArchive = blobAction.TierToArchive is null ? null : new PSDateAfterModification(blobAction.TierToArchive);
this.Delete = blobAction.Delete is null ? null : new PSDateAfterModification(blobAction.Delete);
this.EnableAutoTierToHotFromCool = blobAction.EnableAutoTierToHotFromCool;
}
public Track2.Models.ManagementPolicyBaseBlob ParseManagementPolicyBaseBlob()
public Track2Models.ManagementPolicyBaseBlob ParseManagementPolicyBaseBlob()
{
return new Track2.Models.ManagementPolicyBaseBlob()
return new Track2Models.ManagementPolicyBaseBlob()
{
TierToCool = this.TierToCool?.ParseDateAfterModification(),
TierToArchive = this.TierToArchive?.ParseDateAfterModification(),
Expand All @@ -270,29 +271,29 @@ public class PSManagementPolicySnapShot
public PSManagementPolicySnapShot()
{ }

public PSManagementPolicySnapShot(Track2.Models.ManagementPolicySnapShot blobAction)
public PSManagementPolicySnapShot(Track2Models.ManagementPolicySnapShot blobAction)
{

this.Delete = blobAction.DeleteDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.DeleteDaysAfterCreationGreaterThan);
this.TierToCool = blobAction.TierToCoolDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToCoolDaysAfterCreationGreaterThan);
TierToArchive = blobAction.TierToArchiveDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchiveDaysAfterCreationGreaterThan);
this.Delete = blobAction.Delete is null ? null : new PSDateAfterCreation((int)blobAction.Delete.DaysAfterCreationGreaterThan);
this.TierToCool = blobAction.TierToCool is null ? null : new PSDateAfterCreation((int)blobAction.TierToCool.DaysAfterCreationGreaterThan);
TierToArchive = blobAction.TierToArchive is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchive.DaysAfterCreationGreaterThan);
}
public Track2.Models.ManagementPolicySnapShot ParseManagementPolicySnapShot()
public Track2Models.ManagementPolicySnapShot ParseManagementPolicySnapShot()
{

Track2.Models.ManagementPolicySnapShot snapShot = new Track2.Models.ManagementPolicySnapShot();
Track2Models.ManagementPolicySnapShot snapShot = new Track2Models.ManagementPolicySnapShot();

if (this.Delete != null)
{
snapShot.DeleteDaysAfterCreationGreaterThan = this.Delete.DaysAfterCreationGreaterThan;
snapShot.Delete = new Track2Models.DateAfterCreation(this.Delete.DaysAfterCreationGreaterThan);
}
if (this.TierToCool != null)
{
snapShot.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
snapShot.TierToCool = new Track2Models.DateAfterCreation(this.TierToCool.DaysAfterCreationGreaterThan);
}
if (this.TierToArchive != null)
{
snapShot.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
snapShot.TierToArchive = new Track2Models.DateAfterCreation(this.TierToArchive.DaysAfterCreationGreaterThan);
}

return snapShot;
Expand All @@ -311,26 +312,26 @@ public class PSManagementPolicyVersion
public PSManagementPolicyVersion()
{ }

public PSManagementPolicyVersion(Track2.Models.ManagementPolicyVersion blobAction)
public PSManagementPolicyVersion(Track2Models.ManagementPolicyVersion blobAction)
{
this.Delete = blobAction.DeleteDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.DeleteDaysAfterCreationGreaterThan);
this.TierToCool = blobAction.TierToCoolDaysAfterCreationGreaterThan is null ? null :new PSDateAfterCreation((int)blobAction.TierToCoolDaysAfterCreationGreaterThan);
this.TierToArchive = blobAction.TierToArchiveDaysAfterCreationGreaterThan is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchiveDaysAfterCreationGreaterThan);
this.Delete = blobAction.Delete is null ? null : new PSDateAfterCreation((int)blobAction.Delete.DaysAfterCreationGreaterThan);
this.TierToCool = blobAction.TierToCool is null ? null :new PSDateAfterCreation((int)blobAction.TierToCool.DaysAfterCreationGreaterThan);
this.TierToArchive = blobAction.TierToArchive is null ? null : new PSDateAfterCreation((int)blobAction.TierToArchive.DaysAfterCreationGreaterThan);
}
public Track2.Models.ManagementPolicyVersion ParseManagementPolicyVersion()
public Track2Models.ManagementPolicyVersion ParseManagementPolicyVersion()
{
Track2.Models.ManagementPolicyVersion policyVersion = new Track2.Models.ManagementPolicyVersion();
Track2Models.ManagementPolicyVersion policyVersion = new Track2Models.ManagementPolicyVersion();
if (this.Delete != null)
{
policyVersion.DeleteDaysAfterCreationGreaterThan = this.Delete.DaysAfterCreationGreaterThan;
policyVersion.Delete = new DateAfterCreation(this.Delete.DaysAfterCreationGreaterThan);
}
if (this.TierToCool != null)
{
policyVersion.TierToCoolDaysAfterCreationGreaterThan = this.TierToCool.DaysAfterCreationGreaterThan;
policyVersion.TierToCool = new DateAfterCreation(this.TierToCool.DaysAfterCreationGreaterThan);
}
if (this.TierToArchive != null)
{
policyVersion.TierToArchiveDaysAfterCreationGreaterThan = this.TierToArchive.DaysAfterCreationGreaterThan;
policyVersion.TierToArchive = new DateAfterCreation(this.TierToArchive.DaysAfterCreationGreaterThan);
}

return policyVersion;
Expand Down Expand Up @@ -373,7 +374,7 @@ public PSDateAfterModification(int? daysAfterModificationGreaterThan, int? daysA
this.DaysAfterLastTierChangeGreaterThan = DaysAfterLastTierChangeGreaterThan;
}

public PSDateAfterModification(Track2.Models.DateAfterModification data)
public PSDateAfterModification(Track2Models.DateAfterModification data)
{
if (data.DaysAfterModificationGreaterThan is null)
{
Expand All @@ -392,9 +393,9 @@ public PSDateAfterModification(Track2.Models.DateAfterModification data)
this.DaysAfterLastAccessTimeGreaterThan = Convert.ToInt32(data.DaysAfterLastAccessTimeGreaterThan);
}
}
public Track2.Models.DateAfterModification ParseDateAfterModification()
public Track2Models.DateAfterModification ParseDateAfterModification()
{
Track2.Models.DateAfterModification dateAfterModification = new Track2.Models.DateAfterModification();
Track2Models.DateAfterModification dateAfterModification = new Track2Models.DateAfterModification();
dateAfterModification.DaysAfterLastAccessTimeGreaterThan = this.DaysAfterLastAccessTimeGreaterThan;
dateAfterModification.DaysAfterModificationGreaterThan = this.DaysAfterModificationGreaterThan;
// TODO: Add DaysAfterLastTierChangeGreaterThan once supported by Track2 SDK
Expand Down
6 changes: 3 additions & 3 deletions src/Storage/Storage.Management/Models/PSNetworkRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public struct PSVirtualNetworkRule

public struct PSResourceAccessRule
{
public string TenantId;
public Guid? TenantId;
public string ResourceId;
}

Expand Down Expand Up @@ -201,7 +201,7 @@ public static PSIpRule ParsePSNetworkRuleIPRule(Track2Models.IPRule ipRule)
{
PSIpRule returnRule = new PSIpRule
{
Action = ipRule.Action != null ? ParsePSNetworkRuleAction(ipRule.Action) : null,
Action = ipRule.Action != null ? ParsePSNetworkRuleAction(ipRule.Action?.ToString()) : null,
IPAddressOrRange = ipRule.IPAddressOrRange
};
return returnRule;
Expand Down Expand Up @@ -242,7 +242,7 @@ public static Track2Models.ResourceAccessRule ParseStorageResourceAccessRule(PSR
public static PSVirtualNetworkRule ParsePSNetworkRuleVirtualNetworkRule(Track2Models.VirtualNetworkRule virtualNetworkRule)
{
PSVirtualNetworkRule returnRule = new PSVirtualNetworkRule();
returnRule.Action = ParsePSNetworkRuleAction(virtualNetworkRule.Action);
returnRule.Action = ParsePSNetworkRuleAction(virtualNetworkRule.Action?.ToString());
returnRule.VirtualNetworkResourceId = virtualNetworkRule.VirtualNetworkResourceId;
returnRule.State = virtualNetworkRule.State.ToString();

Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Storage.Management/Storage.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</ItemGroup>
<ItemGroup>
<!-- <PackageReference Include="Azure.Core" Version="1.24.0" /> -->
<PackageReference Include="Azure.ResourceManager" Version="1.0.0" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.0.0-beta.9" />
<PackageReference Include="Azure.ResourceManager" Version="1.1.1" />
<PackageReference Include="Azure.ResourceManager.Storage" Version="1.0.0-beta.10" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="24.0.0" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.2.2" />
Expand Down
7 changes: 4 additions & 3 deletions src/Storage/Storage.Management/StorageAccount/AddAzureStorageAccountNetworkRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.Azure.Commands.Management.Storage.Models;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Management.Automation;
Expand Down Expand Up @@ -112,7 +113,7 @@ public class AddAzureStorageAccountNetworkRuleCommand : StorageAccountBaseCmdlet
Mandatory = true,
HelpMessage = "Storage Account ResourceAccessRule TenantId in string.",
ParameterSetName = ResourceAccessRuleStringParameterSet)]
public string TenantId { get; set; }
public Guid? TenantId { get; set; }

[Parameter(
Mandatory = true,
Expand Down Expand Up @@ -189,7 +190,7 @@ public override void ExecuteCmdlet()
bool ResourceAccessruleExist = false;
foreach (Track2Models.ResourceAccessRule originRule in storageACL.ResourceAccessRules)
{
if (originRule.TenantId.Equals(this.TenantId, System.StringComparison.InvariantCultureIgnoreCase)
if (originRule.TenantId.Equals(this.TenantId)
&& originRule.ResourceId.Equals(this.ResourceId, System.StringComparison.InvariantCultureIgnoreCase))
{
ResourceAccessruleExist = true;
Expand Down Expand Up @@ -233,7 +234,7 @@ public override void ExecuteCmdlet()
bool ruleExist = false;
foreach (Track2Models.ResourceAccessRule originRule in storageACL.ResourceAccessRules)
{
if (originRule.TenantId.Equals(rule.TenantId, System.StringComparison.InvariantCultureIgnoreCase)
if (originRule.TenantId.Equals(rule.TenantId)
&& originRule.ResourceId.Equals(rule.ResourceId, System.StringComparison.InvariantCultureIgnoreCase))
{
ruleExist = true;
Expand Down
5 changes: 0 additions & 5 deletions src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ public class GetAzureStorageBlobInventoryPolicyCommand : StorageAccountBaseCmdle
/// </summary>
private const string AccountResourceIdParameterSet = "AccountResourceId";

/// <summary>
/// Default policy name
/// </summary>
private const string DefaultPolicyName = "default";

[Parameter(
Position = 0,
Mandatory = true,
Expand Down
2 changes: 0 additions & 2 deletions src/Storage/Storage.Management/StorageAccount/NewAzStorageBlobRangeToRestore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

using Microsoft.Azure.Commands.Management.Storage.Models;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Management.Storage;
using Microsoft.Azure.Management.Storage.Models;
using System.Management.Automation;

namespace Microsoft.Azure.Commands.Management.Storage
Expand Down
Loading