Merge branch 'dev' of https://github.com/ziwa-msft/azure-powershell into dev

Author: ziwa-msft

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

@@ -42,6 +42,13 @@ public void TestNewAccount()
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccount");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewAccountWithInvalidName()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountInvalidName");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccountWithCustomDomain()

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.ps1

@@ -31,7 +31,7 @@ function Test-NewAzureRmCognitiveServicesAccount
 
         New-AzResourceGroup -Name $rgname -Location $loc;
 
-        $createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -Force;
+        $createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc;
         Assert-NotNull $createdAccount;
         # Call create again, expect to get the same account
         $createdAccountAgain = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -Force;
@@ -48,6 +48,37 @@ function Test-NewAzureRmCognitiveServicesAccount
     }
 }
 
+<#
+.SYNOPSIS
+Test New-AzCognitiveServicesAccountInvalidName
+#>
+function Test-NewAzureRmCognitiveServicesAccountInvalidName
+{
+    # Setup
+    $rgname = Get-CognitiveServicesManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $accountname = 'csa' + $rgname + ".invalid";
+        $skuname = 'S2';
+        $accounttype = 'TextAnalytics';
+        $loc = Get-Location -providerNamespace "Microsoft.CognitiveServices" -resourceType "accounts" -preferredLocation "West US";
+
+        New-AzResourceGroup -Name $rgname -Location $loc;
+
+		Assert-ThrowsContains { New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc;
+        Assert-NotNull $createdAccount; } 'Failed to create Cognitive Services account.'
+        
+        Retry-IfException { Remove-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Force; }
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Test New-AzCognitiveServicesAccount

src/CognitiveServices/CognitiveServices.Test/SessionRecords/CognitiveServices.Test.ScenarioTests.CognitiveServicesAccountTests/TestNewAccountWithInvalidName.json

@@ -1,2 +1,2 @@
 Notice
-Microsoft will use data you send to Bing Search Services or the Translator Speech API to improve Microsoft products and services. Where you send personal data to these 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 these 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).
+Microsoft will use data you send to Bing Search Services to improve Microsoft products and services. Where you send personal data to these 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 these 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).

src/CognitiveServices/CognitiveServices.Test/notice.txt

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Only display Bing disclaimer for Bing Search Services.
+* Improve error when create account failed.
 
 ## Version 1.1.0
 * Updated cmdlets with plural nouns to singular, and deprecated plural names.

src/CognitiveServices/CognitiveServices/ChangeLog.md

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Management.CognitiveServices;
 using Microsoft.Azure.Management.CognitiveServices.Models;
 using Newtonsoft.Json.Linq;
+using System;
 using System.Collections;
 using System.Globalization;
 using System.Management.Automation;
@@ -118,23 +119,35 @@ public override void ExecuteCmdlet()
                 if (ShouldProcess(
                     Name, string.Format(CultureInfo.CurrentCulture, Resources.NewAccount_ProcessMessage, Name, Type, SkuName, Location)))
                 {
-                    if (Force.IsPresent)
+                    if (Type.StartsWith("Bing.", StringComparison.InvariantCultureIgnoreCase))
                     {
-                        WriteWarning(Resources.NewAccount_Notice);
-                    }
-                    else
-                    {
-                        bool yesToAll = false, noToAll = false;
-                        if (!ShouldContinue(Resources.NewAccount_Notice, "Notice", true, ref yesToAll, ref noToAll))
+                        if (Force.IsPresent)
+                        {
+                            WriteWarning(Resources.NewAccount_Notice);
+                        }
+                        else
                         {
-                            return;
+                            bool yesToAll = false, noToAll = false;
+                            if (!ShouldContinue(Resources.NewAccount_Notice, "Notice", true, ref yesToAll, ref noToAll))
+                            {
+                                return;
+                            }
                         }
                     }
+                    try
+                    {
+                        CognitiveServicesAccount createAccountResponse = CognitiveServicesClient.Accounts.Create(
+                                        ResourceGroupName,
+                                        Name,
+                                        createParameters);
+                    }
+                    catch (Exception ex)
+                    {
+                        // Give users a specific message says `Failed to create Cognitive Services account.`
+                        // Details should able be found in the exception.
+                        throw new Exception("Failed to create Cognitive Services account.", ex);
+                    }
 
-                    CognitiveServicesAccount createAccountResponse = CognitiveServicesClient.Accounts.Create(
-                                    ResourceGroupName,
-                                    Name,
-                                    createParameters);
                     CognitiveServicesAccount cognitiveServicesAccount = CognitiveServicesClient.Accounts.GetProperties(ResourceGroupName, Name);
                     WriteCognitiveServicesAccount(cognitiveServicesAccount);
                 }

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/NewAzureCognitiveServicesAccount.cs

