Merge pull request #6 from Azure/master

Sync

Author: bashahee

ChangeLog.md

@@ -1,12 +1,120 @@
+## 2.6.0 - August 2019
+#### General
+* Fixed miscellaneous typos across numerous modules
+
+#### Az.Accounts
+* Added support for user-assigned MSI in Azure Functions authentication (#9479)
+
+#### Az.Aks
+* Fixed issue with output for 'Get-AzAks' ([#9847](https://github.com/Azure/azure-powershell/issues/9847))
+
+#### Az.ApiManagement
+* Fixed issue with whitespace in `productId`, `apiId`, `groupId`, `userId` ([#9351](https://github.com/Azure/azure-powershell/issues/9351))
+* **Get-AzApiManagementProduct** - Added support for querying products using API ([#9482](https://github.com/Azure/azure-powershell/issues/9482))
+* **New-AzApiManagementApiRevision** - Fixed issue where ApiRevisionDescription was not set when creating new API revision ([#9752](https://github.com/Azure/azure-powershell/issues/9752))
+* Fixed typo in model `PsApiManagementOAuth2AuthrozationServer` to `PsApiManagementOAuth2AuthorizationServer`
+
+#### Az.Batch
+* Fixed typos in help message and documentation
+
+#### Az.Cdn
+* Fixed a typo in CDN module conversion helper
+
+#### Az.Compute
+* Added VmssId to **New-AzVMConfig** cmdlet
+* Added `TerminateScheduledEvents` and `TerminateScheduledEventNotBeforeTimeoutInMinutes` parameters to **New-AzVmssConfig** and **Update-AzVmss**
+* Added `HyperVGeneration` property to VM image object
+* Added Host and HostGroup features
+  - New cmdlets:
+    - **New-AzHostGroup**
+    - **New-AzHost**
+    - **Get-AzHostGroup**
+    - **Get-AzHost**
+    - **Remove-AzHostGroup**
+    - **Remove-AzHost**
+  - Added `HostId` parameter to **New-AzVMConfig** and **New-AzVM**
+* Updated example in **Invoke-AzVMRunCommand** documentation to use correct parameter name
+* Updated `-VolumeType` description in **Set-AzVMDiskEncryptionExtension** and **Set-AzVmssDiskEncryptionExtension** reference documentation
+
+#### Az.DataFactory
+* Fixed typos in **New-AzDataFactoryEncryptValue** documentation
+* Updated ADF .Net SDK version to 4.1.2
+* Added parameters to **Set-AzureRmDataFactoryV2IntegrationRuntime** to enable Self-Hosted Integration Runtime as a proxy for SSIS Integration Runtime:
+  - `DataProxyIntegrationRuntimeName`
+  - `DataProxyStagingLinkedServiceName`
+  - `DataProxyStagingPath` 
+* Updated **PSTriggerRun** to show the triggered pipelines, message and properties, and **PSActivityRun** to show the activity type
+
+#### Az.DataLakeStore
+* Fixed issue where **Get-DataLakeStoreDeletedItem** would hang on errors and remote exceptions
+
+#### Az.EventHub
+* Fixed typo `VirtualNteworkRule` in Set-AzEventHubNetworkRuleSet ([#9658](https://github.com/azure/azure-powershell/issues/9658))
+* Fixed issue where Set-AzEventHubNamespace used PATCH instead of PUT ([#9558](https://github.com/azure/azure-powershell/issues/9558))
+* Added `EnableKafka` parameter to **Set-AzEventHubNamespace** cmdlet
+* Fixed issue with creating rules with `Listen` rights ([#9786](https://github.com/azure/azure-powershell/issues/9786))
+
+#### Az.MarketplaceOrdering
+* Fixed documentation typos
+
+#### Az.Monitor
+* Fixed incorrect parameter name in help documentation
+
+#### Az.Network
+* Updated **New-AzPrivateLinkServiceIpConfig**:
+  - Deprecated the parameter `PublicIpAddress` since this is never used in the server side.
+  - Added optional parameter `Primary` that indicates if the current IP configuration is the primary one
+* Improved handling of request error exception from SDK
+* Fixed validation logic for Ipv6 IP Prefix to check for correct IPv6 prefix length
+* Added parameter set to get by subnet resource id to **Get-AzVirtualNetworkSubnetConfig** 
+* Updated description of **Location** parameter for **AzNetworkServiceTag**
+
+#### Az.OperationalInsights
+* Updated documentation for **New-AzOperationalInsightsLinuxSyslogDataSource**:
+  - Added example
+  - Updated description for `-Name` parameter
+* Added an example for **New-AzOperationalInsightsWindowsEventDataSource**
+* Changed the description of the `-Name` parameter for **New-AzOperationalInsightsWindowsEventDataSource**
+
+#### Az.RecoveryServices
+* Updated documentation for **Get-AzRecoveryServicesBackupJobDetail**
+
+#### Az.Resources
+* Added support for new API version 2019-05-10 for Microsoft.Resource
+  - Add support for 'copy.count = 0' for variables, resources and properties
+  - Resources with 'condition = false' or 'copy.count = 0' will be deleted in complete mode
+* Added an example of assigning policy at the subscription level
+
+#### Az.ServiceBus
+* Fixed typo `VirtualNetworkRule` parameter in **Set-AzServiceBusNetworkRuleSet** Fix for issue #9658 : Typo 
+* Fixed issue with creating `Listen`-only rules ([#9786](https://github.com/azure/azure-powershell/issues/9786))
+* Added new command **Test-AzServiceBusNameAvailability** to check the name availability for queue and topic 
+
+#### Az.ServiceFabric
+* Fixed NullReferenceException when a resource group has a VMSS not related to the service fabric cluster ([#8681](https://github.com/Azure/azure-powershell/issues/8681))
+* Fixed bug where cmdlets failed if virtualNetwork was in a different resource group than the cluster ([#8407](https://github.com/Azure/azure-powershell/issues/8407))
+* Deprecated **Add-AzServiceFabricApplicationCertificate** cmdlet
+
+#### Az.Sql
+* Updated documentation for old Auditing cmdlets
+
+#### Az.Storage
+* Updated help for **Close-AzStorageFileHandle** and **Get-AzStorageFileHandle**,  added more scenarios to cmdlet examples and updated parameter descriptions
+* Added support for `StandardBlobTier` in blob uploads and copies
+* Added support for `Rehydrate` priority in blob copy
+
+#### Az.Websites
+* Added clarification around `-AppSettings` parameter for **Set-AzWebApp** and **Set-AzWebAppSlot**
+
 ## 2.5.0 - July 2019
 #### Az.Accounts
 * Update common code to use latest version of ClientRuntime
 
 #### Az.ApplicationInsights
-* Fix example typo in 'Remove-AzApplicationInsightsApiKey' documentation 
+* Fix example typo in 'Remove-AzApplicationInsightsApiKey' documentation
 
 #### Az.Automation
-* Fix typo in resource string 
+* Fix typo in resource string
 
 #### Az.CognitiveServices
 * Added NetworkRuleSet support.

documentation/development-docs/help-generation.md

@@ -12,7 +12,6 @@ To do so, you can follow the below steps (which are outlined in the [**Quick sta
 
 ```powershell
 Install-Module -Name platyPS -Scope CurrentUser
-Import-Module platyPS
 ```
 
 **Note:** this module will need to be installed from the [PowerShell Gallery](http://www.powershellgallery.com/). If, for some reason, this isn't a registered repository when running the `Get-PSRepository` cmdlet, then you will need to register it by running the following command:
@@ -38,6 +37,17 @@ Import-Module -Name $PathToModuleManifest
 
 **Note**: if you do not see all of the changes you made to the cmdlets in your markdown files (_e.g.,_ a cmdlet you deleted is still appearing), you may need to delete any existing Azure PowerShell modules that you have on your machine (installed either through the PowerShell Gallery or by Web Platform Installer) before you import your module.
 
+### Generating help for a new module
+
+For new modules with no existing `help` folder containing the markdown help files, run the following command to do an initial generation:
+
+```powershell
+$PathToHelpFolder = "../../help" # Full path to help folder containing markdown files to be generated (e.g., src/Accounts/Accounts/help)
+New-MarkdownHelp -Module {{moduleName}} -OutputFolder $PathToHelpFolder -AlphabeticParamsOrder -UseFullTypeName -WithModulePage
+```
+
+Once this folder has been generated, follow the steps provided in the below section to update the files with any changes made to the public interface of the cmdlets.
+
 ### Updating help after making cmdlet changes
 
 Whenever the public interface for a cmdlet has changed, the corresponding markdown file for that cmdlet will need to be updated to reflect the changes. Public interface changes include the following:
@@ -70,7 +80,7 @@ If you would like to update the inputs/outputs for a markdown file, please run t
 This will update all of the markdown files with public interface changes made to corresponding cmdlets, add markdown files for any new cmdlets, remove markdown files for any deleted cmdlets, and update the module page (_e.g.,_ `Az.Accounts.md`) with any added or removed cmdlets.
 
 _This seems to work better when run from within the `help` folder itself (For e.g. to generate the help files for the [`Network`](src/Network) module run the cmd from under [`Commands.Network/help`](src/Network/Network/help)). Also, you will have to import the profile module from under <Repo base path>/artifacts/Debug/Az.Accounts/Az.Accounts.psd1_
-
+ 
 #### Updating a single markdown file
 
 To update a single markdown file with the changes made to the corresponding cmdlet, use the [`Update-MarkdownHelp`](https://github.com/PowerShell/platyPS/blob/master/docs/Update-MarkdownHelp.md) cmdlet:

src/Accounts/Accounts/Az.Accounts.psd1

@@ -1,9 +1,9 @@
 #
-# Module manifest for module 'PSGet_Az.Accounts'
+# Module manifest for module 'Az.Accounts'
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 7/23/2019
+# Generated on: 8/22/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.6.1'
+ModuleVersion = '1.6.2'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -143,12 +143,13 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Update common code to use latest version of ClientRuntime'
+        ReleaseNotes = '* Fixed miscellaneous typos across module
+* Support user-assigned MSI in Azure Functiosn Authentication (#9479)'
 
         # Prerelease string of this module
         # Prerelease = ''
 
-        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
         # RequireLicenseAcceptance = $false
 
         # External dependent modules of this module

src/Accounts/Accounts/ChangeLog.md

@@ -18,7 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+## Version 1.6.2
 * Fixed miscellaneous typos across module
+* Support user-assigned MSI in Azure Functions Authentication (#9479)
 
 ## Version 1.6.1
 * Update common code to use latest version of ClientRuntime

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.6.1")]
-[assembly: AssemblyFileVersion("1.6.1")]
+[assembly: AssemblyVersion("1.6.2")]
+[assembly: AssemblyFileVersion("1.6.2")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
 #endif

src/Accounts/Authentication.Test/AuthenticationFactoryTests.cs

@@ -365,7 +365,7 @@ public void AppServiceManagedIdentity()
         {
             AzureSessionInitializer.InitializeAzureSession();
             var tenant = Guid.NewGuid().ToString();
-            var userId = Guid.NewGuid().ToString();
+            var userId = "MSI@2";
             var environment = AzureEnvironment.PublicEnvironments["AzureCloud"];
             var account = new AzureAccount
             {
@@ -402,7 +402,7 @@ public void AppServiceManagedIdentity()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void AppServiceManagedIdentityWithDataPlane()
+        public void AppServiceUserManagedIdentityWithDataPlane()
         {
             AzureSessionInitializer.InitializeAzureSession();
             var tenant = Guid.NewGuid().ToString();
@@ -415,6 +415,47 @@ public void AppServiceManagedIdentityWithDataPlane()
             };
             const string resource = @"https://vault.azure.com/";
             const string endpoint = @"http://127.0.0.1:41217/MSI/token/";
+            var expectedUri = $"{endpoint}?resource={resource}&api-version=2017-09-01&clientid={userId}";
+            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, environment.GetEndpoint(resource) ?? resource, tenant);
+            Assert.Equal(expectedUri, msat.RequestUris.Peek());
+            var accessToken = msat.AccessToken;
+            Assert.Equal(expectedAccessToken, accessToken);
+            Assert.Equal(expectedExpiresOn, msat.ExpiresOn);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void AppServiceManagedIdentityWithDataPlane()
+        {
+            AzureSessionInitializer.InitializeAzureSession();
+            var tenant = Guid.NewGuid().ToString();
+            var userId = "MSI@2";
+            var environment = AzureEnvironment.PublicEnvironments["AzureCloud"];
+            var account = new AzureAccount
+            {
+                Id = userId,
+                Type = AzureAccount.AccountType.ManagedService
+            };
+            const string resource = @"https://vault.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");
@@ -447,7 +488,7 @@ public void AppServiceManagedIdentityWithServiceManagement()
         {
             AzureSessionInitializer.InitializeAzureSession();
             var tenant = Guid.NewGuid().ToString();
-            var userId = Guid.NewGuid().ToString();
+            var userId = "MSI@2";
             var environment = AzureEnvironment.PublicEnvironments["AzureCloud"];
             var account = new AzureAccount
             {

src/Accounts/Authentication/Authentication/ManagedServiceAccessTokenBase.cs

@@ -34,7 +34,7 @@ public abstract class ManagedServiceAccessTokenBase<TManagedServiceTokenInfo> :
 
         protected ManagedServiceAccessTokenBase(IAzureAccount account, IAzureEnvironment environment, string resourceId, string tenant = "Common")
         {
-            if (string.IsNullOrEmpty(account?.Id) || !account.IsPropertySet(AzureAccount.Property.MSILoginUri))
+            if (string.IsNullOrWhiteSpace(account?.Id) || !account.IsPropertySet(AzureAccount.Property.MSILoginUri))
             {
                 throw new ArgumentNullException(nameof(account));
             }

src/Accounts/Authentication/Authentication/ManagedServiceAppServiceAccessToken.cs

@@ -13,7 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using System;
 using System.Collections.Generic;
+using System.Text;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
@@ -32,7 +34,14 @@ public ManagedServiceAppServiceAccessToken(IAzureAccount account, IAzureEnvironm
         protected override IEnumerable<string> BuildTokenUri(string baseUri, IAzureAccount account, IdentityType identityType,
             string resourceId)
         {
-            yield return $"{baseUri}?resource={resourceId}&api-version=2017-09-01";;
+            StringBuilder query = new StringBuilder($"{baseUri}?resource={resourceId}&api-version=2017-09-01");
+
+            if(identityType == IdentityType.ClientId || identityType == IdentityType.ObjectId)
+            {
+                query.Append($"&clientid={Uri.EscapeDataString(account.Id)}");
+            }
+
+            yield return query.ToString();
         }
 
         protected override void SetToken(ManagedServiceAppServiceTokenInfo infoWebApps)

src/Advisor/Advisor/Az.Advisor.psd1

@@ -1,9 +1,9 @@
 #
-# Module manifest for module 'PSGet_Az.Advisor'
+# Module manifest for module 'Az.Advisor'
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 6/21/2019
+# Generated on: 8/22/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.0.0'
+ModuleVersion = '1.0.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Advisor.dll'
@@ -109,12 +109,12 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* GA release of Az.Advisor'
+        ReleaseNotes = '* Fixed miscellaneous typos across module'
 
         # Prerelease string of this module
         # Prerelease = ''
 
-        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
         # RequireLicenseAcceptance = $false
 
         # External dependent modules of this module

src/Advisor/Advisor/ChangeLog.md

@@ -19,6 +19,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+## Version 1.0.1
 * Fixed miscellaneous typos across module
 
 ## Version 1.0.0

src/Advisor/Advisor/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("860B550A-20CE-4FB1-BAE7-EF10E9221BCE")]
 
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]