Merge branch 'master' into shenglol/fix-deployment-dynamic-param-conflict-issue

Author: isra-fel

ChangeLog.md

@@ -1,3 +1,85 @@
+## 3.1.0 - November 2019
+### Highlights since the last major release
+* Az.DataBoxEdge 1.0.0 released
+* Az.SqlVirtualMachine 1.0.0 released
+
+#### Az.Compute
+* VM Reapply feature
+    - Add Reapply parameter to Set-AzVM cmdlet
+* VM Scale Set AutomaticRepairs feature:
+    - Add EnableAutomaticRepair, AutomaticRepairGracePeriod, and AutomaticRepairMaxInstanceRepairsPercent parameters to the following cmdlets:
+        New-AzVmssConfig
+        Update-AzVmss
+* Cross tenant gallery image support for New-AzVM
+* Add 'Spot' to the argument completer of Priority parameter in New-AzVM, New-AzVMConfig and New-AzVmss cmdlets
+* Add DiskIOPSReadWrite and DiskMBpsReadWrite parameters to Add-AzVmssDataDisk cmdlet
+* Change SourceImageId parameter of New-AzGalleryImageVersion cmdlet to optional
+* Add OSDiskImage and DataDiskImage parameters to New-AzGalleryImageVersion cmdlet
+* Add HyperVGeneration parameter to New-AzGalleryImageDefinition cmdlet
+* Add SkipExtensionsOnOverprovisionedVMs parameters to New-AzVmss, New-AzVmssConfig and Update-AzVmss cmdlets
+
+#### Az.DataBoxEdge
+* Added cmdlet `Get-AzDataBoxEdgeOrder`
+    - Get the Order
+* Added cmdlet `New-AzDataBoxEdgeOrder`
+    - Create new Order
+* Added cmdlet `Remove-AzDataBoxEdgeOrder`
+    - Remove the Order
+* Change in cmdlet `New-AzDataBoxEdgeShare`
+    - Now creates Local Share
+* Added cmdlet `Set-AzDataBoxEdgeRole`
+    - Now IotRole can be mapped to Share
+* Added cmdlet `Invoke-AzDataBoxEdgeDevice`
+    - Invoke scan update, download update, install updates on the device
+* Added cmdlet `Get-AzDataBoxEdgeTrigger`
+    - Gets the information about Triggers
+* Added cmdlet `New-AzDataBoxEdgeTrigger`
+    - Create new Triggers
+* Added cmdlet `Remove-AzDataBoxEdgeTrigger`
+    - Remove the Triggers
+
+#### Az.DataFactory
+* Update ADF .Net SDK version to 4.4.0
+* Add parameter 'ExpressCustomSetup' for 'Set-AzureRmDataFactoryV2IntegrationRuntime' cmd to enable setup configurations and 3rd party components without custom setup script.
+
+#### Az.DataLakeStore
+* Update documentation of Get-AzDataLakeStoreDeletedItem and Restore-AzDataLakeStoreDeletedItem
+
+#### Az.EventHub
+* Fix for issue 10301 : Fix the SAS Token date format
+
+#### Az.FrontDoor
+* Add MinimumTlsVersion parameter to Enable-AzFrontDoorCustomDomainHttps and New-AzFrontDoorFrontendEndpointObject
+* Add HealthProbeMethod and EnabledState parameters to New-AzFrontDoorHealthProbeSettingObject
+* Add new cmdlet to create BackendPoolsSettings objec to pass into creation/update of Front Door
+    - New-AzFrontDoorBackendPoolsSettingObject
+
+#### Az.Network
+* Change 'Start-AzVirtualNetworkGatewayConnectionPacketCapture.md' and 'Start-AzVirtualnetworkGatewayPacketCapture.md' FilterData option examples.
+
+#### Az.PrivateDns
+* Updated PrivateDns .net sdk to version 1.0.0
+
+#### Az.RecoveryServices
+* Azure Site Recovery support to select disk type at enabling protection.
+* Azure Site Recovery bug fix for recovery plan action edit.
+* Azure Backup SQL Restore support to accept filestream DBs.
+
+#### Az.RedisCache
+* Added 'MinimumTlsVersion' parameter in 'New-AzRedisCache' and 'Set-AzRedisCache' cmdlets. Also, added 'MinimumTlsVersion' in the output of 'Get-AzRedisCache' cmdlet.
+* Added validation on '-Size' parameter for 'Set-AzRedisCache' and 'New-AzRedisCache' cmdlets
+
+#### Az.Resources
+- Updated policy cmdlets to use new api version 2019-06-01 that has new EnforcementMode property in policy assignment.
+- Updated create policy definition help example
+- Fix bug Remove-AZADServicePrincipal -ServicePrincipalName, throw null reference when service principal name not found.
+- Fix bug New-AZADServicePrincipal, throw null reference when tenant doesn't have any subscription.
+- Change New-AzAdServicePrincipal to add credentials only to associated application.
+
+#### Az.Sql
+* Added support for database ReadReplicaCount.
+* Fixed Set-AzSqlDatabase when zone redundancy not set
+
 ## 3.0.0 - November 2019
 ### General
 * Az.PrivateDns 1.0.0 released

