Merge branch 'master' into network-june

Author: MikhailTryakhov

ChangeLog.md

@@ -1,3 +1,7 @@
+## 4.6.1 - August 2020
+#### Az.Compute
+* Patched '-EncryptionAtHost' parameter in 'New-AzVm' to remove default value of false [#12776]
+
 ## 4.6.0 - August 2020
 #### Az.Accounts
 * Loaded all public cloud environments when discovery endpoint doesn't return default AzureCloud or other public environments [#12633]

documentation/development-docs/examples/remove-cmdlet-example.md

@@ -168,7 +168,7 @@ namespace Microsoft.Azure.Commands.Service
             if (this.ShouldProcess(this.Name, string.Format("Deleting ChildResource '{0}' in resource group '{1}' under parent TopLevelResource '{2}'.", this.Name, this.ResourceGroupName, this.TopLevelResourceName)))
             {
                 this.MySDKClient.ChildResource.Delete(this.ResourceGroupName, this.TopLevelResourceName, this.Name);
-                if (this.IsPassThru.IsPresent)
+                if (this.PassThru.IsPresent)
                 {
                     WriteObject(true);
                 }

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Formatted the breaking change messages
 * Updated Azure.Core to 1.4.1
 
 ## Version 1.9.3

src/AlertsManagement/AlertsManagement/help/Get-AzAlert.md

@@ -55,6 +55,15 @@ PS C:\> Get-AzAlert -AlertId "afbf1b3a-0a6c-4f19-9c9b-644ccd7b1529" | Format-Lis
 
 Get Alert details by Id (GUID) or Resource Id (Complete ARM Id)
 
+### Example 3
+
+Get Alerts Information. (autogenerated)
+
+<!-- Aladdin Generated Example -->
+```powershell
+Get-AzAlert -IncludeContext $true -TimeRange '1h'
+```
+
 ## PARAMETERS
 
 ### -AlertId

src/Attestation/Attestation/help/Reset-AzAttestationPolicy.md

@@ -36,6 +36,14 @@ PS C:\> Reset-AzAttestationPolicy -Name pshtest -ResourceGroupName psh-test-rg -
 
 Reset the policy to the default for the Attestation Provider *pshtest* for Tee type *SgxEnclave*.
 
+### Example 2
+```powershell
+PS C:\> $resetJwt = Get-Content -Path .\reset.policy.txt.signed.txt
+PS C:\> Reset-AzAttestationPolicy -Name pshtest -ResourceGroupName psh-test-rg -Tee SgxEnclave -Policy $resetJwt
+```
+
+If the Attestation Provider *pshtest* is configured to use the isolated trust model, reset the policy to the default for Tee type *SgxEnclave* by including a signed policy.
+
 ## PARAMETERS
 
 ### -DefaultProfile

src/CognitiveServices/CognitiveServices/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Show additional legal terms for certain APIs.
 
 ## Version 1.5.1
 * Used `Deny` specifically as NetworkRules default action.

src/CognitiveServices/CognitiveServices/CognitiveServices.csproj

@@ -14,4 +14,10 @@
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.3.0-preview" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+  </ItemGroup>
+
 </Project>

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/NewAzureCognitiveServicesAccount.cs

@@ -245,6 +245,24 @@ public override void ExecuteCmdlet()
                             }
                         }
                     }
