Removed Gallery client reference from Resources CLU project

Author: Hovsep Mkrtchyan

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/GalleryTemplatesClient.cs

@@ -12,19 +12,15 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Management.Resources;
+using Microsoft.Azure.Management.Resources.Models;
+using Microsoft.Rest.Azure;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using Microsoft.Azure.Commands.Tags.Model;
-using Microsoft.Azure.Management.Resources;
-using Microsoft.Azure.Management.Resources.Models;
-using Microsoft.Azure;
 using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
-using Hyak.Common;
-using Microsoft.Rest.Azure;
 
 namespace Microsoft.Azure.Commands.Resources.Models
 {
@@ -256,7 +252,7 @@ public virtual List<PSResource> FilterPSResources(BasePSResourceParameters param
         /// <returns>The created resource group</returns>
         public virtual PSResourceGroup CreatePSResourceGroup(CreatePSResourceGroupParameters parameters)
         {
-            bool createDeployment = !string.IsNullOrEmpty(parameters.GalleryTemplateIdentity) || !string.IsNullOrEmpty(parameters.TemplateFile);
+            bool createDeployment = !string.IsNullOrEmpty(parameters.TemplateFile);
             bool? resourceExists = ResourceManagementClient.ResourceGroups.CheckExistence(parameters.ResourceGroupName);
 
             ResourceGroup resourceGroup = null;
@@ -369,10 +365,6 @@ private string GenerateDeploymentName(CreatePSResourceGroupDeploymentParameters
             {
                 return Path.GetFileNameWithoutExtension(parameters.TemplateFile);
             }
-            else if (!string.IsNullOrEmpty(parameters.GalleryTemplateIdentity))
-            {
-                return parameters.GalleryTemplateIdentity;
-            }
             else
             {
                 return Guid.NewGuid().ToString();

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/PSGalleryItem.cs

@@ -56,9 +56,7 @@ public partial class ResourcesClient
         public IResourceManagementClient ResourceManagementClient { get; set; }
 
         public IAuthorizationManagementClient AuthorizationManagementClient { get; set; }
-
-        public GalleryTemplatesClient GalleryTemplatesClient { get; set; }
-
+        
         public Action<string> VerboseLogger { get; set; }
 
         public Action<string> ErrorLogger { get; set; }
@@ -137,32 +135,7 @@ public virtual PSResourceProvider UnregisterProvider(string providerName)
 
             return response.ToPSResourceProvider();
         }
-
-        private string GetTemplate(string templateFile, string galleryTemplateName)
-        {
-            string template;
-
-            if (!string.IsNullOrEmpty(templateFile))
-            {
-                if (Uri.IsWellFormedUriString(templateFile, UriKind.Absolute))
-                {
-                    template = GeneralUtilities.DownloadFile(templateFile);
-                }
-                else
-                {
-                    template = FileUtilities.DataStore.ReadFileAsText(templateFile);
-                }
-            }
-            else
-            {
-                Debug.Assert(!string.IsNullOrEmpty(galleryTemplateName));
-                string templateUri = GalleryTemplatesClient.GetGalleryTemplateFile(galleryTemplateName);
-                template = GeneralUtilities.DownloadFile(templateUri);
-            }
-
-            return template;
-        }
-
+        
         private ResourceGroup CreateOrUpdateResourceGroup(string name, string location, Hashtable[] tags)
         {
             Dictionary<string, string> tagDictionary = TagsConversionHelper.CreateTagDictionary(tags, validate: true);
@@ -354,13 +327,6 @@ private Deployment CreateBasicDeployment(ValidatePSResourceGroupDeploymentParame
                     Uri = parameters.TemplateFile
                 };
             }
-            else if (!string.IsNullOrEmpty(parameters.GalleryTemplateIdentity))
-            {
-                deployment.Properties.TemplateLink = new TemplateLink
-                {
-                    Uri = GalleryTemplatesClient.GetGalleryTemplateFile(parameters.GalleryTemplateIdentity)
-                };
-            }
             else
             {
                 deployment.Properties.Template = FileUtilities.DataStore.ReadFileAsText(parameters.TemplateFile);

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceClient.ResourceManager.cs

@@ -143,29 +143,6 @@ public override string ToString()
             return resourceId.ToString();
         }
 
-        public ResourceIdentity ToResourceIdentity(string apiVersion)
-        {
-            if (string.IsNullOrEmpty(ResourceType))
-            {
-                throw new ArgumentNullException("ResourceType");
-            }
-            if (ResourceType.IndexOf('/') < 0)
-            {
-                throw new ArgumentException(ProjectResources.ResourceTypeFormat, "ResourceType");
-            }
-
-            ResourcesResourceIdentity identity = new ResourcesResourceIdentity
-            {
-                ResourceName = ResourceName,
-                ParentResourcePath = ParentResource,
-                ResourceProviderNamespace = ResourceIdentifier.GetProviderFromResourceType(ResourceType),
-                ResourceType = ResourceIdentifier.GetTypeFromResourceType(ResourceType),
-                ResourceProviderApiVersion = apiVersion
-            };
-
-            return identity;
-        }
-
         private void AppendIfNotNull(ref StringBuilder resourceId, string format, string value)
         {
             if (!string.IsNullOrEmpty(value))

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceClient.cs

@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.Resources.Models;
 using Microsoft.Azure.Commands.Utilities.Common;
+using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -87,55 +88,7 @@ protected ResourceWithParameterBaseCmdlet()
             Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Uri to the template file.")]
         [ValidateNotNullOrEmpty]
         public string TemplateUri { get; set; }
-
-        public object GetDynamicParameters()
-        {
-            if (!string.IsNullOrEmpty(TemplateFile) &&
-                !TemplateFile.Equals(templateFile, StringComparison.OrdinalIgnoreCase))
-            {
-                templateFile = TemplateFile;
-                if (string.IsNullOrEmpty(TemplateParameterUri))
-                {
-                    dynamicParameters = GalleryTemplatesClient.GetTemplateParametersFromFile(
-                        TemplateFile,
-                        TemplateParameterObject,
-                        TemplateParameterFile,
-                        MyInvocation.MyCommand.Parameters.Keys.ToArray());
-                }
-                else
-                {
-                    dynamicParameters = GalleryTemplatesClient.GetTemplateParametersFromFile(
-                        TemplateFile,
-                        TemplateParameterObject,
-                        TemplateParameterUri,
-                        MyInvocation.MyCommand.Parameters.Keys.ToArray());
-                }
-            }
-            else if (!string.IsNullOrEmpty(TemplateUri) &&
-                !TemplateUri.Equals(templateUri, StringComparison.OrdinalIgnoreCase))
-            {
-                templateUri = TemplateUri;
-                if (string.IsNullOrEmpty(TemplateParameterUri))
-                {
-                    dynamicParameters = GalleryTemplatesClient.GetTemplateParametersFromFile(
-                        TemplateUri,
-                        TemplateParameterObject,
-                        TemplateParameterFile,
-                        MyInvocation.MyCommand.Parameters.Keys.ToArray());
-                }
-                else
-                {
-                    dynamicParameters = GalleryTemplatesClient.GetTemplateParametersFromFile(
-                        TemplateUri,
-                        TemplateParameterObject,
-                        TemplateParameterUri,
-                        MyInvocation.MyCommand.Parameters.Keys.ToArray());
-                }
-            }
-
-            return dynamicParameters;
-        }
-
+        
         protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject)
         {
             templateParameterObject = templateParameterObject ?? new Hashtable();
@@ -144,7 +97,7 @@ protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject
             string templateParameterFilePath = TemplateParameterFile;
             if (templateParameterFilePath != null && FileUtilities.DataStore.FileExists(templateParameterFilePath))
             {
-                var parametersFromFile = GalleryTemplatesClient.ParseTemplateParameterFileContents(templateParameterFilePath);
+                var parametersFromFile = this.ParseTemplateParameterFileContents(templateParameterFilePath);
                 parametersFromFile.ForEach(dp => templateParameterObject[dp.Key] = dp.Value.Value);
             }
 
@@ -157,5 +110,27 @@ protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject
 
             return templateParameterObject;
         }
+
+        private Dictionary<string, TemplateFileParameterV1> ParseTemplateParameterFileContents(string templateParameterFilePath)
+        {
+            Dictionary<string, TemplateFileParameterV1> parameters = new Dictionary<string, TemplateFileParameterV1>();
+
+            if (!string.IsNullOrEmpty(templateParameterFilePath) && 
+                FileUtilities.DataStore.FileExists(templateParameterFilePath))
+            {
+                try
+                {
+                    parameters = JsonConvert.DeserializeObject<Dictionary<string, TemplateFileParameterV1>>(
+                        FileUtilities.DataStore.ReadFileAsText(templateParameterFilePath));
+                }
+                catch (JsonSerializationException)
+                {
+                    parameters = new Dictionary<string, TemplateFileParameterV1>(
+                        JsonConvert.DeserializeObject<TemplateFileParameterV2>(FileUtilities.DataStore.ReadFileAsText(templateParameterFilePath)).Parameters);
+                }
+            }
+
+            return parameters;
+        }
     }
 }

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceIdentifier.cs

@@ -26,12 +26,7 @@ public abstract class ResourcesBaseCmdlet : AzureRMCmdlet
         /// Field that holds the resource client instance
         /// </summary>
         private ResourcesClient resourcesClient;
-
-        /// <summary>
-        /// Field that holds the gallery templates client instance
-        /// </summary>
-        private GalleryTemplatesClient galleryTemplatesClient;
-
+        
         /// <summary>
         /// Field that holds the policies client instance
         /// </summary>
@@ -59,26 +54,6 @@ public ResourcesClient ResourcesClient
             set { this.resourcesClient = value; }
         }
 
-        /// <summary>
-        /// Gets or sets the gallery templates client
-        /// </summary>
-        public GalleryTemplatesClient GalleryTemplatesClient
-        {
-            get
-            {
-                if (this.galleryTemplatesClient == null)
-                {
-                    // since this accessor can be called before BeginProcessing, use GetCurrentContext if no 
-                    // profile is passed in
-                    this.galleryTemplatesClient = new GalleryTemplatesClient(ClientFactory, DefaultContext);
-                }
-
-                return this.galleryTemplatesClient;
-            }
-
-            set { this.galleryTemplatesClient = value; }
-        }
-
         /// <summary>
         /// Gets or sets the policies client
         /// </summary>

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs

@@ -139,18 +139,7 @@ public static PSResourceProviderLocationInfo ToPSResourceProviderLocationInfo(th
 
             return result;
         }
-
-        public static PSGalleryItem ToPSGalleryItem(this GalleryItem gallery)
-        {
-            PSGalleryItem psGalleryItem = new PSGalleryItem();
-            foreach (PropertyInfo prop in gallery.GetType().GetProperties())
-            {
-                (typeof(PSGalleryItem)).GetProperty(prop.Name).SetValue(psGalleryItem, prop.GetValue(gallery, null), null);
-            }
-
-            return psGalleryItem;
-        }
-
+        
         // TODO: http://vstfrd:8080/Azure/RD/_workitems#_a=edit&id=3247094
         //public static PSDeploymentEventData ToPSDeploymentEventData(this EventData eventData)
         //{

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs

@@ -20,8 +20,6 @@ public class ValidatePSResourceGroupDeploymentParameters
     {
         public string ResourceGroupName { get; set; }
 
-        public string GalleryTemplateIdentity { get; set; }
-
         public string TemplateFile { get; set; }
 
         public Hashtable TemplateParameterObject { get; set; }

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourcesExtensions.cs

@@ -72,7 +72,7 @@ protected override void ProcessRecord()
                     break;
 
                 default:
-                    throw new ApplicationException(string.Format("Unknown parameter set encountered: '{0}'", this.ParameterSetName));
+                    throw new PSInvalidOperationException(string.Format("Unknown parameter set encountered: '{0}'", this.ParameterSetName));
             }
         }
     }

src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ValidatePSResourceGroupDeploymentParameters.cs

@@ -14,10 +14,7 @@
 
 using Microsoft.Azure.Commands.Resources.Models;
 using System.Collections.Generic;
-using System.IO;
 using System.Management.Automation;
-using System.Reflection;
-using Microsoft.Azure.Common.Authentication;
 
 namespace Microsoft.Azure.Commands.Resources
 {