Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview

# Conflicts:
#	tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv

Author: hyonholee

README.md

@@ -4,6 +4,10 @@
 
 This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy and manage Microsoft Azure applications.
 
+Take a test run now from Azure Cloud Shell! 
+
+[![](https://shell.azure.com/images/launchcloudshell.png "Launch Azure Cloud Shell")](https://shell.azure.com/powershell) 
+
 * For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](https://docs.microsoft.com/en-us/azure/).
 * For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](https://aka.ms/azpsdocs).
 * For suggesting improvements, join our improvement discussion ([Issue #3692](https://github.com/Azure/azure-powershell/issues/3692)).

documentation/Using-Azure-TestFramework.md

@@ -144,7 +144,7 @@ To use this option, set the following environment variable before starting Visua
 
 ## Record or Playback Tests
 
-1. Run the test and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
+1. [Run the test](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#running-tests) and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
 2. Copy SessionRecords folder inside the test project and add all *.json files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
 3. To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback"
 

documentation/azure-powershell-modules.md

@@ -17,6 +17,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | ------------------------------------- | --------------------------------------- | ----------------------- |
 | Analysis Services                     | `AzureRM.AnalysisServices`              | [![Analysis Services](https://img.shields.io/powershellgallery/v/AzureRM.AnalysisServices.svg?style=flat-square&label=AzureRM.AnalysisServices)](https://www.powershellgallery.com/packages/AzureRM.AnalysisServices/) |
 | API Management                        | `AzureRM.ApiManagement`                 | [![API Management](https://img.shields.io/powershellgallery/v/AzureRM.ApiManagement.svg?style=flat-square&label=AzureRM.ApiManagement)](https://www.powershellgallery.com/packages/AzureRM.ApiManagement/) |
+| Application Insights                  | `AzureRM.ApplicationInsights`           | [![Application Insights](https://img.shields.io/powershellgallery/v/AzureRM.ApplicationInsights.svg?style=flat-square&label=AzureRM.ApplicationInsights)](https://www.powershellgallery.com/packages/AzureRM.ApplicationInsights/) |
 | Automation                            | `AzureRM.Automation`                    | [![Automation](https://img.shields.io/powershellgallery/v/AzureRM.Automation.svg?style=flat-square&label=AzureRM.Automation)](https://www.powershellgallery.com/packages/AzureRM.Automation/) |
 | Backup                                | `AzureRM.Backup`                        | [![Backup](https://img.shields.io/powershellgallery/v/AzureRM.Backup.svg?style=flat-square&label=AzureRM.Backup)](https://www.powershellgallery.com/packages/AzureRM.Backup/) 
 | Batch                                 | `AzureRM.Batch`                         | [![Batch](https://img.shields.io/powershellgallery/v/AzureRM.Batch.svg?style=flat-square&label=AzureRM.Batch)](https://www.powershellgallery.com/packages/AzureRM.Batch/) |
@@ -31,6 +32,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Data Factory V2                       | `AzureRM.DataFactoryV2`                 | [![Data Factory V2](https://img.shields.io/powershellgallery/v/AzureRM.DataFactoryV2.svg?style=flat-square&label=AzureRM.DataFactoryV2)](https://www.powershellgallery.com/packages/AzureRM.DataFactoryV2/) |
 | Data Lake Analytics                   | `AzureRM.DataLakeAnalytics`             | [![Data Lake Analytics](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeAnalytics.svg?style=flat-square&label=AzureRM.DataLakeAnalytics)](https://www.powershellgallery.com/packages/AzureRM.DataLakeAnalytics/) |
 | Data Lake Store                       | `AzureRM.DataLakeStore`                 | [![Data Lake Store](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeStore.svg?style=flat-square&label=AzureRM.DataLakeStore)](https://www.powershellgallery.com/packages/AzureRM.DataLakeStore/) |
+| Data Migration                        | `AzureRM.DataMigration`                 | [![Data Migration](https://img.shields.io/powershellgallery/v/AzureRM.DataMigration.svg?style=flat-square&label=AzureRM.DataMigration)](https://www.powershellgallery.com/packages/AzureRM.DataMigration/) |
 | DevTest Labs                          | `AzureRM.DevTestLabs`                   | [![DevTest Labs](https://img.shields.io/powershellgallery/v/AzureRM.DevTestLabs.svg?style=flat-square&label=AzureRM.DevTestLabs)](https://www.powershellgallery.com/packages/AzureRM.DevTestLabs/) |
 | DNS                                   | `AzureRM.Dns`                           | [![DNS](https://img.shields.io/powershellgallery/v/AzureRM.Dns.svg?style=flat-square&label=AzureRM.Dns)](https://www.powershellgallery.com/packages/AzureRM.Dns/) |
 | Event Grid                            | `AzureRM.EventGrid`                     | [![Event Grid](https://img.shields.io/powershellgallery/v/AzureRM.EventGrid.svg?style=flat-square&label=AzureRM.EventGrid)](https://www.powershellgallery.com/packages/AzureRM.EventGrid/) |
@@ -54,6 +56,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Recovery Services - Site Recovery     | `AzureRM.RecoveryServices.SiteRecovery` | [![Recovery Services - Site Recovery](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.SiteRecovery.svg?style=flat-square&label=AzureRM.RecoveryServices.SiteRecovery)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices.SiteRecovery/) |
 | Redis Cache                           | `AzureRM.RedisCache`                    | [![Redis Cache](https://img.shields.io/powershellgallery/v/AzureRM.RedisCache.svg?style=flat-square&label=AzureRM.RedisCache)](https://www.powershellgallery.com/packages/AzureRM.RedisCache/) |
 | Relay                                 | `AzureRM.Relay`                         | [![Relay](https://img.shields.io/powershellgallery/v/AzureRM.Relay.svg?style=flat-square&label=AzureRM.Relay)](https://www.powershellgallery.com/packages/AzureRM.Relay/) |
+| Reservations                          | `AzureRM.Reservations`                  | [![Reservations](https://img.shields.io/powershellgallery/v/AzureRM.Reservations.svg?style=flat-square&label=AzureRM.Reservations)](https://www.powershellgallery.com/packages/AzureRM.Reservations/) |
 | Resources                             | `AzureRM.Resources`                     | [![Resources](https://img.shields.io/powershellgallery/v/AzureRM.Resources.svg?style=flat-square&label=AzureRM.Resources)](https://www.powershellgallery.com/packages/AzureRM.Resources/) |
 | Scheduler                             | `AzureRM.Scheduler`                     | [![Scheduler](https://img.shields.io/powershellgallery/v/AzureRM.Scheduler.svg?style=flat-square&label=AzureRM.Scheduler)](https://www.powershellgallery.com/packages/AzureRM.Scheduler/) |
 | Server Management                     | `AzureRM.ServerManagement`              | [![Server Management](https://img.shields.io/powershellgallery/v/AzureRM.ServerManagement.svg?style=flat-square&label=AzureRM.ServerManagement)](https://www.powershellgallery.com/packages/AzureRM.ServerManagement/) |

src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

@@ -84,7 +84,8 @@ public static class AccountType
             public const string Certificate = "Certificate",
             User = "User",
             ServicePrincipal = "ServicePrincipal",
-            AccessToken = "AccessToken";
+            AccessToken = "AccessToken",
+            ManagedService = "ManagedService";
         }
 
         /// <summary>
@@ -117,7 +118,12 @@ public static class Property
         /// <summary>
         /// Thumbprint for associated certificate
         /// </summary>
-        CertificateThumbprint = "CertificateThumbprint";
+        CertificateThumbprint = "CertificateThumbprint",
+
+        /// <summary>
+        /// Login Uri for Managed Service Login
+        /// </summary>
+        MSILoginUri = "MSILoginUri";
 
 
         }

src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IExtensibleSettings.cs

@@ -1,5 +1,4 @@
-using System;
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");

src/Common/Commands.Common.Authentication.Abstractions/Properties/AssemblyInfo.cs

@@ -47,4 +47,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

src/Common/Commands.Common.Authentication.Test/AuthenticationFactoryTests.cs

@@ -22,11 +22,20 @@
 using Xunit;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using System.Linq;
+using Microsoft.Azure.Commands.Common.Authentication.Test;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using Xunit.Abstractions;
 
 namespace Common.Authentication.Test
 {
     public class AuthenticationFactoryTests
     {
+        ITestOutputHelper _output;
+        public AuthenticationFactoryTests(ITestOutputHelper output)
+        {
+            _output = output;
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void VerifySubscriptionTokenCacheRemove()
@@ -135,6 +144,59 @@ public void CanAuthenticateWithAccessToken()
             VerifyToken(checkKVToken, kvToken, userId, tenant);
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void CanAuthenticateUsingMSIDefault()
+        {
+            AzureSessionInitializer.InitializeAzureSession();
+            string expectedAccessToken = Guid.NewGuid().ToString();
+            _output.WriteLine("Expected access token for default URI: {0}", expectedAccessToken);
+            string expectedToken2 = Guid.NewGuid().ToString();
+            string tenant = Guid.NewGuid().ToString();
+            _output.WriteLine("Expected access token for custom URI: {0}", expectedToken2);
+            string userId = "[email protected]";
+            var account = new AzureAccount
+            {
+                Id = userId,
+                Type = AzureAccount.AccountType.ManagedService
+            };
+            var environment = AzureEnvironment.PublicEnvironments["AzureCloud"];
+            var expectedResource = environment.ActiveDirectoryServiceEndpointResourceId;
+            var builder = new UriBuilder(AuthenticationFactory.DefaultMSILoginUri);
+            builder.Query = string.Format("resource={0}", Uri.EscapeDataString(environment.ActiveDirectoryServiceEndpointResourceId));
+            var defaultUri = builder.Uri.ToString();
+
+            var responses = new Dictionary<string, ManagedServiceTokenInfo>(StringComparer.OrdinalIgnoreCase)
+            {
+                {defaultUri, new ManagedServiceTokenInfo { AccessToken = expectedAccessToken, ExpiresIn = 3600, Resource=expectedResource}},
+                {"http://myfunkyurl:10432/oauth2/token?resource=foo", new ManagedServiceTokenInfo { AccessToken = expectedToken2, ExpiresIn = 3600, Resource="foo"} }
+            };
+            AzureSession.Instance.RegisterComponent(HttpClientOperationsFactory.Name, () => TestHttpOperationsFactory.Create(responses, _output), true);
+            var authFactory = new AuthenticationFactory();
+            var token = authFactory.Authenticate(account, environment, tenant, null, null, null);
+            _output.WriteLine($"Received access token for default Uri ${token.AccessToken}");
+            Assert.Equal(expectedAccessToken, token.AccessToken);
+            var account2 = new AzureAccount
+            {
+                Id = userId,
+                Type = AzureAccount.AccountType.ManagedService
+            };
+            account2.SetProperty(AzureAccount.Property.MSILoginUri, "http://myfunkyurl:10432/oauth2/token");
+            var token2 = authFactory.Authenticate(account2, environment, tenant, null, null, null, "foo");
+            _output.WriteLine($"Received access token for custom Uri ${token2.AccessToken}");
+            Assert.Equal(expectedToken2, token2.AccessToken);
+            var token3 = authFactory.Authenticate(account, environment, tenant, null, null, null, "bar");
+            Assert.Throws<InvalidOperationException>(() => token3.AccessToken);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        void ResponseRedactionWorks()
+        {
+            Assert.Equal("   \"access_token\": \"<redacted>\"", GeneralUtilities.TransformBody("   \"access_token\": \"eyJo1234567\""));
+            Assert.Equal("   \"foo\": \"bar\"", GeneralUtilities.TransformBody("   \"foo\": \"bar\""));
+        }
+
         void VerifyToken(IAccessToken checkToken, string expectedAccessToken, string expectedUserId, string expectedTenant)
         {
 

src/Common/Commands.Common.Authentication.Test/Commands.Common.Authentication.Test.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props"  Condition="Exists('..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')"/>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -132,6 +132,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="TestHttpOperationsFactory.cs" />
     <EmbeddedResource Include="Resources\ResourceLocator.cs" />
   </ItemGroup>
   <ItemGroup>

src/Common/Commands.Common.Authentication.Test/TestHttpOperationsFactory.cs

@@ -0,0 +1,117 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.Common.Authentication.Test
+{
+    public class TestHttpOperationsFactory : IHttpOperationsFactory
+    {
+        ITestOutputHelper _output;
+        private TestHttpOperationsFactory()
+        {
+        }
+
+        IDictionary<string, object> _responses = new ConcurrentDictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        public IHttpOperations<T> GetHttpOperations<T>()
+        {
+            var result = new TestHttpOperations<T>(_responses, _output);
+            return result;
+        }
+
+        public static IHttpOperationsFactory Create<T>(IDictionary<string, T> responses, ITestOutputHelper output)
+        {
+            var factory = new TestHttpOperationsFactory();
+            factory._output = output;
+            foreach (var response in responses)
+            {
+                output.WriteLine($"[TestHttpOperationsFactory]:  Adding request response pair {response.Key} => {response.Value}");
+                factory._responses.Add(response.Key, response.Value);
+            }
+
+            return factory;
+        }
+
+        class TestHttpOperations<T> : IHttpOperations<T>
+        {
+            ITestOutputHelper _output;
+            IDictionary<string, T> _responses = new ConcurrentDictionary<string, T>(StringComparer.OrdinalIgnoreCase);
+
+            public TestHttpOperations(IDictionary<string, T> responses, ITestOutputHelper output)
+            {
+                _output = output;
+                foreach (var responsePair in responses)
+                {
+                    output.WriteLine($"[TestHttpOperations]:  Adding request response pair {responsePair.Key} => {responsePair.Value}");
+                    _responses.Add(responsePair);
+                }
+            }
+            public TestHttpOperations(IDictionary<string, object> responses, ITestOutputHelper output)
+            {
+                _output = output;
+                foreach (var responsePair in responses)
+                {
+                    output.WriteLine($"[TestHttpOperations]:  Adding request response pair {responsePair.Key} => {responsePair.Value}");
+                    _responses.Add(responsePair.Key, (T)(responsePair.Value));
+                }
+            }
+
+            public Task DeleteAsync(string requestUri, CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<T> GetAsync(string requestUri, CancellationToken token)
+            {
+                if (!_responses.ContainsKey(requestUri))
+                {
+                    throw new InvalidOperationException(string.Format("Unexpected request Uri '{0}'", requestUri));
+                }
+
+                var output = _responses[requestUri];
+
+                _output.WriteLine($"[TestHttpOperations]: Sent Response ({output}) to request GET {requestUri}");
+                return Task.FromResult(output);
+            }
+
+            public Task<bool> HeadAsync(string requestUri, CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<IEnumerable<T>> ListAsync(string requestUri, CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            public Task<T> PutAsync(string requestUri, T payload, CancellationToken token)
+            {
+                throw new NotImplementedException();
+            }
+
+            public IHttpOperations<T> WithHeader(string name, IEnumerable<string> value)
+            {
+                // Allow the client to set one or more headers, but we are not using these in validation
+                return this;
+            }
+        }
+    }
+}