Fix for Bug 4308340:[SDKBash2][Powershell] Add tags in Vault object

Author: dragonfly91

src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs

@@ -12,9 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.AzureBackup.Helpers;
 using Microsoft.Azure.Management.BackupServices.Models;
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.AzureBackup.ClientAdapter
 {
@@ -29,7 +32,7 @@ public partial class AzureBackupClientAdapter
         /// <param name="location"></param>
         /// <param name="skuParam"></param>
         /// <returns></returns>
-        public AzureBackupVault CreateOrUpdateAzureBackupVault(string resourceGroupName, string vaultName, string location)
+        public AzureBackupVault CreateOrUpdateAzureBackupVault(string resourceGroupName, string vaultName, string location, Hashtable[] Tag)
         {
             var createResourceParameters = new AzureBackupVaultCreateOrUpdateParameters()
             {
@@ -41,6 +44,7 @@ public AzureBackupVault CreateOrUpdateAzureBackupVault(string resourceGroupName,
                         Name = defaultSKU,
                     },
                 },
+                Tags = Tag.ConvertToDictionary(),
             };
 
             var response = AzureBackupVaultClient.Vault.CreateOrUpdateAsync(resourceGroupName, vaultName, createResourceParameters, GetCustomRequestHeaders(), CmdletCancellationToken).Result;

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/NewAzureRMBackupVault.cs

@@ -16,6 +16,7 @@
 using Microsoft.Azure.Commands.AzureBackup.Models;
 using Microsoft.Azure.Commands.AzureBackup.Properties;
 using System;
+using System.Collections;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
@@ -41,10 +42,9 @@ public class NewAzureRMBackupVault : AzureBackupCmdletBase
         [Parameter(Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.StorageType)]
         public AzureBackupVaultStorageType Storage { get; set; }
 
-        // TODO: Add support for tags
-        //[Alias("Tags")]
-        //[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ResourceTags)]
-        //public Hashtable[] Tag { get; set; }        
+        [Alias("Tags")]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ResourceTags)]
+        public Hashtable[] Tag { get; set; }        
 
         public override void ExecuteCmdlet()
         {
@@ -55,7 +55,7 @@ public override void ExecuteCmdlet()
 
                 WriteDebug(String.Format(Resources.CreatingBackupVault, ResourceGroupName, Name));
 
-                var createdVault = AzureBackupClient.CreateOrUpdateAzureBackupVault(ResourceGroupName, Name, Region);
+                var createdVault = AzureBackupClient.CreateOrUpdateAzureBackupVault(ResourceGroupName, Name, Region, Tag);
 
                 if (Storage != 0)
                 {

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/SetAzureRMBackupVault.cs

@@ -16,6 +16,7 @@
 using Microsoft.Azure.Commands.AzureBackup.Models;
 using Microsoft.Azure.Commands.AzureBackup.Properties;
 using System;
+using System.Collections;
 using System.Management.Automation;
 using CmdletModel = Microsoft.Azure.Commands.AzureBackup.Models;
 
@@ -31,9 +32,9 @@ public class SetAzureRMBackupVault : AzureBackupVaultCmdletBase
         public AzureBackupVaultStorageType Storage { get; set; }
 
         // TODO: Add support for tags
-        //[Alias("Tags")]
-        //[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ResourceTags)]
-        //public Hashtable[] Tag { get; set; }
+        [Alias("Tags")]
+        [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ResourceTags)]
+        public Hashtable[] Tag { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -48,6 +49,11 @@ public override void ExecuteCmdlet()
                     AzureBackupClient.UpdateStorageType(Vault.ResourceGroupName, Vault.Name, Storage.ToString());
                 }
 
+                if (Tag != null)
+                {
+                    AzureBackupClient.CreateOrUpdateAzureBackupVault(Vault.ResourceGroupName, Vault.Name, Vault.Region, Tag);
+                }
+
                 var backupVault = AzureBackupClient.GetVault(Vault.ResourceGroupName, Vault.Name);
                 WriteObject(VaultHelpers.GetCmdletVault(backupVault, AzureBackupClient.GetStorageTypeDetails(Vault.ResourceGroupName, Vault.Name)));
             });