src/AlertsManagement/AlertsManagement/help/Remove-AzActionRule.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Remove-AzActionRule
 
 ## SYNOPSIS
-Deletes a action group
+Deletes a action rule
 
 ## SYNTAX
 

src/Blueprint/Blueprint/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Bug Fix: File/folder names should be platform agnostic for Export/Import cmdlets
 
 ## Version 0.2.7
 * Bug Fix: Use user assigned identity defined in the assignment file instead of cmdlet parameter during blueprint assignment (Set- cmdlet).

src/Blueprint/Blueprint/Cmdlets/BlueprintCmdletBase.cs

@@ -24,6 +24,7 @@
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Provider = Microsoft.Azure.Management.Internal.ResourceManager.Version2018_05_01.Models.Provider;
+using System.Linq;
 
 namespace Microsoft.Azure.Commands.Blueprint.Cmdlets
 {
@@ -175,44 +176,37 @@ protected string GetValidatedFilePath(string fileFullName)
         }
 
         /// <summary>
-        ///  This overloaded function expects a folder path and a file name and combines them. Checks if resulting full file name exist.
+        ///  Returns the blueprint file path.
         /// </summary>
-        /// <param name="inputPath"></param>
-        /// <param name="fileName"></param>
+        /// <param name="path"></param>
         /// <returns></returns>
-        protected string GetValidatedFilePath(string path, string fileName)
+        protected string GetValidatedFilePathForBlueprint(string path)
         {
-            var resolvedPath = ResolveUserPath(path);
-
-            var blueprintPath = Path.Combine(resolvedPath, fileName + ".json");
-
-            if (!AzureSession.Instance.DataStore.FileExists(blueprintPath))
+            var blueprintFileName = AzureSession.Instance.DataStore.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly)
+                .Select(file => Path.GetFileName(file))
+                .FirstOrDefault(name => String.Equals(name, "blueprint.json", StringComparison.OrdinalIgnoreCase));
+                    
+            if (blueprintFileName == null)
             {
                 throw new Exception(
-                    $"Cannot locate a file with the name {fileName} in: {resolvedPath}.");
+                    $"Cannot locate Blueprint.json in: {path}.");
             }
 
-            return blueprintPath;
+            return Path.Combine(path, blueprintFileName);
         }
 
         /// <summary>
-        /// Combines input folder path and folder name and check if the resulting path exists. 
+        /// Returns the artifacts folder path. 
         /// </summary>
-        /// <param name="inputPath"></param>
-        /// <param name="folderName"></param>
+        /// <param name="path"></param>
         /// <returns></returns>
