modification for bash tests

Author: amarzavery

src/CLU/Microsoft.Azure.Commands.Websites.Test/project.json

@@ -23,7 +23,7 @@
     "Microsoft.Azure.Commands.Websites": "",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
     "Microsoft.Azure.Management.Resources": "3.3.1-preview",
-    "Microsoft.Azure.Management.Websites": "1.0.0-preview",
+    "Microsoft.Azure.Management.Websites": "1.0.2-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",

src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/AppServicePlans/RemoveAppServicePlan.cs

@@ -38,8 +38,8 @@ protected override void ProcessRecord()
 
             ConfirmAction(
                     Force.IsPresent,
-                    string.Format(Properties.Resources.RemovingAppServicePlan, Name),
-                    Properties.Resources.RemovingAppServicePlan,
+                    string.Format(WebSites.Properties.Resources.RemovingAppServicePlan, Name),
+                    WebSites.Properties.Resources.RemovingAppServicePlan,
                     Name,
                     () => WebsitesClient.RemoveAppServicePlan(ResourceGroupName, Name));
         }

src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/DeploymentSlots/RemoveAzureWebAppSlot.cs

@@ -43,8 +43,8 @@ protected override void ProcessRecord()
             base.ProcessRecord();
             ConfirmAction(
                 Force.IsPresent,
-                string.Format(Properties.Resources.RemoveWebappSlotWarning, Name, Slot),
-                Properties.Resources.RemoveWebappSlotMessage,
+                string.Format(WebSites.Properties.Resources.RemoveWebappSlotWarning, Name, Slot),
+                WebSites.Properties.Resources.RemoveWebappSlotMessage,
                 Name,
                 () => WebsitesClient.RemoveWebApp(ResourceGroupName, Name, Slot, deleteEmptyServerFarmByDefault, deleteMetricsByDefault, deleteSlotsByDefault));
         }

src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/WebApps/GetAzureWebAppMetrics.cs

@@ -47,7 +47,7 @@ public class GetAzureWebAppMetricsCmdlet : WebAppBaseCmdlet
         protected override void ProcessRecord()
         {
             base.ProcessRecord();
-            WriteObject(WebsitesClient.GetWebAppUsageMetrics(ResourceGroupName, Name, null, Metrics, StartTime, EndTime, Granularity, InstanceDetails.IsPresent));
+            WriteObject(WebsitesClient.GetWebAppUsageMetrics(ResourceGroupName, Name, null, Metrics, StartTime, EndTime, Granularity, InstanceDetails.IsPresent), true);
         }
     }
 }

src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/WebApps/RemoveAzureWebApp.cs

@@ -41,8 +41,8 @@ protected override void ProcessRecord()
             base.ProcessRecord();
             ConfirmAction(
                 Force.IsPresent,
-                string.Format(Properties.Resources.RemoveWebsiteWarning, Name),
-                Properties.Resources.RemoveWebsiteMessage,
+                string.Format(WebSites.Properties.Resources.RemoveWebsiteWarning, Name),
+                WebSites.Properties.Resources.RemoveWebsiteMessage,
                 Name,
                 () =>
                 {

src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/WebApps/SetAzureWebApp.cs

@@ -68,7 +68,7 @@ public class SetAzureWebAppCmdlet : WebAppBaseCmdlet
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 10, Mandatory = false, HelpMessage = "Web app connection strings. Example: -ConnectionStrings @{ ConnectionString1 = @{ Type = \"MySql\"; Value = \"MySql Connection string\"}; ConnectionString2 = @{ Type = \"SQLAzure\"; Value = \"SqlAzure Connection string 2\"} }")]
         [ValidateNotNullOrEmpty]
         [ValidateConnectionStrings]
-        public Hashtable ConnectionStrings { get; set; }
+        public Dictionary<string, ConnStringValueTypePair> ConnectionStrings { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 11, Mandatory = false, HelpMessage = "Web app handler mappings")]
         [ValidateNotNullOrEmpty]
@@ -126,7 +126,7 @@ protected override void ProcessRecord()
                     }
 
                     // Update web app configuration
-                    WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings.ConvertToConnectionStringDictionary());
+                    WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings);
 
                     if (parameters.Contains("AppServicePlan"))
                     {

src/CLU/Microsoft.Azure.Commands.Websites/Validations/ValidateConnectionStringsAttribute.cs

@@ -17,14 +17,25 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 using Microsoft.Azure.Management.WebSites.Models;
+using Newtonsoft.Json.Linq;
+
 
 namespace Microsoft.Azure.Commands.WebApps.Validations
 {
     public class ValidateConnectionStringsAttribute : ValidateArgumentsAttribute
     {
         protected override void Validate(object arguments, EngineIntrinsics engineIntrinsics)
         {
+            /*
+            This would be required for Powershell as it is easy to construct Hashtables in Posh vs Dictionary. For CLU when the user passes
+            this - "{ \"connstring1\": { \"Type\": \"MySql1212\", \"Value\": \"string value 1\" }}" as the connectionstring then 
+            JsonConvert.Deserialize() correctly converts it into a Dictionary<string, ConnStringValueTypePair>. Inbuilt model validation 
+            in the website MAML library works well. Hence this is not required for CLU. When we port this to master branch then we need to 
+            use #if def and have two definitions for connectionstrings, each for CLU and Powershell resp. as follows:
+            - public Dictionary<string, ConnStringValueTypePair> ConnectionStrings { get; set; }
+            - public Hashtable ConnectionStrings { get; set; }
             var hashtable = arguments as Hashtable;
             if (hashtable == null)
             {
@@ -60,7 +71,7 @@ protected override void Validate(object arguments, EngineIntrinsics engineIntrin
                 {
                     throw new PSArgumentException("Connection string value must be specified.");
                 }
-            }
+            }*/
         }
     }
 }

src/CLU/Microsoft.Azure.Commands.Websites/project.json

@@ -26,7 +26,7 @@
     "Microsoft.Azure.Graph.RBAC": "2.1.1-preview",
     "Microsoft.Azure.Management.Authorization": "2.3.0-preview",
     "Microsoft.Azure.Management.Resources": "3.3.1-preview",
-    "Microsoft.Azure.Management.Websites": "1.0.0-preview",
+    "Microsoft.Azure.Management.Websites": "1.0.2-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha",
     "Microsoft.Rest.ClientRuntime": "1.8.2",
     "Microsoft.Rest.ClientRuntime.Azure": "2.5.4",