From 625b99d99d4949c947dfbf1e7f5c2bb82fc5e0ad Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Mon, 20 Jun 2022 19:32:53 +0800 Subject: [PATCH 1/3] temp --- .../Models/PSBlobInventoryPolicy.cs | 146 ++++++++++-------- .../Storage.Management.csproj | 1 - .../GetAzureStorageBlobInventoryPolicy.cs | 8 +- .../InvokeAzureStorageAccountFailover.cs | 19 +-- .../NewAzureStorageBlobInventoryPolicyRule.cs | 4 +- .../RemoveAzureStorageBlobInventoryPolicy.cs | 8 +- .../SetAzureStorageBlobInventoryPolicy.cs | 39 ++--- 7 files changed, 114 insertions(+), 111 deletions(-) diff --git a/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs b/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs index 8594b6952af6..7dca5dacbda8 100644 --- a/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs @@ -12,6 +12,8 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Track2 = Azure.ResourceManager.Storage; +using Track2Models = Azure.ResourceManager.Storage.Models; using Microsoft.Azure.Management.Storage.Models; using Microsoft.WindowsAzure.Commands.Common.Attributes; using System; @@ -27,23 +29,21 @@ public class PSBlobInventoryPolicy public PSBlobInventoryPolicy() { } - public PSBlobInventoryPolicy(BlobInventoryPolicy policy, string ResourceGroupName, string StorageAccountName) + public PSBlobInventoryPolicy(Track2.BlobInventoryPolicyResource policy, string resourceGroupName, string storageAccountName) { - this.ResourceGroupName = ResourceGroupName; - this.StorageAccountName = StorageAccountName; + this.ResourceGroupName = resourceGroupName; + this.StorageAccountName = storageAccountName; this.Id = policy.Id; - this.Name = policy.Name; - this.Type = policy.Type; - this.LastModifiedTime = policy.LastModifiedTime; - this.SystemData = policy.SystemData is null ? null : new PSSystemData(policy.SystemData); + this.Name = policy.Data.Name; + this.Type = policy.Data.ResourceType; + this.LastModifiedTime = policy.Data.LastModifiedOn; + this.SystemData = policy.Data.SystemData is null ? null : new PSSystemData(policy.Data.SystemData); + this.Enabled = policy.Data.Policy.Enabled; - this.Enabled = policy.Policy.Enabled; - this.Destination = policy.Policy.Destination; - - if (policy.Policy.Rules != null) + if (policy.Data.Policy.Rules != null) { List psRules = new List(); - foreach (BlobInventoryPolicyRule rule in policy.Policy.Rules) + foreach (Track2Models.BlobInventoryPolicyRule rule in policy.Data.Policy.Rules) { psRules.Add(new PSBlobInventoryPolicyRule(rule)); } @@ -55,32 +55,29 @@ public PSBlobInventoryPolicy(BlobInventoryPolicy policy, string ResourceGroupNam } } - public BlobInventoryPolicy ParseBlobInventoryPolicy() + + public Track2.BlobInventoryPolicyData ParseBlobInventoryPolicy() { - List invRules = ParseBlobInventoryPolicyRules(this.Rules); + List invRules = ParseBlobInventoryPolicyRules(this.Rules); + + Track2Models.BlobInventoryPolicySchema policySchema = new Track2Models.BlobInventoryPolicySchema( + this.Enabled, + Track2Models.InventoryRuleType.Inventory, + invRules); - BlobInventoryPolicySchema policySchema = new BlobInventoryPolicySchema() + Track2.BlobInventoryPolicyData data = new Track2.BlobInventoryPolicyData { - Enabled = this.Enabled, - //Destination = this.Destination, - Rules = invRules + Policy = policySchema, }; - return new BlobInventoryPolicy( - policySchema, - this.Id, - this.Name, - this.Type, - this.LastModifiedTime, - this.SystemData is null ? null : this.SystemData.ParseSystemData() - ); + return data; } - public static List ParseBlobInventoryPolicyRules(PSBlobInventoryPolicyRule[] rules) + public static List ParseBlobInventoryPolicyRules(PSBlobInventoryPolicyRule[] rules) { - List invRules = null; + List invRules = null; if (rules != null) { - invRules = new List(); + invRules = new List(); foreach (PSBlobInventoryPolicyRule rule in rules) { invRules.Add(rule.ParseBlobInventoryPolicyRule()); @@ -99,7 +96,7 @@ public static List ParseBlobInventoryPolicyRules(PSBlob [Ps1Xml(Label = "Type", Target = ViewControl.List, Position = 2)] public string Type { get; set; } [Ps1Xml(Label = "LastModifiedTime", Target = ViewControl.List, Position = 4)] - public DateTime? LastModifiedTime { get; set; } + public DateTimeOffset? LastModifiedTime { get; set; } //public PSBlobInventoryPolicySchema Policy { get; set; } @@ -108,7 +105,6 @@ public static List ParseBlobInventoryPolicyRules(PSBlob [Ps1Xml(Label = "Rules", Target = ViewControl.List, Position = 7)] public PSBlobInventoryPolicyRule[] Rules { get; set; } public PSSystemData SystemData { get; set; } - public string Destination { get; private set; } } /// @@ -117,7 +113,7 @@ public static List ParseBlobInventoryPolicyRules(PSBlob public class PSBlobInventoryPolicyRule { public PSBlobInventoryPolicyRule() { } - public PSBlobInventoryPolicyRule(BlobInventoryPolicyRule rule) + public PSBlobInventoryPolicyRule(Track2Models.BlobInventoryPolicyRule rule) { this.Enabled = rule.Enabled; this.Name = rule.Name; @@ -125,15 +121,17 @@ public PSBlobInventoryPolicyRule(BlobInventoryPolicyRule rule) this.Definition = rule.Definition is null ? null : new PSBlobInventoryPolicyDefinition(rule.Definition); } - public BlobInventoryPolicyRule ParseBlobInventoryPolicyRule() + public Track2Models.BlobInventoryPolicyRule ParseBlobInventoryPolicyRule() { - return new BlobInventoryPolicyRule() - { - Enabled = this.Enabled, - Name = this.Name, - Destination = this.Destination, - Definition = this.Definition is null ? null : this.Definition.parseBlobInventoryPolicyDefinition() - }; + Track2Models.BlobInventoryPolicyDefinition policyDefinition = this.Definition?.parseBlobInventoryPolicyDefinition(); + + Track2Models.BlobInventoryPolicyRule policyRule = new Track2Models.BlobInventoryPolicyRule( + this.Enabled, + this.Name, + this.Destination, + policyDefinition); + + return policyRule; } public bool Enabled { get; set; } @@ -152,20 +150,29 @@ public class PSBlobInventoryPolicyDefinition { public PSBlobInventoryPolicyDefinition() { } - public PSBlobInventoryPolicyDefinition(BlobInventoryPolicyDefinition Definition) + public PSBlobInventoryPolicyDefinition(Track2Models.BlobInventoryPolicyDefinition Definition) { this.Filters = Definition.Filters is null ? null : new PSBlobInventoryPolicyFilter(Definition.Filters); - this.Format = Definition.Format; - this.Schedule = Definition.Schedule; - this.ObjectType = Definition.ObjectType; + this.Format = Definition.Format.ToString(); + this.Schedule = Definition.Schedule.ToString(); + this.ObjectType = Definition.ObjectType.ToString(); this.SchemaFields = Definition.SchemaFields is null ? null : ((List)Definition.SchemaFields).ToArray(); } - public BlobInventoryPolicyDefinition parseBlobInventoryPolicyDefinition() + public Track2Models.BlobInventoryPolicyDefinition parseBlobInventoryPolicyDefinition() { - return new BlobInventoryPolicyDefinition(this.Format, this.Schedule, this.ObjectType, - this.SchemaFields is null? null: new List(this.SchemaFields), - this.Filters is null? null : this.Filters.ParseBlobInventoryPolicyFilter()); + Track2Models.BlobInventoryPolicyDefinition policyDefinition = new Track2Models.BlobInventoryPolicyDefinition( + new Track2Models.Format(this.Format), + new Track2Models.Schedule(this.Schedule), + new Track2Models.ObjectType(this.ObjectType), + this.SchemaFields is null ? null : new List(this.SchemaFields) + ); + + if (this.Filters != null) + { + policyDefinition.Filters = this.Filters.ParseBlobInventoryPolicyFilter(); + } + return policyDefinition; } public PSBlobInventoryPolicyFilter Filters { get; set; } @@ -213,7 +220,7 @@ public class PSBlobInventoryPolicyFilter { public PSBlobInventoryPolicyFilter() { } - public PSBlobInventoryPolicyFilter(BlobInventoryPolicyFilter filters) + public PSBlobInventoryPolicyFilter(Track2Models.BlobInventoryPolicyFilter filters) { this.PrefixMatch = PSManagementPolicyRuleFilter.StringListToArray(filters.PrefixMatch); this.BlobTypes = PSManagementPolicyRuleFilter.StringListToArray(filters.BlobTypes); @@ -221,15 +228,29 @@ public PSBlobInventoryPolicyFilter(BlobInventoryPolicyFilter filters) this.IncludeSnapshots = filters.IncludeSnapshots; } - public BlobInventoryPolicyFilter ParseBlobInventoryPolicyFilter() + public Track2Models.BlobInventoryPolicyFilter ParseBlobInventoryPolicyFilter() { - return new BlobInventoryPolicyFilter() + Track2Models.BlobInventoryPolicyFilter policyFilter = new Track2Models.BlobInventoryPolicyFilter() { - PrefixMatch = PSManagementPolicyRuleFilter.StringArrayToList(this.PrefixMatch), - BlobTypes = PSManagementPolicyRuleFilter.StringArrayToList(this.BlobTypes), IncludeSnapshots = this.IncludeSnapshots, IncludeBlobVersions = this.IncludeBlobVersions }; + + if (this.PrefixMatch != null) + { + foreach (string prefixMatch in this.PrefixMatch) + { + policyFilter.PrefixMatch.Add(prefixMatch); + } + } + if (this.BlobTypes != null) + { + foreach (string blobType in this.BlobTypes) + { + policyFilter.BlobTypes.Add(blobType); + } + } + return policyFilter; } public string[] PrefixMatch { get; set; } @@ -245,26 +266,21 @@ public class PSSystemData { public PSSystemData() { } - public PSSystemData(SystemData SystemData) + public PSSystemData(global::Azure.ResourceManager.Models.SystemData SystemData) { this.CreatedBy = SystemData.CreatedBy; - this.CreatedByType = SystemData.CreatedByType; - this.CreatedAt = SystemData.CreatedAt; + this.CreatedByType = SystemData.CreatedByType.ToString(); + this.CreatedAt = SystemData.CreatedOn; this.LastModifiedBy = SystemData.LastModifiedBy; - this.LastModifiedByType = SystemData.LastModifiedByType; - this.LastModifiedAt = SystemData.LastModifiedAt; - } - - public SystemData ParseSystemData() - { - return new SystemData(this.CreatedBy, this.CreatedByType, this.CreatedAt, this.LastModifiedBy, this.LastModifiedByType, this.LastModifiedAt); + this.LastModifiedByType = SystemData.LastModifiedByType.ToString(); + this.LastModifiedAt = SystemData.LastModifiedOn; } public string CreatedBy { get; set; } public string CreatedByType { get; set; } - public DateTime? CreatedAt { get; set; } + public DateTimeOffset? CreatedAt { get; set; } public string LastModifiedBy { get; set; } public string LastModifiedByType { get; set; } - public DateTime? LastModifiedAt { get; set; } + public DateTimeOffset? LastModifiedAt { get; set; } } } diff --git a/src/Storage/Storage.Management/Storage.Management.csproj b/src/Storage/Storage.Management/Storage.Management.csproj index faa96b846130..b3947979adf6 100644 --- a/src/Storage/Storage.Management/Storage.Management.csproj +++ b/src/Storage/Storage.Management/Storage.Management.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs b/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs index 1d3c234f8f33..65cfe94bcb93 100644 --- a/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs @@ -15,10 +15,9 @@ using Microsoft.Azure.Commands.Management.Storage.Models; using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters; using Microsoft.Azure.Management.Internal.Resources.Utilities.Models; -using Microsoft.Azure.Management.Storage; -using Microsoft.Azure.Management.Storage.Models; using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; using System.Management.Automation; +using Track2 = Azure.ResourceManager.Storage; namespace Microsoft.Azure.Commands.Management.Storage { @@ -95,9 +94,8 @@ public override void ExecuteCmdlet() break; } - BlobInventoryPolicy policy = this.StorageClient.BlobInventoryPolicies.Get( - this.ResourceGroupName, - this.StorageAccountName); + Track2.BlobInventoryPolicyResource policy = + this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default").Get(); WriteObject(new PSBlobInventoryPolicy(policy, this.ResourceGroupName, this.StorageAccountName), true); } diff --git a/src/Storage/Storage.Management/StorageAccount/InvokeAzureStorageAccountFailover.cs b/src/Storage/Storage.Management/StorageAccount/InvokeAzureStorageAccountFailover.cs index 6ede5d4e801d..404ffe443a5c 100644 --- a/src/Storage/Storage.Management/StorageAccount/InvokeAzureStorageAccountFailover.cs +++ b/src/Storage/Storage.Management/StorageAccount/InvokeAzureStorageAccountFailover.cs @@ -12,16 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections; -using System.Collections.Generic; -using System.Management.Automation; -using Microsoft.Azure.Commands.ResourceManager.Common.Tags; -using Microsoft.Azure.Management.Storage; -using Microsoft.Azure.Management.Storage.Models; -using StorageModels = Microsoft.Azure.Management.Storage.Models; 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; using System.Text; namespace Microsoft.Azure.Commands.Management.Storage @@ -89,7 +86,6 @@ public override void ExecuteCmdlet() shouldContinuePrompt.AppendLine(" 2. After the failover, your storage account type will be converted to locally redundant storage (LRS). You can convert your account to use geo-redundant storage (GRS)."); shouldContinuePrompt.AppendLine(" 3. Once you re-enable GRS for your storage account, Microsoft will replicate data to your new secondary region. Replication time is dependent on the amount of data to replicate. Please note that there are bandwidth charges for the bootstrap. Please refer to doc: https://azure.microsoft.com/en-us/pricing/details/bandwidth/"); - if (this.force || ShouldContinue(shouldContinuePrompt.ToString(), "")) { if (ParameterSetName == AccountObjectParameterSet) @@ -98,11 +94,8 @@ public override void ExecuteCmdlet() this.Name = InputObject.StorageAccountName; } - this.StorageClient.StorageAccounts.Failover( - this.ResourceGroupName, - this.Name); - - var storageAccount = this.StorageClient.StorageAccounts.GetProperties(this.ResourceGroupName, this.Name); + this.StorageClientTrack2.GetStorageAccount(this.ResourceGroupName, this.Name).Failover(global::Azure.WaitUntil.Completed); + var storageAccount = this.StorageClientTrack2.GetStorageAccount(this.ResourceGroupName, this.Name).Get(); WriteStorageAccount(storageAccount); } diff --git a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs index 7dafd8af458a..5ab94b196d46 100644 --- a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs +++ b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs @@ -14,13 +14,11 @@ 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 Microsoft.WindowsAzure.Commands.Common.CustomAttributes; using System.Collections.Generic; using System.Management.Automation; using System.Reflection; -using StorageModels = Microsoft.Azure.Management.Storage.Models; + namespace Microsoft.Azure.Commands.Management.Storage { diff --git a/src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageBlobInventoryPolicy.cs b/src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageBlobInventoryPolicy.cs index 74610ef35315..0dd4ccf54cf6 100644 --- a/src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/StorageAccount/RemoveAzureStorageBlobInventoryPolicy.cs @@ -15,9 +15,8 @@ using Microsoft.Azure.Commands.Management.Storage.Models; using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters; using Microsoft.Azure.Management.Internal.Resources.Utilities.Models; -using Microsoft.Azure.Management.Storage; -using Microsoft.Azure.Management.Storage.Models; using System.Management.Automation; +using Azure; namespace Microsoft.Azure.Commands.Management.Storage { @@ -115,10 +114,7 @@ public override void ExecuteCmdlet() // For AccountNameParameterSet, the ResourceGroupName and StorageAccountName can get from input directly break; } - - this.StorageClient.BlobInventoryPolicies.Delete( - this.ResourceGroupName, - this.StorageAccountName); + this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default").Delete(WaitUntil.Completed); if (PassThru.IsPresent) { diff --git a/src/Storage/Storage.Management/StorageAccount/SetAzureStorageBlobInventoryPolicy.cs b/src/Storage/Storage.Management/StorageAccount/SetAzureStorageBlobInventoryPolicy.cs index a26f7492a334..cf2a6ceaaad9 100644 --- a/src/Storage/Storage.Management/StorageAccount/SetAzureStorageBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/StorageAccount/SetAzureStorageBlobInventoryPolicy.cs @@ -12,16 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Azure; 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; -using Newtonsoft.Json.Linq; -using System.Globalization; -using System.Collections.Generic; using Microsoft.Azure.Management.Internal.Resources.Utilities.Models; using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; +using Newtonsoft.Json.Linq; +using System.Collections.Generic; +using System.Globalization; +using System.Management.Automation; +using Track2 = Azure.ResourceManager.Storage; +using Track2Models = Azure.ResourceManager.Storage.Models; namespace Microsoft.Azure.Commands.Management.Storage { @@ -184,33 +185,35 @@ public override void ExecuteCmdlet() this.ResourceGroupName = accountResource.ResourceGroupName; this.StorageAccountName = accountResource.ResourceName; } - BlobInventoryPolicy blobInventoryPolicy; + + Track2.BlobInventoryPolicyResource blobInventoryPolicyResource; switch (this.ParameterSetName) { case AccountObjectPolicyRuleParameterSet: case AccountNamePolicyRuleParameterSet: case AccountResourceIdPolicyRuleParameterSet: - blobInventoryPolicy = this.StorageClient.BlobInventoryPolicies.CreateOrUpdate( - this.ResourceGroupName, - this.StorageAccountName, - new BlobInventoryPolicySchema( - enabled: !(this.Disabled.IsPresent), - rules: PSBlobInventoryPolicy.ParseBlobInventoryPolicyRules(this.Rule))); + Track2.BlobInventoryPolicyData data = new Track2.BlobInventoryPolicyData(); + data.Policy = new Track2Models.BlobInventoryPolicySchema( + !(this.Disabled.IsPresent), + Track2Models.InventoryRuleType.Inventory, + PSBlobInventoryPolicy.ParseBlobInventoryPolicyRules(this.Rule)); + blobInventoryPolicyResource = this.StorageClientTrack2 + .GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default") + .Update(WaitUntil.Completed, data).Value; break; case AccountObjectPolicyObjectParameterSet: case AccountNamePolicyObjectParameterSet: case AccountResourceIdPolicyObjectParameterSet: - blobInventoryPolicy = this.StorageClient.BlobInventoryPolicies.CreateOrUpdate( - this.ResourceGroupName, - this.StorageAccountName, - this.Policy.ParseBlobInventoryPolicy().Policy); + blobInventoryPolicyResource = this.StorageClientTrack2 + .GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default") + .Update(WaitUntil.Completed, this.Policy.ParseBlobInventoryPolicy()).Value; break; default: throw new PSArgumentException(string.Format(CultureInfo.InvariantCulture, "Invalid ParameterSet: {0}", this.ParameterSetName)); } - WriteObject(new PSBlobInventoryPolicy(blobInventoryPolicy, this.ResourceGroupName, this.StorageAccountName), true); + WriteObject(new PSBlobInventoryPolicy(blobInventoryPolicyResource, this.ResourceGroupName, this.StorageAccountName), true); } } } From cbda26e7988cd1b21f52c75ee7339bc06cb1ecf2 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Mon, 20 Jun 2022 19:56:02 +0800 Subject: [PATCH 2/3] remove additional line --- .../StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs index 5ab94b196d46..a3003638aac8 100644 --- a/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs +++ b/src/Storage/Storage.Management/StorageAccount/NewAzureStorageBlobInventoryPolicyRule.cs @@ -19,7 +19,6 @@ using System.Management.Automation; using System.Reflection; - namespace Microsoft.Azure.Commands.Management.Storage { [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "StorageBlobInventoryPolicyRule", DefaultParameterSetName = BlobRuleParameterSet), OutputType(typeof(PSBlobInventoryPolicyRule))] From 7e8fe7b9622ef626c7866947f4c86acce8017915 Mon Sep 17 00:00:00 2001 From: Yifan Zhang Date: Fri, 24 Jun 2022 13:06:41 +0800 Subject: [PATCH 3/3] fix per comments --- .../Storage.Management/Models/PSBlobInventoryPolicy.cs | 1 + .../StorageAccount/GetAzureStorageBlobInventoryPolicy.cs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs b/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs index 7dca5dacbda8..a4e8c4e60d2f 100644 --- a/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/Models/PSBlobInventoryPolicy.cs @@ -39,6 +39,7 @@ public PSBlobInventoryPolicy(Track2.BlobInventoryPolicyResource policy, string r this.LastModifiedTime = policy.Data.LastModifiedOn; this.SystemData = policy.Data.SystemData is null ? null : new PSSystemData(policy.Data.SystemData); this.Enabled = policy.Data.Policy.Enabled; + // TODO: Destination is currently not supported yet. Will add later. if (policy.Data.Policy.Rules != null) { diff --git a/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs b/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs index 65cfe94bcb93..c2c996e4ec6c 100644 --- a/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs +++ b/src/Storage/Storage.Management/StorageAccount/GetAzureStorageBlobInventoryPolicy.cs @@ -39,6 +39,11 @@ public class GetAzureStorageBlobInventoryPolicyCommand : StorageAccountBaseCmdle /// private const string AccountResourceIdParameterSet = "AccountResourceId"; + /// + /// Default policy name + /// + private const string DefaultPolicyName = "default"; + [Parameter( Position = 0, Mandatory = true, @@ -95,7 +100,7 @@ public override void ExecuteCmdlet() } Track2.BlobInventoryPolicyResource policy = - this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, "default").Get(); + this.StorageClientTrack2.GetBlobInventoryPolicyResource(this.ResourceGroupName, this.StorageAccountName, DefaultPolicyName).Get(); WriteObject(new PSBlobInventoryPolicy(policy, this.ResourceGroupName, this.StorageAccountName), true); }