Fix tags usage in ARM cmdlets. (#2640)

* Fix tags usage

* Fix unit test for tags

* Fix scenarios test cases.

* Move TagsConversionHelper to Commands.ResourceManager.Common.

* Fix all the namespace usings for TagsCreationHelper.

* Fix wxi file.

* Fix KeyValue test failure.

* Fix Compute test case failures.

Author: Tiano2017

setup/azurecmdfiles.wxi

@@ -1640,9 +1640,6 @@
                         <Component Id="cmp97087B286DB8BA716A4D1CB18ABCAEAE" Guid="*">
                             <File Id="fil7433D00EFB79F3A4CCFD09E45AA44359" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.Azure.Commands.Resources.format.ps1xml" />
                         </Component>
-                        <Component Id="cmp31A15C935A4B99F456D6B8BCD2D2E607" Guid="*">
-                            <File Id="filA627F4EBDC76F2F28011727F50240470" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.Azure.Commands.Tags.dll" />
-                        </Component>
                         <Component Id="cmpE99FD9F5AA46D65F845DC100BCC04143" Guid="*">
                             <File Id="fil4493CA681A6906CF28E2206F03AAC26F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.Azure.Commands.Tags.dll-help.xml" />
                         </Component>
@@ -2800,9 +2797,6 @@
                         <Component Id="cmpF84401F8328D5324A149A870ED0F7301" Guid="*">
                             <File Id="fil306FAD8819A1173AE5A9586132F0D45D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml" />
                         </Component>
-                        <Component Id="cmpB9A36BC1052E6D29CA114E101033DD08" Guid="*">
-                            <File Id="fil8798955DF65FB78CCF9FA55BCFEA7D22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.Tags.dll" />
-                        </Component>
                         <Component Id="cmp2AC64458897F6B7E0BF3138ED38D02AB" Guid="*">
                             <File Id="fil52EF96572CC6A4EDE16B1D6FDF0413CD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.Tags.dll-help.xml" />
                         </Component>
@@ -3385,9 +3379,6 @@
                         <Component Id="cmpAF6FDD36F73DF1B8825F6FCDBF99D507" Guid="*">
                             <File Id="filE60B89A0375025D8078CBBE13C43626A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Resources.format.ps1xml" />
                         </Component>
-                        <Component Id="cmp7FD7399FBFB41BA93701CD0B54D3E590" Guid="*">
-                            <File Id="filD2AC6C37607AB4FA8D87E34E6C5E70C7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Tags.dll" />
-                        </Component>
                         <Component Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" Guid="*">
                             <File Id="filF0458BC5D689F3255BB60BB64ACD3FAF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Tags.dll-help.xml" />
                         </Component>
@@ -5999,7 +5990,6 @@
             <ComponentRef Id="cmp1ACAC80DFD34A6D24C01FC970917FBA3" />
             <ComponentRef Id="cmp8DE41CF6364D106A835E7C826522203E" />
             <ComponentRef Id="cmp97087B286DB8BA716A4D1CB18ABCAEAE" />
-            <ComponentRef Id="cmp31A15C935A4B99F456D6B8BCD2D2E607" />
             <ComponentRef Id="cmpE99FD9F5AA46D65F845DC100BCC04143" />
             <ComponentRef Id="cmp3C615E8BF013B4F5F438749CFE015D29" />
             <ComponentRef Id="cmp9EA2D01CED057826033649A3949A590C" />
@@ -6377,7 +6367,6 @@
             <ComponentRef Id="cmp5A0DCA5FB70CF654DDE7FB3D9F1876BE" />
             <ComponentRef Id="cmp90CFE28929C10FB584749B3E6662A8D9" />
             <ComponentRef Id="cmpF84401F8328D5324A149A870ED0F7301" />
-            <ComponentRef Id="cmpB9A36BC1052E6D29CA114E101033DD08" />
             <ComponentRef Id="cmp2AC64458897F6B7E0BF3138ED38D02AB" />
             <ComponentRef Id="cmpF639DACA74489D20363DF71CB7BBAEAF" />
             <ComponentRef Id="cmp1D909E9D8F129592EECF82B544F73D88" />
@@ -6568,7 +6557,6 @@
             <ComponentRef Id="cmp93772AC2745F6B6E807F7B5A7028523B" />
             <ComponentRef Id="cmp24DFBDAA3B9275C9231D1F7FCC9DAC35" />
             <ComponentRef Id="cmpAF6FDD36F73DF1B8825F6FCDBF99D507" />
-            <ComponentRef Id="cmp7FD7399FBFB41BA93701CD0B54D3E590" />
             <ComponentRef Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" />
             <ComponentRef Id="cmpC3F5E35306467501723E692635390B24" />
             <ComponentRef Id="cmp8F839B12289A46E7A8870014F8111911" />

src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj

@@ -282,6 +282,10 @@
     </Compile>
     <Compile Include="RPRegistrationDelegatingHandler.cs" />
     <Compile Include="ServiceClientTracingInterceptor.cs" />
+    <Compile Include="Tags\PSTag.cs" />
+    <Compile Include="Tags\PSTagValue.cs" />
+    <Compile Include="Tags\PSTagValuePair.cs" />
+    <Compile Include="Tags\TagsConversionHelper.cs" />
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>

src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.Designer.cs

@@ -151,6 +151,9 @@ Select Y to enable data collection [Y/N]:</value>
   <data name="InvalidDefaultSubscription" xml:space="preserve">
     <value>No default subscription has been designated. Use Select-AzureSubscription -Default &lt;subscriptionName&gt; to set the default subscription.</value>
   </data>
+  <data name="InvalidTagFormat" xml:space="preserve">
+    <value>Invalid tag format. Expect @{Name = "tagName"} or @{Name = "tagName"; Value = "tagValue"}</value>
+  </data>
   <data name="NoSubscriptionFound" xml:space="preserve">
     <value>The provided account {0} does not have access to any subscriptions. Please try logging in with different credentials.</value>
   </data>

src/ResourceManager/Common/Commands.ResourceManager.Common/Properties/Resources.resx

@@ -14,7 +14,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.Azure.Commands.Tags.Model
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Tags
 {
     public class PSTag
     {

src/ResourceManager/Tags/Commands.Tags/Model/PSTag.cs renamed to src/ResourceManager/Common/Commands.ResourceManager.Common/Tags/PSTag.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Tags.Model
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Tags
 {
     public class PSTagValue
     {

src/ResourceManager/Tags/Commands.Tags/Model/PSTagValue.cs renamed to src/ResourceManager/Common/Commands.ResourceManager.Common/Tags/PSTagValue.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Tags.Model
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Tags
 {
     public class PSTagValuePair
     {

src/ResourceManager/Tags/Commands.Tags/Model/PSTagValuePair.cs renamed to src/ResourceManager/Common/Commands.ResourceManager.Common/Tags/PSTagValuePair.cs

@@ -15,30 +15,32 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Common.Properties.Resources;
 
-using ProjectResources = Microsoft.Azure.Commands.Tags.Properties.Resources;
-
-namespace Microsoft.Azure.Commands.Tags.Model
+namespace Microsoft.Azure.Commands.ResourceManager.Common.Tags
 {
     public class TagsConversionHelper
     {
         public static PSTagValuePair Create(Hashtable hashtable)
         {
-            if (hashtable == null ||
-                !hashtable.ContainsKey("Name"))
+            if (hashtable == null)
             {
                 return null;
             }
 
-            PSTagValuePair tagValue = new PSTagValuePair();
-            tagValue.Name = hashtable["Name"].ToString();
-
-            if (hashtable.ContainsKey("Value"))
+            IDictionaryEnumerator ide = hashtable.GetEnumerator();
+            PSTagValuePair tagValuePair = new PSTagValuePair();
+            if(ide.MoveNext())
             {
-                tagValue.Value = hashtable["Value"].ToString();
+                DictionaryEntry entry = (DictionaryEntry) ide.Current;
+                tagValuePair.Name = entry.Key.ToString();
+                if(entry.Value != null)
+                {
+                    tagValuePair.Value = entry.Value.ToString();
+                }
             }
-
-            return tagValue;
+            return tagValuePair;
         }
 
         public static Dictionary<string, string> CreateTagDictionary(Hashtable[] hashtableArray, bool validate)
@@ -47,19 +49,21 @@ public static Dictionary<string, string> CreateTagDictionary(Hashtable[] hashtab
             if (hashtableArray != null && hashtableArray.Length > 0)
             {
                 tagDictionary = new Dictionary<string, string>();
+                PSTagValuePair tvPair = new PSTagValuePair();
                 foreach (var tag in hashtableArray)
                 {
-                    var tagValuePair = Create(tag);
-                    if (tagValuePair != null)
+                    foreach(DictionaryEntry entry in tag)
                     {
-                        if (tagValuePair.Value != null)
+                        tvPair.Name = entry.Key.ToString();
+                        if (entry.Value != null)
                         {
-                            tagDictionary[tagValuePair.Name] = tagValuePair.Value;
+                            tvPair.Value = entry.Value.ToString();
                         }
                         else
                         {
-                            tagDictionary[tagValuePair.Name] = "";
+                            tvPair.Value = string.Empty;
                         }
+                        tagDictionary[tvPair.Name] = tvPair.Value;
                     }
                 }
             }
@@ -70,11 +74,6 @@ public static Dictionary<string, string> CreateTagDictionary(Hashtable[] hashtab
                 {
                     throw new ArgumentException(ProjectResources.InvalidTagFormat);
                 }
-                if (hashtableArray != null && hashtableArray.Length > 0 && hashtableArray[0].Count > 0 &&
-                    (tagDictionary == null || hashtableArray.Length != tagDictionary.Count))
-                {
-                    throw new ArgumentException(ProjectResources.InvalidTagFormatNotUniqueName);
-                }
             }
 
             return tagDictionary;
@@ -92,8 +91,7 @@ public static Hashtable[] CreateTagHashtable(IDictionary<string, string> diction
             {
                 tagHashtable.Add(new Hashtable
                 {
-                    {"Name", key},
-                    {"Value", dictionary[key]}
+                    {key, dictionary[key]}
                 });
             }
             return tagHashtable.ToArray();

src/ResourceManager/Tags/Commands.Tags/Model/TagsConversionHelper.cs renamed to src/ResourceManager/Common/Commands.ResourceManager.Common/Tags/TagsConversionHelper.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using System.Collections;
 using System.Collections.Generic;
 

src/ResourceManager/Compute/Commands.Compute/Common/HashTableExtensions.cs

@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.Properties;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.DataLake.Analytics;
 using Microsoft.Azure.Management.DataLake.Analytics.Models;
 using Microsoft.Rest.Azure;

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs

@@ -13,7 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.DataLakeStore.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.DataLake.Store.Models;
 using System.Collections;
 using System.Management.Automation;

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/SetAzureRmDataLakeStoreAccount.cs

@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.Properties;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.DataLake.Store;
 using Microsoft.Azure.Management.DataLake.Store.Models;
 using Microsoft.Rest.Azure;

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs

@@ -12,24 +12,21 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Dns;
 using Microsoft.Azure.Management.Dns.Models;
-using Sdk = Microsoft.Azure.Management.Dns.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using ProjectResources = Microsoft.Azure.Commands.Dns.Properties.Resources;
+using Sdk = Microsoft.Azure.Management.Dns.Models;
 
 namespace Microsoft.Azure.Commands.Dns.Models
 {
-    using Properties;
     using Rest.Azure;
-    using AzureOperationResponse = Azure.AzureOperationResponse;
 
     public class DnsClient
     {

src/ResourceManager/Dns/Commands.Dns/Models/DnsClient.cs

@@ -193,7 +193,7 @@ function Test-ListAllVaultsInSubscription
 function Test-ListVaultsByTag
 {
     Param($tagName, $tagValue)
-    $list = Get-AzureRmKeyVault -Tag  @{Name = $tagName; Value = $tagValue}
+    $list = Get-AzureRmKeyVault -Tag  @{ $tagName = $tagValue }
 
     Assert-NotNull $list
     Assert-True { $list.Count -gt 0 }

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/ControlPlane/KeyVaultManagementTests.ps1

@@ -17,7 +17,7 @@
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.KeyVault.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Management.Resources.Models;
 using System;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultManagementCmdletBase.cs

@@ -13,8 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.ActiveDirectory.GraphClient;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Commands.Resources.Models;
-using Microsoft.Azure.Commands.Tags.Model;
 using System;
 using System.Linq;
 using KeyVaultManagement = Microsoft.Azure.Management.KeyVault;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/PSVault.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using System.Collections;
 using PSResourceManagerModels = Microsoft.Azure.Commands.Resources.Models;
 using ResourceManagement = Microsoft.Azure.Management.Resources.Models;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/PSVaultIdentityItem.cs

@@ -16,7 +16,7 @@
 using Microsoft.Azure.ActiveDirectory.GraphClient;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.KeyVault;
 using System;
 using System.Collections.Generic;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/VaultManagementClient.cs

@@ -15,7 +15,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using Microsoft.Azure.Management.Network.Models;
 using System.Net;

src/ResourceManager/Network/Commands.Network/ApplicationGateway/ApplicationGatewayBaseCmdlet.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System.Collections;
 using System.Collections.Generic;

src/ResourceManager/Network/Commands.Network/ApplicationGateway/NewAzureApplicationGatewayCommand.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System;
 using System.Management.Automation;

src/ResourceManager/Network/Commands.Network/ApplicationGateway/SetAzureApplicationGatewayCommand.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System;
 using System.Management.Automation;

src/ResourceManager/Network/Commands.Network/ApplicationGateway/StartAzureApplicationGatewayCommand.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System;
 using System.Management.Automation;

src/ResourceManager/Network/Commands.Network/ApplicationGateway/StopAzureApplicationGatewayCommand.cs

@@ -15,7 +15,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System.Net;
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/ExpressRouteCircuitBaseCmdlet.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System.Management.Automation;
 using MNM = Microsoft.Azure.Management.Network.Models;

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/MoveAzureExpressRouteCircuitCommand.cs

@@ -14,7 +14,7 @@
 
 using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
-using Microsoft.Azure.Commands.Tags.Model;
+using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
 using System.Collections;
 using System.Collections.Generic;