Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview

Author: amolr

documentation/release-notes/migration-guide.4.0.0.md

@@ -7,6 +7,7 @@ This document serves as both a breaking change notification and migration guide
 - [Breaking changes to Compute cmdlets](#breaking-changes-to-compute-cmdlets)
 - [Breaking changes to EventHub cmdlets](#breaking-changes-to-eventhub-cmdlets)
 - [Breaking changes to Insights cmdlets](#breaking-changes-to-insights-cmdlets)
+- [Breaking changes to Network cmdlets](#breaking-changes-to-network-cmdlets)
 - [Breaking changes to ServiceBus cmdlets](#breaking-changes-to-servicebus-cmdlets)
 - [Breaking changes to Sql cmdlets](#breaking-changes-to-sql-cmdlets)
 - [Breaking changes to Storage cmdlets](#breaking-changes-to-storage-cmdlets)
@@ -171,6 +172,21 @@ Set-AzureRmDiagnosticSettings
 Update-AzureRmDiagnosticSettings
 ```
 
+## Breaking changes to Network cmdlets
+
+The following cmdlets were affected this release:
+
+### New-AzureRmVirtualNetworkGatewayConnection
+- `EnableBgp` parameter has been changed to take a `boolean` instead of a `string`
+
+```powershell
+# Old
+New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName "RG" -name "conn1" -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -SharedKey "key" -EnableBgp "true"
+
+# New
+New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName "RG" -name "conn1" -VirtualNetworkGateway1 $vnetGateway -LocalNetworkGateway2 $localnetGateway -ConnectionType IPsec -SharedKey "key" -EnableBgp $true
+```
+
 ## Breaking changes to ServiceBus cmdlets
 
 The following cmdlets were affected this release:

src/Common/Commands.Common/Extensions/CmdletExtensions.cs

@@ -16,8 +16,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Management.Automation;
+using System.Management.Automation.Runspaces;
 using System.Reflection;
+using System.Text;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {
@@ -64,6 +67,80 @@ public static string ResolvePath(this PSCmdlet psCmdlet, string path)
             return fullPath;
         }
 
+        /// <summary>
+        /// Execute the given cmdlet in powershell usign the given pipeline parameters.  
+        /// </summary>
+        /// <typeparam name="T">The output type for the cmdlet</typeparam>
+        /// <param name="cmdlet">The cmdlet to execute</param>
+        /// <param name="name">The name of the cmdlet</param>
+        /// <param name="cmdletParameters">The parameters to pass to the cmdlet on the pipeline</param>
+        /// <returns>The output of executing the cmdlet</returns>
+        public static List<T> ExecuteCmdletInPipeline<T>(this PSCmdlet cmdlet, string name, params object[] cmdletParameters)
+        {
+            List<T> output = new List<T>();
+            using (System.Management.Automation.PowerShell powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
+            {
+                var info = new CmdletInfo(name, cmdlet.GetType());
+                Collection<T> result = powershell.AddCommand(info).Invoke<T>(cmdletParameters);
+                if (powershell.Streams.Error != null && powershell.Streams.Error.Count > 0)
+                {
+                    StringBuilder details = new StringBuilder();
+                    powershell.Streams.Error.ForEach(e => details.AppendFormat("Error: {0}\n", e.ToString()));
+                    throw new InvalidOperationException(string.Format("Errors while running cmdlet:\n {0}", details.ToString()));
+                }
+
+                if (result != null && result.Count > 0)
+                {
+                    result.ForEach(output.Add);
+                }
+            }
+
+            return output;
+        }
+
+        /// <summary>
+        /// Execute the given cmdlet in powershell with the given parameters after injecting the given exception.  It is expected that the cmdlet has a runtime that can be used for receiving output
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cmdlet">The cmdlet to execute</param>
+        /// <param name="name">The name of the cmdlet</param>
+        /// <param name="exception">The exception to inject into the error stream</param>
+        /// <param name="cmdletParameters">The parameters to pass to the cmdlet on the pipeline</param>
+        public static void ExecuteCmdletWithExceptionInPipeline<T>(this PSCmdlet cmdlet, string name, Exception exception, params KeyValuePair<string, object>[] cmdletParameters)
+        {
+            List<T> output = new List<T>();
+            using (System.Management.Automation.PowerShell powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
+            {
+                var info = new CmdletInfo(name, cmdlet.GetType());
+                powershell.AddCommand("Write-Error");
+                powershell.AddParameter("Exception", exception);
+                powershell.Invoke();
+                powershell.Commands.Clear();
+                powershell.AddCommand(info);
+                foreach (var pair in cmdletParameters)
+                {
+                    if (pair.Value == null)
+                    {
+                        powershell.AddParameter(pair.Key);
+                    }
+                    else
+                    {
+                        powershell.AddParameter(pair.Key, pair.Value);
+                    }
+                }
+                Collection<T> result = powershell.Invoke<T>();
+                powershell.Streams.Error.ForEach(cmdlet.WriteError);
+                powershell.Streams.Debug.ForEach(d => cmdlet.WriteDebug(d.Message));
+                powershell.Streams.Verbose.ForEach(v => cmdlet.WriteWarning(v.Message));
+                powershell.Streams.Warning.ForEach(w => cmdlet.WriteWarning(w.Message));
+
+                if (result != null && result.Count > 0)
+                {
+                    result.ForEach(r => cmdlet.WriteObject(r));
+                }
+            }
+        }
+
         public static List<T> ExecuteScript<T>(this PSCmdlet cmdlet, string contents)
         {
             List<T> output = new List<T>();

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/CognitiveServicesAccount/NewAzureCognitiveServicesAccount.cs

@@ -73,14 +73,14 @@ public class NewAzureCognitiveServicesAccountCommand : CognitiveServicesAccountB
         [Parameter(
             Mandatory = false,
             HelpMessage = "Cognitive Services Account Tags.")]
-        [Alias (TagsAlias)]
+        [Alias(TagsAlias)]
         [ValidateNotNull]
         [AllowEmptyCollection]
         public Hashtable[] Tag { get; set; }
-        
+
         [Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
         public SwitchParameter Force { get; set; }
-        
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -97,10 +97,20 @@ public override void ExecuteCmdlet()
                 };
 
                 if (ShouldProcess(
-                    this.Name, string.Format(CultureInfo.CurrentCulture, Resources.NewAccount_ProcessMessage, this.Name, this.Type, this.SkuName, this.Location))
-                    ||
-                    Force.IsPresent)
+                    this.Name, string.Format(CultureInfo.CurrentCulture, Resources.NewAccount_ProcessMessage, this.Name, this.Type, this.SkuName, this.Location)))
                 {
+                    if (Force.IsPresent)
+                    {
+                        WriteWarning(Resources.NewAccount_Notice);
+                    }
+                    else
+                    {
+                        bool yesToAll = false, noToAll = false;
+                        if (!ShouldContinue(Resources.NewAccount_Notice, "Notice", true, ref yesToAll, ref noToAll))
+                        {
+                            return;
+                        }
+                    }
 
                     var createAccountResponse = this.CognitiveServicesClient.CognitiveServicesAccounts.Create(
                                     this.ResourceGroupName,

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Properties/Resources.Designer.cs

@@ -120,6 +120,9 @@
   <data name="NewAccountKey_ProcessMessage" xml:space="preserve">
     <value>Regenerating Key {0} for account {1}.</value>
   </data>
+  <data name="NewAccount_Notice" xml:space="preserve">
+    <value>Microsoft will use data you send to the Cognitive Services to improve Microsoft products and services. Where you send personal data to the Cognitive Services, you are responsible for obtaining sufficient consent from the data subjects. The General Privacy and Security Terms in the Online Services Terms do not apply to the Cognitive Services. Please refer to the Microsoft Cognitive Services section in the Online Services Terms (https://www.microsoft.com/en-us/Licensing/product-licensing/products.aspx) for details. Microsoft offers policy controls that may be used to disable new Cognitive Services deployments (https://docs.microsoft.com/en-us/azure/cognitive-services/cognitive-services-apis-create-account).</value>
+  </data>
   <data name="NewAccount_ProcessMessage" xml:space="preserve">
     <value>Creating new Cognitive Services account {0} of type {1}, Sku {2} at location {3}.</value>
   </data>

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Properties/Resources.resx

@@ -15,6 +15,7 @@
 using System;
 using System.Management.Automation;
 using System.Reflection;
+using System.Threading;
 
 namespace Microsoft.WindowsAzure.Commands.ScenarioTest
 {
@@ -46,6 +47,17 @@ public static void ExecuteCmdlet(this PSCmdlet cmdlet)
                 throw e.InnerException;
             }
         }
+        public static void ExecuteCommand(this PSCmdlet cmdlet)
+        {
+            try
+            {
+                GetProtectedMethod("ProcessRecord").Invoke(cmdlet, new object[] { });
+            }
+            catch (TargetInvocationException e)
+            {
+                throw e.InnerException;
+            }
+        }
 
         public static void SetCommandRuntimeMock(this PSCmdlet cmdlet, ICommandRuntime value)
         {

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PSCmdletExtensions.cs

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Updated Set-AzureRmVMAEMExtension: Add caching information for Premium managed disks
 
 ## Version 3.0.0
 * Updated Set-AzureRmVMAEMExtension and Test-AzureRmVMAEMExtension cmdlets to support Premium managed disks
@@ -93,4 +94,4 @@
     - VMScaleSet and ContainerService now have "ResourceGroupName" property, so when piping Get command to Delete/Update command, -ResourceGroupName is not required.
 * Separate paremater sets for Set-AzureRmVM with Generalized and Redeploy parameter
 * Reduce time taken by Get-AzureRmVMDiskEncryptionStatus cmdlet from two minutes to under five seconds
-* Allow Set-AzureRmVMDiskEncryptionStatus to be used with VHDs residing in multiple resource groups
+* Allow Set-AzureRmVMDiskEncryptionStatus to be used with VHDs residing in multiple resource groups

src/ResourceManager/Compute/ChangeLog.md

@@ -284,6 +284,7 @@ function Test-AEMExtensionAdvancedWindowsMD
         Assert-AreEqual $extension.Name 'AzureCATExtensionHandler'
         $settings = $extension.PublicSettings | ConvertFrom-Json
         Assert-NotNull $settings.cfg
+		Assert-True { ($extension.PublicSettings.Contains("osdisk.caching")) }
         Write-Verbose "Test-AEMExtensionAdvancedWindowsMD: Get done"
 
         # Test command.