src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/VaultHelpers.cs

@@ -13,6 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using ClientModel = Microsoft.Azure.Management.BackupServices.Models;
 using CmdletModel = Microsoft.Azure.Commands.AzureBackup.Models;
 
@@ -35,6 +38,7 @@ public static CmdletModel.AzureRMBackupVault GetCmdletVault(ClientModel.AzureBac
                 Region = vault.Location,
                 ResourceGroupName = GetResourceGroup(vault.Id),
                 Storage = storageType,
+                Tags = vault.Tags.GetTagsHashtables(),
             };
 
             return response;
@@ -50,5 +54,76 @@ public static string GetResourceGroup(string vaultId)
             string[] tokens = vaultId.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
             return tokens[3];
         }
+
+        /// <summary>
+        /// Extension to convert enumerable Hashtable into a dictionary
+        /// </summary>
+        /// <param name="tags"></param>
+        /// <returns></returns>
+        public static Dictionary<string, string> ConvertToDictionary(this Hashtable[] tags)
+        {
+            return tags == null
+                ? null
+                : tags
+                    .CoalesceEnumerable()
+                    .Select(hashTable => hashTable.OfType<DictionaryEntry>()
+                        .ToDictionary(kvp => kvp.Key.ToString(), kvp => kvp.Value))
+                    .Where(tagDictionary => tagDictionary.ContainsKey("Name"))
+                    .Select(tagDictionary => Tuple
+                        .Create(
+                            tagDictionary["Name"].ToString(),
+                            tagDictionary.ContainsKey("Value") ? tagDictionary["Value"].ToString() : string.Empty))
+                    .Distinct(kvp => kvp.Item1)
+                    .ToDictionary(kvp => kvp.Item1, kvp => kvp.Item2);
+        }
+
+        /// <summary>
+        /// Extension to coalesce enumerable
+        /// </summary>
+        /// <typeparam name="TSource">Enumerable type</typeparam>
+        /// <param name="source">Enumerable</param>
+        /// <returns></returns>
+        public static IEnumerable<TSource> CoalesceEnumerable<TSource>(this IEnumerable<TSource> source)
+        {
+            return source ?? Enumerable.Empty<TSource>();
+        }
+
+        /// <summary>
+        /// Extension to remove duplicates from enumerable based on a provided key selector
+        /// </summary>
+        /// <typeparam name="TSource">Enumerable type</typeparam>
+        /// <typeparam name="TKeyType">Type of key</typeparam>
+        /// <param name="source">Input enumerable to remove duplicates from</param>
+        /// <param name="keySelector">Lambda to select key</param>
+        /// <returns></returns>
+        public static IEnumerable<TSource> Distinct<TSource, TKeyType>(this IEnumerable<TSource> source, Func<TSource, TKeyType> keySelector)
+        {
+            var set = new Dictionary<TKeyType, TSource>(EqualityComparer<TKeyType>.Default);
+            foreach (TSource element in source)
+            {
+                TSource value;
+                var key = keySelector(element);
+                if (!set.TryGetValue(key, out value))
+                {
+                    yield return element;
+                }
+                else
+                {
+                    set[key] = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Extension to convert dictionary to hashtable enumerable
+        /// </summary>
+        /// <param name="tags"></param>
+        /// <returns></returns>
+        public static Hashtable[] GetTagsHashtables(this IDictionary<string, string> tags)
+        {
+            return tags == null
+                ? null
+                : tags.Select(kvp => new Hashtable { { "Name", kvp.Key }, { "Value", kvp.Value } }).ToArray();
+        }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzurePSBackupVault.cs

@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.AzureBackup.Properties;
 using System;
+using System.Collections;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Models
 {
@@ -30,7 +31,7 @@ public class AzureRMBackupVault
 
         public string Region { get; set; }
 
-        // public Hashtable[] Tags { get; protected set; }
+        public Hashtable[] Tags { get; set; }
 
         public string Storage { get; set; }