@@ -121,7 +121,7 @@
     <value>Regenerating Key {0} for account {1}.</value>
   </data>
   <data name="NewAccount_Notice" xml:space="preserve">
-    <value>Microsoft will use data you send to Bing Search Services or the Translator Speech API to improve Microsoft products and services. Where you send personal data to these 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 these 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>
+    <value>Microsoft will use data you send to Bing Search Services to improve Microsoft products and services. Where you send personal data to these 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 these 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>

src/CognitiveServices/CognitiveServices/Properties/Resources.resx

@@ -1,2 +1,2 @@
 Notice
-Microsoft will use data you send to Bing Search Services or the Translator Speech API to improve Microsoft products and services. Where you send personal data to these 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 these 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).
+Microsoft will use data you send to Bing Search Services to improve Microsoft products and services. Where you send personal data to these 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 these 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).

src/CognitiveServices/CognitiveServices/notice.txt

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="25.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.10.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Compute/Compute.Test/Compute.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.10.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.10.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.11.0-preview" />
   </ItemGroup>
 
 </Project>

src/Dns/Dns.Test/Dns.Test.csproj

@@ -35,6 +35,13 @@ public void TestZoneCrud()
             DnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneWithDelegation()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest(_logger, "Test-ZoneWithDelegation");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPrivateZoneCrud()

src/Dns/Dns.Test/ScenarioTests/ZoneTests.cs

@@ -80,6 +80,65 @@ function Test-ZoneCrud
 	Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
 }
 
+<#
+.SYNOPSIS
+Zone creation with delegation
+#>
+function Test-ZoneWithDelegation
+{
+	#Parent zone creation
+	$parentZoneName = Get-RandomZoneName
+    $resourceGroup = TestSetup-CreateResourceGroup
+	
+	try
+    {
+        $createdParentZone = New-AzDnsZone -Name $parentZoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"}
+
+		Assert-NotNull $createdParentZone
+		Assert-NotNull $createdParentZone.Etag
+		Assert-AreEqual $parentZoneName $createdParentZone.Name
+		Assert-AreEqual $resourceGroup.ResourceGroupName $createdParentZone.ResourceGroupName
+		Assert-AreEqual 1 $createdParentZone.Tags.Count
+		Assert-AreEqual 2 $createdParentZone.NumberOfRecordSets
+		Assert-AreNotEqual $createdParentZone.NumberOfRecordSets $createdParentZone.MaxNumberOfRecordSets
+		Assert-Null $createdParentZone.Type
+
+		#Child zone creation , pass ParentZoneName to set up delegation
+		$childZoneNamePrefix = Get-RandomZoneName
+		$childZoneName = $childZoneNamePrefix + '.' + $parentZoneName
+		$createdChildZone = New-AzDnsZone -Name $childZoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{tag1="value1"} -ParentZoneName $parentZoneName
+
+		Assert-NotNull $createdChildZone
+		Assert-NotNull $createdChildZone.Etag
+		Assert-AreEqual $childZoneName $createdChildZone.Name
+		Assert-AreEqual $resourceGroup.ResourceGroupName $createdChildZone.ResourceGroupName
+		Assert-AreEqual 1 $createdChildZone.Tags.Count
+		Assert-AreEqual 2 $createdChildZone.NumberOfRecordSets
+		Assert-AreNotEqual $createdChildZone.NumberOfRecordSets $createdChildZone.MaxNumberOfRecordSets
+		Assert-Null $createdChildZone.Type
+
+		# retrieve the delegation record set in parent with name prefix of the child zone created above
+		$delegationRecordSet = Get-AzDnsRecordSet -Name $childZoneNamePrefix -RecordType NS -ZoneName $parentZoneName -ResourceGroupName $resourceGroup.ResourceGroupName
+	
+		Assert-NotNull $delegationRecordSet
+		Assert-NotNull $delegationRecordSet.Records
+		Assert-AreEqual $createdChildZone.NameServers.Count $delegationRecordSet.Records.Count
+
+		#clean up - deleting resources created as part of the test
+		$removedParent = Remove-AzDnsZone -Name $parentZoneName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru -Confirm:$false
+		$removedChild = Remove-AzDnsZone -Name $childZoneName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru -Confirm:$false
+
+		Assert-True { $removedParent }
+		Assert-True { $removedChild }
+
+		Assert-Throws { Get-AzDnsZone -Name $parentZoneName -ResourceGroupName $resourceGroup.ResourceGroupName }
+		Assert-Throws { Get-AzDnsZone -Name $childZoneName -ResourceGroupName $resourceGroup.ResourceGroupName }
+    }
+    finally
+    {
+        Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
+    }
+}
 <#
 .SYNOPSIS
 Full Private Zone CRUD cycle with both registration and resolution virtual networks