Merge branch 'master' into ayelet

Author: ayeletshpigelman

src/Advisor/Advisor/ChangeLog.md

@@ -1,9 +1,10 @@
+
 <!--
     Please leave this section at the top of the change log.
 
-    Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
+    Changes for the upcoming release should go under the section titled "Upcoming Release", and should adhere to the following format:
 
-    ## Current Release
+    ## Upcoming Release
     * Overview of change #1
         - Additional information about change #1
     * Overview of change #2
@@ -17,14 +18,14 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-
 ## Upcoming Release
+* Updated utils to be extensible for future changes
 
 ## Version 0.1.0
-*Added new cmdlets for Advisor Recommendation
+* Added new cmdlets for Advisor Recommendation
     - Get-AzAdvisorRecommendation
     - Enable-AzAdvisorRecommendation
     - Disable-AzAdvisorRecommendation
-*Added new cmdlets for Advisor Configuration
+* Added new cmdlets for Advisor Configuration
     - Get-AzAdvisorConfiguration
     - Set-AzAdvisorConfiguration

src/Advisor/Advisor/Cmdlets/Utilities/RecommendationHelper.cs

@@ -35,16 +35,6 @@ public static class RecommendationHelper
         /// </summary>
         private const int RESOURCEGROUP_VALUE_POSITION = 4;
 
-        /// <summary>
-        /// Position of recommendation-Id string in resource ID
-        /// </summary>
-        private const int RECOMMENDATION_STRING_POSITION = 11;
-
-        /// <summary>
-        /// Position of recommendation-Id value in resource ID
-        /// </summary>
-        private const int RECOMMENDATION_VALUE_POSITION = 12;
-
         /// <summary>
         /// Filter recommendations by given category and resourceGroup name.
         /// </summary>
@@ -205,9 +195,9 @@ public static string GetRecommendationIdFromResourceID(string resourceID)
             string recommendationId = string.Empty;
             string[] resourceIdSplit = resourceID.Split('/');
 
-            if (resourceIdSplit[RECOMMENDATION_STRING_POSITION].Equals("recommendations"))
+            if (resourceIdSplit[resourceIdSplit.Length - 2].Equals("recommendations"))
             {
-                recommendationId = resourceIdSplit[RECOMMENDATION_VALUE_POSITION];
+                recommendationId = resourceIdSplit[resourceIdSplit.Length - 1];
             }
 
             return recommendationId;

src/DataLakeStore/DataLakeStore/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update the ADLS sdk to use httpclient, integrate dataplane testing with azure framework
 
 ## Version 1.2.0
 * Updated cmdlets with plural nouns to singular, and deprecated plural names.

src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.cs

@@ -91,6 +91,13 @@ public void TestZoneNewAlreadyExists()
             PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneNewAlreadyExists");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneNewWithLocalSuffix()
+        {
+            PrivateDnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneNewWithLocalSuffix");
+        }
+
         [Fact()]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestZoneSetEtagMismatch()

src/PrivateDns/PrivateDns.Test/ScenarioTests/ZoneTests.ps1

@@ -187,6 +187,26 @@ function Test-ZoneNewAlreadyExists
 	Remove-AzResourceGroup -Name $resourceGroupName -Force
 }
 
+<#
+.SYNOPSIS
+Test zone creation with .local suffix.
+#>
+function Test-ZoneNewWithLocalSuffix
+{
+	$zoneName = Get-RandomZoneName
+	$zoneName = $zoneName + ".local"
+	$resourceGroup = TestSetup-CreateResourceGroup
+	$resourceGroupName = $resourceGroup.ResourceGroupName
+	$createdZone = New-AzPrivateDnsZone -Name $zoneName -ResourceGroupName $resourceGroupName -WarningVariable warnings
+
+	Assert-NotNull $createdZone
+	$message = "Please be aware that DNS names ending with .local are reserved for use with multicast DNS and may not work as expected with some operating systems. For details refer to your operating systems documentation."
+	Assert-AreEqual $message $warnings
+
+	$createdZone | Remove-AzPrivateDnsZone -PassThru -Confirm:$false
+	Remove-AzResourceGroup -Name $resourceGroupName -Force
+}
+
 <#
 .SYNOPSIS
 Test zone update when etags mismatch