Merge pull request #2 from Azure/master

Sync

Author: bashahee

ChangeLog.md

@@ -1,3 +1,13 @@
+## 1.2.1 - January 2019
+#### Az.Accounts
+* Release with correct version of Authentication
+
+#### Az.AnalysisServices
+* Release with updated Authentication dependency
+
+#### Az.RecoveryServices
+* Release with updated Authentication dependency
+
 ## 1.2.0 - January 2019
 #### Az.Accounts
 * Add interactive and username/password authentication for Windows PowerShell 5.1 only

documentation/development-docs/generate-format.ps1xml-file.md

@@ -180,18 +180,18 @@ namespace Microsoft.Azure.Commands.Profile.Models
 
 // code omitted for brevity
 
-        [Ps1Xml(Label = "Subscription Id", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "SubscriptionId", Target = ViewControl.Table)]
         public string Id { get; set; }
 
-        [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Name", Target = ViewControl.Table)]
         public string Name { get; set; }
 
         [Ps1Xml(Label = "State", Target = ViewControl.Table)]
         public string State { get; set; }
 
         public string SubscriptionId { get { return Id; } }
 
-        [Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "TenantId", Target = ViewControl.Table)]
         public string TenantId
         {
             get
@@ -260,8 +260,8 @@ To specify what goes into the table view - use the **ScriptBlock** attribute pro
     {
         // code omitted for brevity
 
-        [Ps1Xml(Label = "Account Id", Target = ViewControl.Table, ScriptBlock = "$_.Account.Id")]
-        [Ps1Xml(Label = "Account Type", Target = ViewControl.Table, ScriptBlock = "$_.Account.Type")]
+        [Ps1Xml(Label = "Account.Id", Target = ViewControl.Table, ScriptBlock = "$_.Account.Id")]
+        [Ps1Xml(Label = "Account.Type", Target = ViewControl.Table, ScriptBlock = "$_.Account.Type")]
         public IAzureAccount Account { get; set; }
 
         // code omitted for brevity
@@ -272,8 +272,8 @@ Note: **$_** symbol in PowerShell means the same as **this** key word means in C
 
 These two attribute will result in 2 column in the table view:
 ```Ps
-    Account Id  Account Type
-    ==========  ============
+    Account.Id   Account.Type
+    ==========   ============
 ```
 ## GroupBy a property.
 
@@ -284,7 +284,7 @@ public class PSAzureSubscription : IAzureSubscription
 
 // code omitted for brevity
 
-    [Ps1Xml(Label = "Subscription Id", Target = ViewControl.Table, GroupByThis = true)]
+    [Ps1Xml(Label = "SubscriptionId", Target = ViewControl.Table, GroupByThis = true)]
     public string Id { get; set; }
 
 // code omitted for brevity 
@@ -298,7 +298,7 @@ public class PSAzureSubscription : IAzureSubscription
 
 // code omitted for brevity
 
-    [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, Position = 0)]
+    [Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
     public string Name { get; set; }
 
 // code omitted for brevity 
@@ -309,53 +309,70 @@ This will place the column at the very beginning of the table.
 
 # How to generate format.ps1xml file.
 
-1. First of all you need to [build](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/azure-powershell-developer-guide.md#building-the-environment) PowerShell Azure:
-
-```Powershell
-PS E:\git\azure-powershell> msbuild build.proj /p:SkipHelp=true
-```
-
-* After the build is completed you can find build artifacts in the ```.\artifacts\Debug``` folder:
-
-```Powershell
-PS E:\git\azure-powershell> ls .\artifacts\Debug\
+## Let's consider how to generate a format.ps1xml file for the Az.Storage and Az.Account modules.
+1. Start PowerShell 6
+2. Build and import the FormatPs1XmlGenerator module.
+    * Go to the generator directory
+    ```Powershell
+    PS C:\Users\you> cd E:\git\azure-powershell\tools\FormatPs1XmlGenerator\
+    ```
+    * Build the generator solution
+    ```Powershell
+    PS E:\git\azure-powershell\tools\FormatPs1XmlGenerator> dotnet build
+    ```
+    * Import the generator module
+    ```Powershell
+    PS E:\git\azure-powershell\tools\FormatPs1XmlGenerator> Import-Module .\FormatPs1XmlGenerator\bin\Debug\FormatPs1XmlGenerator.psd1
+    ```
+
+3. Build the Az.Storage module.
+    * Go to the Storage directory
+    ```Powershell
+    PS C:\Users\you>cd E:\git\azure-powershell\src\Storage
+    ```
+    * Build the module
+    ```Powershell
+    PS E:\git\azure-powershell\src\Storage>dotnet build
+    ```
+    * Go to the repository root folder
+    ```Powershell
+    PS E:\git\azure-powershell\src\Storage>cd E:\git\azure-powershell\
+    ```
+    * Check the artifacts folder - all built modules should be there. Since Az.Storage depends on the Az.Accounts module both Az.Accounts and Az.Storage modules should be there:
+    ```Powershell
+    PS E:\git\azure-powershell> ls .\artifacts\Debug\
 
 
     Directory: E:\git\azure-powershell\artifacts\Debug
 
 
-Mode                LastWriteTime         Length Name
-----                -------------         ------ ----
-d-----        4/25/2018   4:37 PM                ResourceManager
-d-----        4/25/2018   4:35 PM                ServiceManagement
-d-----        4/25/2018   4:35 PM                Storage
--a----        4/25/2018   4:31 PM          11384 Az.psd1
--a----        4/25/2018   4:50 PM           8708 Az.psm1
-
-```
-
-2. Import the **RepoTask cmdlets**:
-
-```PowerShell
-PS E:\git\azure-powershell> Import-Module E:\git\azure-powershell\tools\RepoTasks\RepoTasks.Cmdlets\bin\Debug\RepoTasks.Cmdlets.dll
-```
-3. Run the **New-FormatPs1Xml** cmdlet. 
-* The cmdlet has one required argument **-ModulePath** - a path to a module manifest (psd1) file. Since in our example we are using the Get-AzSubscription cmdlet from the Az.Accounts module we need to specify path to the Az.Accounts module manifest which is 
-```
-E:\git\azure-powershell\artifacts\Debug\Az.Accounts\Az.Accounts.psd1 
-``` 
-* Also with the cmdlet we need to use **-OnlyMarkedProperties** switch.
-* You may also want to specify an output path for the generated file with the **-OutputPath** argument. If not specified this is current folder.
-
-```
-PS E:\git\azure-powershell> New-FormatPs1Xml -ModulePath .\artifacts\Debug\Az.Accounts\Az.Accounts.psd1 -OnlyMarkedProperties
-
-E:\git\azure-powershell\Microsoft.Azure.Commands.Profile.generated.format.ps1xml
-```
-* After a successful run the cmdlet outputs the full path to the generated format.ps1xml file.
+    Mode                LastWriteTime         Length Name
+    ----                -------------         ------ ----
+    d-----        1/29/2019   2:18 PM                Az.Accounts
+    d-----        1/29/2019   2:18 PM                Az.Storage
+    ```
+4. Run the **New-FormatPs1Xml** cmdlet. 
+    * The cmdlet has one required parameter **-ModulePath** - a path to a module manifest (psd1) file.
+    * Also with the cmdlet we need to use **-OnlyMarkedProperties** switch.
+    * You may also want to specify an output path for the generated file with the **-OutputPath** argument. If not specified this is current folder.
+    * After a successful run the cmdlet outputs the full path to the generated format.ps1xml file.
+
+    * Below is an example of how to generate a format.ps1xml file for the ```Az.Storage``` module:
+    ```Powershell
+    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\artifacts\Debug\Az.Storage\Az.Storage.psd1
+    E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Storage.Management.generated.format.ps1xml
+    E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Storage.generated.format.ps1xml
+    ```
+    * Below is an example of how to generate a format.ps1xml file for the ```Az.Account``` module:
+    ```powershell
+    PS E:\git\azure-powershell> New-FormatPs1Xml -OnlyMarkedProperties -ModulePath .\artifacts\Debug\Az.Accounts\Az.Accounts.psd1
+    E:\git\azure-powershell\Microsoft.Azure.PowerShell.Cmdlets.Accounts.generated.format.ps1xml
+    PS E:\git\azure-powershell>
+    ```
 
 # How to test the format.ps1xml file.
 
+## Let's take a look at how to check the newly created format.ps1xml file for the ```Az.Account``` module.
 **Note:** All the paths used in the example in the section are under **_azure-powershell/artifacts/Debug_**
 
 1. **Copy** the generated format.ps1xml file to the built module folder (this is where your module manifest file psd1 is located). In our example the module folder is 
@@ -396,7 +413,7 @@ PS C:\> Import-Module E:\git\azure-powershell\artifacts\Debug\Az.Accounts\Az.Acc
 ```Powershell
 PS C:\> Get-AzSubscription
 
-Subscription Id                      Subscription Name         State   Tenant Id
+SubscriptionId                       Name                      State   TenantId
 ---------------                      -----------------         -----   ---------
 c9cbd920-c00c-427c-852b-c329e824c3a8 Azure SDK Powershell Test Enabled 72f988bf-86f1-41af-91ab-7a64d1d63df5
 6b085460-5f21-477e-ba44-4cd9fbd030ef Azure SDK Infrastructure  Enabled 72f988bf-86f1-41af-91ab-7a64d1d63df5

src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs

@@ -229,13 +229,24 @@ public override void ExecuteCmdlet()
                         Path = "/oauth2/token"
                     };
 
+                    var envSecret = System.Environment.GetEnvironmentVariable(MSISecretVariable);
+
                     var msiSecret = this.IsBound(nameof(ManagedServiceSecret))
                         ? ManagedServiceSecret.ConvertToString()
-                        : System.Environment.GetEnvironmentVariable(MSISecretVariable);
+                        : envSecret;
+
+                    var envUri = System.Environment.GetEnvironmentVariable(MSIEndpointVariable);
 
                     var suppliedUri = this.IsBound(nameof(ManagedServiceHostName))
                         ? builder.Uri.ToString()
-                        : System.Environment.GetEnvironmentVariable(MSIEndpointVariable);
+                        : envUri;
+
+                    if (!this.IsBound(nameof(ManagedServiceHostName)) && !string.IsNullOrWhiteSpace(envUri) 
+                        && !this.IsBound(nameof(ManagedServiceSecret)) && !string.IsNullOrWhiteSpace(envSecret))
+                    {
+                        // set flag indicating this is AppService Managed Identity ad hoc mode
+                        azureAccount.SetProperty(AuthenticationFactory.AppServiceManagedIdentityFlag, "the value not used");
+                    }
 
                     if (!string.IsNullOrWhiteSpace(msiSecret))
                     {

src/Accounts/Accounts/Az.Accounts.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.2.0'
+ModuleVersion = '1.2.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -141,9 +141,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add interactive and username/password authentication for Windows PowerShell 5.1 only
-* Update incorrect online help URLs
-* Add warning message in PS Core for Uninstall-AzureRm'
+        ReleaseNotes = '* Release with correct version of Authentication'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -1694,6 +1694,7 @@
     "New-AzOperationalInsightsWindowsPerformanceCounterDataSource": "New-AzureRmOperationalInsightsWindowsPerformanceCounterDataSource",
     "New-AzOperationalInsightsLinuxPerformanceObjectDataSource": "New-AzureRmOperationalInsightsLinuxPerformanceObjectDataSource",
     "New-AzOperationalInsightsLinuxSyslogDataSource": "New-AzureRmOperationalInsightsLinuxSyslogDataSource",
+    "New-AzOperationalInsightsApplicationInsightsDataSource": "New-AzureRmOperationalInsightsApplicationInsightsDataSource",
     "Disable-AzOperationalInsightsLinuxSyslogCollection": "Disable-AzureRmOperationalInsightsLinuxSyslogCollection",
     "New-AzOperationalInsightsWindowsEventDataSource": "New-AzureRmOperationalInsightsWindowsEventDataSource",
     "Get-AzOperationalInsightsSavedSearch": "Get-AzureRmOperationalInsightsSavedSearch",

src/Accounts/Accounts/ChangeLog.md

@@ -20,6 +20,10 @@
 ## Upcoming Release
 * Update to latest version of ClientRuntime
 
+## Version 1.2.1
+* Release with correct version of Authentication
+* Enable MSI Authentication in Azure Functions and WebApps
+
 ## Version 1.2.0
 * Add interactive and username/password authentication for Windows PowerShell 5.1 only
 * Update incorrect online help URLs

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.0")]
-[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyVersion("1.2.1")]
+[assembly: AssemblyFileVersion("1.2.1")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/Accounts/Authentication.Test/AuthenticationFactoryTests.cs

@@ -14,7 +14,6 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Factories;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using System;
 using System.Collections.Generic;
@@ -25,8 +24,6 @@
 using Microsoft.Azure.Commands.Common.Authentication.Test;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Xunit.Abstractions;
-using Microsoft.Rest.Azure;
-using Microsoft.Azure.Commands.ResourceManager.Common;
 
 namespace Common.Authentication.Test
 {
@@ -180,7 +177,7 @@ public void CanAuthenticateUsingMSIDefault()
             IRenewableToken token = (IRenewableToken) authFactory.Authenticate(account, environment, tenant, null, null, null);
             _output.WriteLine($"Received access token for default Uri ${token.AccessToken}");
             Assert.Equal(expectedAccessToken, token.AccessToken);
-            Assert.Equal(3600, Math.Round(token.ExpiresOn.DateTime.Subtract(DateTime.UtcNow).TotalSeconds));
+            Assert.Equal(3600, Math.Round(token.ExpiresOn.Subtract(DateTimeOffset.Now).TotalSeconds));
             var account2 = new AzureAccount
             {
                 Id = userId,
@@ -230,7 +227,7 @@ public void CanAuthenticateUsingMSIResourceId()
             IRenewableToken token = (IRenewableToken) authFactory.Authenticate(account, environment, tenant, null, null, null);
             _output.WriteLine($"Received access token for default Uri ${token.AccessToken}");
             Assert.Equal(expectedAccessToken, token.AccessToken);
-            Assert.Equal(3600, Math.Round(token.ExpiresOn.DateTime.Subtract(DateTime.UtcNow).TotalSeconds));
+            Assert.Equal(3600, Math.Round(token.ExpiresOn.Subtract(DateTimeOffset.Now).TotalSeconds));
             var account2 = new AzureAccount
             {
                 Id = userId,
@@ -279,7 +276,7 @@ public void CanAuthenticateUsingMSIClientId()
             IRenewableToken token = (IRenewableToken) authFactory.Authenticate(account, environment, tenant, null, null, null);
             _output.WriteLine($"Received access token for default Uri ${token.AccessToken}");
             Assert.Equal(expectedAccessToken, token.AccessToken);
-            Assert.Equal(3600, Math.Round(token.ExpiresOn.DateTime.Subtract(DateTime.UtcNow).TotalSeconds));
+            Assert.Equal(3600, Math.Round(token.ExpiresOn.Subtract(DateTimeOffset.Now).TotalSeconds));
             var account2 = new AzureAccount
             {
                 Id = userId,
@@ -328,7 +325,7 @@ public void CanAuthenticateUsingMSIObjectId()
             IRenewableToken token = (IRenewableToken) authFactory.Authenticate(account, environment, tenant, null, null, null);
             _output.WriteLine($"Received access token for default Uri ${token.AccessToken}");
             Assert.Equal(expectedAccessToken, token.AccessToken);
-            Assert.Equal(3600, Math.Round(token.ExpiresOn.DateTime.Subtract(DateTime.UtcNow).TotalSeconds));
+            Assert.Equal(3600, Math.Round(token.ExpiresOn.Subtract(DateTimeOffset.Now).TotalSeconds));
             var account2 = new AzureAccount
             {
                 Id = userId,
@@ -351,7 +348,6 @@ void ResponseRedactionWorks()
 
         void VerifyToken(IAccessToken checkToken, string expectedAccessToken, string expectedUserId, string expectedTenant)
         {
-
             Assert.True(checkToken is RawAccessToken);
             Assert.Equal(expectedAccessToken, checkToken.AccessToken);
             Assert.Equal(expectedUserId, checkToken.UserId);
@@ -363,5 +359,45 @@ void VerifyToken(IAccessToken checkToken, string expectedAccessToken, string exp
             });
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void AppServiceManagedIdentity()
+        {
+            AzureSessionInitializer.InitializeAzureSession();
+            var tenant = Guid.NewGuid().ToString();
+            var userId = Guid.NewGuid().ToString();
+            var environment = AzureEnvironment.PublicEnvironments["AzureCloud"];
+            var account = new AzureAccount
+            {
+                Id = userId,
+                Type = AzureAccount.AccountType.ManagedService
+            };
+            const string resource = @"https://management.azure.com/";
+            const string endpoint = @"http://127.0.0.1:41217/MSI/token/";
+            var expectedUri = $"{endpoint}?resource={resource}&api-version=2017-09-01";
+            account.SetProperty(AzureAccount.Property.MSILoginUri , endpoint);
+            account.SetProperty(AzureAccount.Property.MSILoginSecret , @"bar");
+            const string expectedAccessToken = "foo";
+            var expectedExpiresOn = DateTimeOffset.Parse("1/23/2019 7:15:42 AM +00:00");
+            var responses = new Dictionary<string, ManagedServiceAppServiceTokenInfo>(StringComparer.OrdinalIgnoreCase)
+            {
+                {
+                    expectedUri,
+                    new ManagedServiceAppServiceTokenInfo()
+                    {
+                        AccessToken = expectedAccessToken,
+                        ExpiresOn = expectedExpiresOn,
+                        Resource = resource,
+                        TokenType = "Bearer",
+                    }
+                }
+            };
+            AzureSession.Instance.RegisterComponent(HttpClientOperationsFactory.Name, () => TestHttpOperationsFactory.Create(responses, _output), true);
+            var msat = new ManagedServiceAppServiceAccessToken(account, environment, tenant);
+            Assert.Equal(expectedUri, msat.RequestUris.Peek());
+            var accessToken = msat.AccessToken;
+            Assert.Equal(expectedAccessToken, accessToken);
+            Assert.Equal(expectedExpiresOn, msat.ExpiresOn);
+        }
     }
 }