-        protected string GetValidatedFolderPath(string path, string folderName)
+        protected string GetValidatedFolderPathForArtifacts(string path)
         {
-            var resolvedPath = ResolveUserPath(path);
-
-            var artifactsPath = Path.Combine(resolvedPath, folderName);
-
-            if (!AzureSession.Instance.DataStore.DirectoryExists(artifactsPath))
-            {
-                artifactsPath = null;
-            }
+            var artifactsFolderName = AzureSession.Instance.DataStore.GetDirectories(path)
+                .Select(folder => Path.GetFileName(folder))
+                .FirstOrDefault(name => String.Equals(name, "artifacts", StringComparison.OrdinalIgnoreCase));
 
-            return artifactsPath;
+            return artifactsFolderName == null ? null : Path.Combine(path, artifactsFolderName);
         }
     }
 }

src/Blueprint/Blueprint/Cmdlets/BlueprintDefinition/BlueprintDefinitionCmdletBase.cs

@@ -101,8 +101,7 @@ private async Task<string> GetManagementGroupAncestorsAsync(string subscriptionI
 
         protected void ImportBlueprint(string blueprintName, string scope, string inputPath, bool force)
         {
-            const string blueprintFileName = "Blueprint";
-            var blueprintPath = GetValidatedFilePath(inputPath, blueprintFileName);
+            var blueprintPath = GetValidatedFilePathForBlueprint(ResolveUserPath(inputPath));
 
             BlueprintModel bpObject;
             try
@@ -170,9 +169,7 @@ protected string CreateFolderIfNotExist(string path, string folderName)
 
         protected void ImportArtifacts(string blueprintName, string scope, string inputPath)
         {
-            const string artifacts = "Artifacts";
-
-            var artifactsPath = GetValidatedFolderPath(inputPath, artifacts);
+            var artifactsPath = GetValidatedFolderPathForArtifacts(ResolveUserPath(inputPath));
 
             if (artifactsPath == null)
             {

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.cs

@@ -123,5 +123,12 @@ public void TestSimpleNewVmssScaleInPolicy()
         {
             TestRunner.RunTestScript("Test-SimpleNewVmssScaleInPolicy");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void SimpleNewVmssSkipExtOverprovision()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmssSkipExtOverprovision");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -470,3 +470,32 @@ function Test-SimpleNewVmssScaleInPolicy
         Clean-ResourceGroup $vmssname
     }
 }
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vmss with SkipExtensionsOnOverprovisionedVMs.
+#>
+function Test-SimpleNewVmssSkipExtOverprovision
+{
+    # Setup
+    $vmssname = Get-ResourceName
+
+    try
+    {
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        [string]$domainNameLabel = "$vmssname$vmssname".tolower();
+
+        # Common
+        New-AzVmss -Name $vmssname -Location "westus2" -Credential $cred -DomainNameLabel $domainNameLabel `
+                   -SkipExtensionsOnOverprovisionedVMs;
+        $vmss = Get-AzVmss -ResourceGroupName $vmssname -Name $vmssname;
+        Assert-True { $vmss.DoNotRunExtensionsOnOverprovisionedVMs };
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmssname
+    }
+}

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetProfileTests.ps1

@@ -133,11 +133,12 @@ function Test-VirtualMachineScaleSetProfile
     $exttype2 = 'AzureCATExtensionHandler';
     $extver2 = '2.2';
 
-    $vmss2 = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Automatic' -DisableAutoRollback $false `
+    $vmss2 = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Automatic' -DisableAutoRollback $false -SkipExtensionsOnOverprovisionedVMs `
            | Add-AzVmssExtension -Name $extname -Publisher $publisher -Type $exttype -TypeHandlerVersion $extver -AutoUpgradeMinorVersion $false `
            | Add-AzVmssExtension -Name $extname2 -Publisher $publisher2 -Type $exttype2 -TypeHandlerVersion $extver2 -AutoUpgradeMinorVersion $false -ProvisionAfterExtension $extname;
 
     Assert-False { $vmss2.UpgradePolicy.AutomaticOSUpgradePolicy.DisableAutomaticRollback };
+    Assert-True { $vmss2.DoNotRunExtensionsOnOverprovisionedVMs };
 
     Assert-AreEqual $extname $vmss2.VirtualMachineProfile.ExtensionProfile.Extensions[0].Name;
     Assert-False { $vmss2.VirtualMachineProfile.ExtensionProfile.Extensions[0].AutoUpgradeMinorVersion };