+
+                    if (Type.Equals("Face", StringComparison.InvariantCultureIgnoreCase) || Type.Equals("CognitiveServices", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        if (Force.IsPresent)
+                        {
+                            WriteWarning(Resources.NewAccount_LegalTerm_NotPolice);
+                        }
+                        else
+                        {
+                            bool yesToAll = false, noToAll = false;
+                            if (!ShouldContinue(Resources.NewAccount_LegalTerm_NotPolice, "Notice", true, ref yesToAll, ref noToAll))
+                            {
+                                return;
+                            }
+                        }
+                    }
+
+
                     try
                     {
                         CognitiveServicesAccount createAccountResponse = CognitiveServicesClient.Accounts.Create(

src/CognitiveServices/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_LegalTerm_NotPolice" xml:space="preserve">
+    <value>I certify that use of this service is not by or for a police department in the United States.</value>
+  </data>
   <data name="NewAccount_Notice" xml:space="preserve">
     <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>

src/CognitiveServices/CognitiveServices/Properties/Resources.resx

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Compute</PsModuleName>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="38.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="38.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
   </ItemGroup>

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

@@ -24,14 +24,14 @@ function Test-DedicatedHost
     try
     {
         # Common
-        [string]$loc = Get-ComputeVMLocation;
+        [string]$loc = Get-Location "Microsoft.Resources" "resourceGroups" "East US 2 EUAP";
         $loc = $loc.Replace(' ', '');
 
         New-AzResourceGroup -Name $rgname -Location $loc -Force;
 
         # Create a VM first
         $hostGroupName = $rgname + 'hostgroup'
-        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 1  -Zone "1" -Tag @{key1 = "val1"};
+        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 1  -Zone "2" -Tag @{key1 = "val1"};
 
         $hostGroup = Get-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName;
 
@@ -40,15 +40,13 @@ function Test-DedicatedHost
         Assert-AreEqual $loc $hostGroup.Location;
         Assert-True { $hostGroup.Tags.Keys.Contains("key1") };
         Assert-AreEqual "val1" $hostGroup.Tags["key1"];
-        Assert-True { $hostGroup.Zones.Contains("1") };
+        Assert-True { $hostGroup.Zones.Contains("2") };
         Assert-AreEqual 0 $hostGroup.Hosts.Count;
+        Assert-AreEqual $true $hostGroup.SupportAutomaticPlacement;
 
         $hostGroups = Get-AzHostGroup -ResourceGroupName $rgname;
         Assert-AreEqual 1 $hostGroups.Count;
 
-        $hostGroups = Get-AzHostGroup;
-        Assert-True {  $hostGroups.Count -ge 1 };
-
         $hostName = $rgname + 'host'
         New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku "ESv3-Type1" -Tag @{key1 = "val2"};
 
@@ -81,7 +79,7 @@ function Test-DedicatedHost
 
         $hostGroupInstanceViewResult = Get-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -InstanceView;
         Assert-NotNull $hostGroupInstanceViewResult.Hosts;
-        foreach ($hostInstanceViewWithName in $hostGroupInstanceViewResult.Hosts) {
+        foreach ($hostInstanceViewWithName in $hostGroupInstanceViewResult.InstanceView.Hosts) {
             Assert-NotNull $hostInstanceViewWithName.Name;
         } 
 
@@ -129,15 +127,18 @@ function Test-DedicatedHostVirtualMachine
     try
     {
         # Common
-        [string]$loc = Get-ComputeVMLocation;
+        [string]$loc = Get-Location "Microsoft.Resources" "resourceGroups" "East US 2 EUAP";
         $loc = $loc.Replace(' ', '');
 
         New-AzResourceGroup -Name $rgname -Location $loc -Force;
 
         # Create a VM first
         $hostGroupName = $rgname + 'hostgroup'
-        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -Zone "1" -Tag @{key1 = "val1"};
-        
+        New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -Zone "2" -SupportAutomaticPlacement $false -Tag @{key1 = "val1"};
+        $hostGroup = Get-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName;
+
+        Assert-AreEqual $false $hostGroup.SupportAutomaticPlacement;
+
         $hostName = $rgname + 'host'
         New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku "ESv3-Type1" -PlatformFaultDomain 1 -Tag @{key1 = "val2"};
 
@@ -154,7 +155,7 @@ function Test-DedicatedHostVirtualMachine
         $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
         [string]$domainNameLabel = "$vmname0-$vmname0".tolower();
 
-        New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Zone "1" -Size $vmsize -HostId $dedicatedHostId -DomainNameLabel $domainNameLabel;
+        New-AzVM -ResourceGroupName $rgname -Name $vmname0 -Credential $cred -Zone "2" -Size $vmsize -HostId $dedicatedHostId -DomainNameLabel $domainNameLabel;
         $vm0 = Get-AzVM -ResourceGroupName $rgname -Name $vmname0;
         Assert-AreEqual $dedicatedHostId $vm0.Host.Id;
 
@@ -164,7 +165,7 @@ function Test-DedicatedHostVirtualMachine
         $subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
         $vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
         $subnetId = $vnet.Subnets[0].Id;
-        $pubip = New-AzPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -Zone "1" -Sku "Standard" -AllocationMethod "Static" -DomainNameLabel ('pubip' + $rgname);
+        $pubip = New-AzPublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -Zone "2" -Sku "Standard" -AllocationMethod "Static" -DomainNameLabel ('pubip' + $rgname);
         $pubipId = $pubip.Id;
         $nic = New-AzNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
         $nicId = $nic.Id;
@@ -176,7 +177,7 @@ function Test-DedicatedHostVirtualMachine
         $cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
         $computerName = 'test';
 
-        $p = New-AzVMConfig -VMName $vmname1 -VMSize $vmsize -Zone "1" -HostId $dedicatedHostId `
+        $p = New-AzVMConfig -VMName $vmname1 -VMSize $vmsize -Zone "2" -HostId $dedicatedHostId `
              | Add-AzVMNetworkInterface -Id $nicId -Primary `
              | Set-AzVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
 

src/Compute/Compute.Test/ScenarioTests/DedicatedHostTests.ps1

@@ -110,6 +110,13 @@ public void TestSimpleNewVmssPpg()
             TestRunner.RunTestScript("Test-SimpleNewVmssPpg");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmssHostGroup()
+        {
+            TestRunner.RunTestScript("Test-SimpleNewVmssHostGroup");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSimpleNewVmssBilling()

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

@@ -405,6 +405,50 @@ function Test-SimpleNewVmssPpg
     }
 }
 
+<#
+.SYNOPSIS
+Test Simple Paremeter Set With HostGroup (automatic placement)
+#>
+function Test-SimpleNewVmssHostGroup
+{
+    # Setup
+    $rgname = Get-ResourceName
+
+    try
+    {
+        # Common
+        [string]$loc = Get-Location "Microsoft.Resources" "resourceGroups" "East US 2 EUAP";
+        $loc = $loc.Replace(' ', '');
+        $zone = "2"
+        
+        # Creating the resource group
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+        # Hostgroup and Host
+        $hostGroupName = $rgname + "HostGroup"
+        $hostGroup = New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -Zone $zone -SupportAutomaticPlacement $true -Tag @{key1 = "val1"};
+
+        $Sku = "Dsv3-Type1"
+        $hostName = $rgname + "Host"
+        New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku $Sku -PlatformFaultDomain 1 -Tag @{test = "true"}
+
+        # Creating a new vmss
+        $VmSku = "Standard_D2s_v3"
+        $vmssname = "MyVmss"
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        $vmss = New-AzVmss -Name $vmssname -ResourceGroup $rgname -Credential $cred -HostGroupId $hostGroup.Id -Zone $zone -VmSize $VmSku -DomainNameLabel "myvmss-48e3cf"
+
+        Assert-AreEqual $vmss.HostGroup.Id $hostGroup.Id
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Test Simple Paremeter Set for New Vmss with eviction policy, priority, and max price.

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

@@ -178,5 +178,12 @@ public void TestVirtualMachineScaleSetNewEncryptionAtHost()
         {
             TestRunner.RunTestScript("Test-VirtualMachineScaleSetEncryptionAtHost");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineScaleSetAssignedHost()
+        {
+            TestRunner.RunTestScript("Test-VirtualMachineScaleSetAssignedHost");
+        }
     }
 }

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs

@@ -2536,3 +2536,50 @@ function Test-VirtualMachineScaleSetEncryptionAtHost
         Clean-ResourceGroup $rgname
     }
 }
+
+<#
+.SYNOPSIS
+    testing encryptionAtHost cmdlet for
+    new-azvmss - create vmss using simple parameter set and hostencryption tag.
+    update-azvmss test boolean parameter 
+    new-azvmssconfig
+#>
+function Test-VirtualMachineScaleSetAssignedHost
+{
+    # Setup
+    $rgname = Get-ComputeTestResourceName
+ 
+    try
+    {
+        # Common
+        $zone = "2"
+        [string]$loc = Get-Location "Microsoft.Resources" "resourceGroups" "East US 2 EUAP";
+        New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+        # Hostgroup and Host
+        $hostGroupName = $rgname + "HostGroup"
+        $hostGroup = New-AzHostGroup -ResourceGroupName $rgname -Name $hostGroupName -Location $loc -PlatformFaultDomain 2 -Zone $zone -SupportAutomaticPlacement $true -Tag @{key1 = "val1"};
+
+        $Sku = "Esv3-Type1"
+        $hostName = $rgname + "Host"
+        $host_ = New-AzHost -ResourceGroupName $rgname -HostGroupName $hostGroupName -Name $hostName -Location $loc -Sku $Sku -PlatformFaultDomain 1 -Tag @{test = "true"}
+
+        # Creating a new vmss
+        $VmSku = "Standard_E2s_v3"
+        $domainNameLabel = "domainlabel"
+        $vmssname = "MyVmss"
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+        $vmss = New-AzVmss -Name $vmssname -ResourceGroup $rgname -Credential $cred -HostGroupId $hostGroup.Id -Zone $zone -VmSize $VmSku -DomainNameLabel $domainNameLabel
+
+        $vmssResult = Get-AzVmssVM -InstanceView -ResourceGroupName $rgname -VMScaleSetName $vmssname;
+        
+        Assert-AreEqual $host_.Id $vmssResult[0].InstanceView.AssignedHost;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}