Merge branch 'master' into erich/fix-file-permission

Author: erich-wang

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,4 +15,5 @@
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
     - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
+        - {Please put the link here}
     - [ ] the markdown help files have been regenerated using the commands listed [here](../blob/master/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs

@@ -404,7 +404,7 @@ public override void ExecuteCmdlet()
                         subscriptionName,
                         password,
                         SkipValidation,
-                        WriteWarning,
+                        WriteWarningEvent, //Could not use WriteWarning directly because it may be in worker thread
                         name,
                         shouldPopulateContextList,
                         MaxContextPopulation));
@@ -419,7 +419,7 @@ public override void ExecuteCmdlet()
 
                    try
                    {
-                       var result = (PSAzureProfile)(task.ConfigureAwait(false).GetAwaiter().GetResult());
+                       var result = (PSAzureProfile)task.Result;
                        WriteObject(result);
                    }
                    catch (AuthenticationFailedException ex)

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Fixed an issue that error happens if user profile path is inaccessible
+* Fixed an issue causing Write-Object error during Connect-AzAccount [#13419]
 * Added parameter "ContainerRegistryEndpointSuffix" to: `Add-AzEnvironment`, `Set-AzEnvironment` 
 * Supported interrupting login by hitting <kbd>CTRL</kbd>+<kbd>C</kbd>
 * Fixed an issue causing `Connect-AzAccount -KeyVaultAccessToken` not working [#13127]

src/Accounts/Authentication/Factories/AuthenticationFactory.cs

@@ -123,7 +123,7 @@ public IAccessToken Authenticate(
                 {
                     while (processAuthenticator != null && processAuthenticator.TryAuthenticate(GetAuthenticationParameters(tokenCacheProvider, account, environment, tenant, password, promptBehavior, promptAction, tokenCache, resourceId), out authToken))
                     {
-                        token = authToken?.ConfigureAwait(true).GetAwaiter().GetResult();
+                        token = authToken?.ConfigureAwait(false).GetAwaiter().GetResult();
                         if (token != null)
                         {
                             // token.UserId is null when getting tenant token in ADFS environment
@@ -142,7 +142,7 @@ public IAccessToken Authenticate(
                 {
                     if (!IsTransientException(e) || retries == 0)
                     {
-                        throw e;
+                        throw;
                     }
 
                     TracingAdapter.Information(string.Format("[AuthenticationFactory] Exception caught when calling TryAuthenticate, retrying authentication - Exception message: '{0}'", e.Message));

src/Accounts/Authenticators/DeviceCodeAuthenticator.cs

@@ -21,6 +21,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.ResourceManager.Common;
 
 namespace Microsoft.Azure.PowerShell.Authenticators
 {
@@ -74,7 +75,7 @@ public override bool CanAuthenticate(AuthenticationParameters parameters)
         private void WriteWarning(string message)
         {
             EventHandler<StreamEventArgs> writeWarningEvent;
-            if (AzureSession.Instance.TryGetComponent("WriteWarning", out writeWarningEvent))
+            if (AzureSession.Instance.TryGetComponent(AzureRMCmdlet.WriteWarningKey, out writeWarningEvent))
             {
                 writeWarningEvent(this, new StreamEventArgs() { Message = message });
             }

src/Accounts/Authenticators/MsalAccessToken.cs

@@ -73,7 +73,7 @@ public static async Task<IAccessToken> GetAccessTokenAsync(
             string userId = null,
             string homeAccountId = "")
         {
-            var token = await tokenCredential.GetTokenAsync(requestContext, cancellationToken);
+            var token = await tokenCredential.GetTokenAsync(requestContext, cancellationToken).ConfigureAwait(false);
             return new MsalAccessToken(tokenCredential, requestContext, token.Token, token.ExpiresOn, tenantId, userId, homeAccountId);
         }
 
@@ -84,9 +84,9 @@ public static async Task<IAccessToken> GetAccessTokenAsync(
             TokenRequestContext requestContext,
             CancellationToken cancellationToken)
         {
-            var record = await authTask;
+            var record = await authTask.ConfigureAwait(false);
             cancellationToken.ThrowIfCancellationRequested();
-            var token = await tokenCredential.GetTokenAsync(requestContext, cancellationToken);
+            var token = await tokenCredential.GetTokenAsync(requestContext, cancellationToken).ConfigureAwait(false);
 
             return new MsalAccessToken(tokenCredential, requestContext, token.Token, token.ExpiresOn, record.TenantId, record.Username, record.HomeAccountId);
         }

src/CosmosDB/CosmosDB/ChangeLog.md

@@ -21,16 +21,17 @@
 ## Upcoming Release
 
 ## Version 0.2.0
-Introduced support for throughput Migration, allowing custoers to migrate their resources from manually provisioned throughput to autoscaled throughput. Customers can use this feature using the following cmdlets:
-               'Invoke-AzCosmosDBSqlContainerThroughputMigration', 
-               'Invoke-AzCosmosDBSqlDatabaseThroughputMigration', 
-               'Invoke-AzCosmosDBMongoDBCollectionThroughputMigration', 
-               'Invoke-AzCosmosDBMongoDBDatabaseThroughputMigration', 
-               'Invoke-AzCosmosDBGremlinGraphThroughputMigration', 
-               'Invoke-AzCosmosDBGremlinDatabaseThroughputMigration', 
-               'Invoke-AzCosmosDBCassandraTableThroughputMigration', 
-               'Invoke-AzCosmosDBCassandraKeyspaceThroughputMigration', 
-               'Invoke-AzCosmosDBTableThroughputMigration'
+* Introduced support for throughput Migration, allowing custoers to migrate their resources from manually provisioned throughput to autoscaled throughput. Customers can use this feature using the following cmdlets:
+    - 'Invoke-AzCosmosDBSqlContainerThroughputMigration', 
+    - 'Invoke-AzCosmosDBSqlDatabaseThroughputMigration', 
+    - 'Invoke-AzCosmosDBMongoDBCollectionThroughputMigration', 
+    - 'Invoke-AzCosmosDBMongoDBDatabaseThroughputMigration', 
+    - 'Invoke-AzCosmosDBGremlinGraphThroughputMigration', 
+    - 'Invoke-AzCosmosDBGremlinDatabaseThroughputMigration', 
+    - 'Invoke-AzCosmosDBCassandraTableThroughputMigration', 
+    - 'Invoke-AzCosmosDBCassandraKeyspaceThroughputMigration', 
+    - 'Invoke-AzCosmosDBTableThroughputMigration'
+
 ## Version 0.1.6
 * Introduced support for Autoscale, as a result of which all cmdlets which create or modify resources with throughput have an additional parameter called AutoscaleMaxThroughput. 
 * New-AzCosmosDBAccount cmdlet was updated with new paramters: EnableFreeTier, EnableAnalyticalStorage, ServerVersion, IpRule.

src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.6.0" />
+    <PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.7.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.1.1" />
   </ItemGroup>
 

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/AccountTests.ps1

@@ -22,8 +22,9 @@ function Test-AccountActiveDirectory
     $accName1 = Get-ResourceName
     $accName2 = Get-ResourceName
     $accName3 = Get-ResourceName
-    $resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
-    
+    #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
+    $resourceLocation = 'westus2'
+
     $activeDirectory1 = @{
         Username = "sdkuser"
 		<#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="...")]#>
@@ -57,7 +58,7 @@ function Test-AccountActiveDirectory
             $newTagValue = "tagValue1"
             #$retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirector $activeDirectories
 
-            Assert-ThrowsContains{  New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirector $activeDirectories} 'Only one active directory allowed';
+            Assert-ThrowsContains{  New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue} -ActiveDirectory $activeDirectories} 'Only one active directory allowed';
             #Assert-True { $false }
         }
         catch

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/ActiveDirectoryTests.cs

@@ -0,0 +1,44 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
+{
+    public class ActiveDirectoryTests
+    {
+        private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
+
+        public ActiveDirectoryTests(Xunit.Abstractions.ITestOutputHelper output)
+        {
+            _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestActiveDirectoryCrud()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ActiveDirectoryCrud");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestActiveDirectoryPipelines()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ActiveDirectoryPipelines");
+        }
+    }
+}

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/ActiveDirectoryTests.ps1

@@ -0,0 +1,126 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.SYNOPSIS
+Test Active Directory cmdLet CRUD operations
+#>
+function Test-ActiveDirectoryCrud
+{
+    $resourceGroup = Get-ResourceGroupName
+    $accName1 = Get-ResourceName
+    $activeDirectoryName1 = Get-ResourceName
+    $activeDirectoryName2 = Get-ResourceName
+    $accName2 = Get-ResourceName
+    #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"    
+    $resourceLocation = 'westus2'
+    $adUsername = "sdkuser"    
+	<#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="...")]#>
+    $adPassword = "sdkpass"
+    $adDomain = "sdkdomain"
+    $adDns = "192.0.2.2"
+    $adSmbServerName = "PSSMBSName"
+    $adSmbServerName2 = "PSMBSName2"
+
+    try
+    {
+        # create the resource group
+        New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
+
+        # try creating an Account -               
+        $newTagName = "tag1"
+        $newTagValue = "tagValue1"
+        $retrievedAcc = New-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1 -Tag @{$newTagName = $newTagValue}
+        Assert-AreEqual $accName1 $retrievedAcc.Name
+        $sPass = ConvertTo-SecureString $adPassword -AsPlainText -Force
+        # create and check ActiveDirectory
+        $retrievedAd = New-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1 -AdName $activeDirectoryName1 -Username $adUsername -Password $sPass -Domain $adDomain -Dns $adDns -SmbServerName $adSmbServerName
+        $activeDirectoryId = $retrievedAd.ActiveDirectoryId
+        Assert-AreEqual $adDomain $retrievedAd.Domain        
+        Assert-AreEqual $adUsername $retrievedAd.Username
+        Assert-AreEqual $adDns $retrievedAd.Dns
+        Assert-AreEqual $adSmbServerName $retrievedAd.SmbServerName
+        
+        # get and check account
+        $retrievedAcc = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1
+        Assert-AreEqual $adSmbServerName $retrievedAcc.ActiveDirectories[0].SmbServerName
+        Assert-AreEqual $adUsername $retrievedAcc.ActiveDirectories[0].Username
+
+        # get and check a ActiveDirectory by id and check again
+        $getRetrievedAd = Get-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1 -ActiveDirectoryId $activeDirectoryId
+        Assert-AreEqual $activeDirectoryName1 $getRetrievedAd.AdName        
+        Assert-AreEqual $adDomain $getRetrievedAd.Domain        
+        Assert-AreEqual $adUsername $getRetrievedAd.Username
+        Assert-AreEqual $adDns $getRetrievedAd.Dns
+        Assert-AreEqual $adSmbServerName $getRetrievedAd.SmbServerName       
+        
+        #update AD 
+        $getUpdateddAd = Update-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1 -ActiveDirectoryId $getRetrievedAd.ActiveDirectoryId -SmbServerName $adSmbServerName2 -Password $sPass
+        Assert-AreEqual $adSmbServerName2 $getUpdateddAd.SmbServerName
+
+        # delete activeDirectory retrieved   
+        # but test the WhatIf first, should not be removed
+        Remove-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1 -ActiveDirectoryId $getRetrievedAd.ActiveDirectoryId -WhatIf
+        $retrievedActiveDirectoryList = Get-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1
+        Assert-AreEqual 1 $retrievedActiveDirectoryList.Length
+                              
+        #remove by name
+        Remove-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1 -ActiveDirectoryId $getRetrievedAd.ActiveDirectoryId
+        Start-Sleep -s 15
+        $retrievedActiveDirectoryList = Get-AzNetAppFilesActiveDirectory -ResourceGroupName $resourceGroup -AccountName $accName1
+        Assert-AreEqual 0 $retrievedActiveDirectoryList.Length
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $resourceGroup
+    }
+}
+    
+<#
+.SYNOPSIS
+Test activeDirectory Pipeline operations (uses command aliases)
+#>
+function Test-ActiveDirectoryPipelines
+{
+    $resourceGroup = Get-ResourceGroupName
+    $accName1 = Get-ResourceName        
+    #$resourceLocation = Get-ProviderLocation "Microsoft.NetApp"
+    $resourceLocation = 'westus2'
+    $activeDirectoryName1 = Get-ResourceName    
+    $adUsername = "sdkuser"
+	<#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="...")]#>
+    $adPassword = "sdkpass"
+    $adDomain = "sdkdomain"
+    $adDns = "192.0.2.2"
+    $adSmbServerName = "PSSMBSName"
+
+    try
+    {
+        # create the resource group
+        New-AzResourceGroup -Name $resourceGroup -Location $resourceLocation
+
+        New-AnfAccount -ResourceGroupName $resourceGroup -Location $resourceLocation -Name $accName1
+        $sPass = ConvertTo-SecureString $adPassword -AsPlainText -Force
+        #create AD piping in Account
+        $retrievedAd = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1 | New-AzNetAppFilesActiveDirectory -AdName $activeDirectoryName1 -Username $adUsername -Password $sPass -Domain $adDomain -Dns $adDns -SmbServerName $adSmbServerName
+
+        $getRetrievedAd = Get-AzNetAppFilesAccount -ResourceGroupName $resourceGroup -Name $accName1 | Get-AzNetAppFilesActiveDirectory -ActiveDirectoryId $retrievedAd.ActiveDirectoryId
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $resourceGroup
+    }
+}

src/NetAppFiles/NetAppFiles.Test/ScenarioTests/BackupPolicyTests.cs

@@ -0,0 +1,44 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.NetAppFiles.Test.ScenarioTests.ScenarioTest
+{
+    public class BackupPolicyTests
+    {
+        private ServiceManagement.Common.Models.XunitTracingInterceptor _logger;
+
+        public BackupPolicyTests(Xunit.Abstractions.ITestOutputHelper output)
+        {
+            _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestBackupPolicyCrud()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPolicyCrud");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestBackupPolicyPipelines()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-BackupPolicyPipelines");
+        }
+    }
+}