merge upstream preview

Author: ejarvi

.travis.yml

@@ -27,7 +27,7 @@ after_success:
     docker build . -t $DOCKER_USER/$NAME:$TRAVIS_COMMIT --build-arg CONFIG=$CONFIG;
     docker tag $DOCKER_USER/$NAME:$TRAVIS_COMMIT $DOCKER_USER/$NAME:$TRAVIS_BRANCH;
 
-    docker login -u $DOCKER_USER -p $DOCKER_PASS;
+    echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin;
 
     docker push $DOCKER_USER/$NAME:$TRAVIS_COMMIT;
     docker push $DOCKER_USER/$NAME:$TRAVIS_BRANCH;

Azure.PowerShell.Netcore.sln

@@ -1,4 +1,59 @@
-## 5.6.0 - March 2018
+## 5.7.0 - April 2018
+
+#### General
+* Updated to the latest version of the Azure ClientRuntime
+
+#### Azure.Storage
+* Fix the issue that upload Blob and upload File cmdlets fail on FIPS policy enabled machines
+	- Set-AzureStorageBlobContent
+	- Set-AzureStorageFileContent
+
+#### AzureRM.Billing
+* New Cmdlet Get-AzureRmEnrollmentAccount
+  - cmdlet to retrieve enrollment accounts
+
+#### AzureRM.CognitiveServices
+* Integrate with Cognitive Services Management SDK version 4.0.0.
+* Add Get-AzureRmCognitiveServicesAccountUsage operation.
+
+#### AzureRM.Compute
+* `Get-AzureRmVmssDiskEncryptionStatus` supports encryption status at data disk level
+* `Get-AzureRmVmssVmDiskEncryptionStatus` supports encryption status at data disk level
+* Update for Zone Resilient
+* 'New-AzureRmVm' and 'New-AzureRmVmss' (simple parameter set) support availability zones.
+
+#### AzureRM.ContainerRegistry
+* Decouple reliance on Commands.Resources.Rest and ARM/Storage SDKs.
+
+#### AzureRM.DataLakeStore
+* Add debug functionality
+* Update the version of the ADLS dataplane SDK to 1.1.2
+* Export-AzureRmDataLakeStoreItem - Deprecated parameters PerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
+* Import-AzureRMDataLakeStoreItem - Deprecated parametersPerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
+* Get-AzureRMDataLakeStoreItemContent - Fixed the tail behavior for contents greater than 4MB
+* Set-AzureRMDataLakeStoreItemExpiry - Introduced new parameter set SetRelativeExpiry for setting relative expiration time
+* Remove-AzureRmDataLakeStoreItem - Deprecated parameter Clean.
+
+#### AzureRM.EventHub
+* Fixed AlternameName in New-AzureRmEventHubGeoDRConfiguration
+
+#### AzureRM.KeyVault
+* Updated cmdlets to include piping scenarios
+* Add deprecation messages for upcoming breaking change release
+
+#### AzureRM.Network
+* Fix error message with Network cmdlets
+
+#### AzureRM.ServiceBus
+* Added 'properties' in CorrelationFilter of Rules to support customproperties
+* updated New-AzureRmServiceBusGeoDRConfiguration help and fixed Rules cmdlet output
+* Fixed auto-forward properties in New-AzureRmServiceBusQueue and New-AzureRmServiceBusSubscription cmdlet
+
+#### AzureRM.Sql
+* Add new cmdlet 'Stop-AzureRmSqlElasticPoolActivity' to support canceling the asynchronous operations on elastic pool
+* Update the response for cmdlets Get-AzureRmSqlDatabaseActivity and Get-AzureRmSqlElasticPoolActivity to reflect more information in the response
+
+## 5.6.0 - March 2018
 
 #### General
 * Fix issue with Default Resource Group in CloudShell

ChangeLog.md

@@ -38,7 +38,7 @@ To install the module containing the legacy RDFE cmdlets, run the following comm
 Install-Module -Name Azure
 ```
 
-If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session:
+If you have an earlier version of the Azure PowerShell modules installed from the PowerShell Gallery and would like to update to the latest version, run the following commands in an elevated PowerShell session. Update-Module installs the new version side-by-side with the old version. It does not remove the old version.
 
 ```powershell
 # Update to the latest version of AzureRM

README.md

@@ -127,6 +127,9 @@
   "src/ResourceManager/OperationalInsights/": [
     ".\\src\\ResourceManager\\OperationalInsights\\Commands.OperationalInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.OperationalInsights.Test.dll"
   ],
+  "src/ResourceManager/PolicyInsights/": [
+    ".\\src\\ResourceManager\\PolicyInsights\\Commands.PolicyInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.PolicyInsights.Test.dll"
+  ],
   "src/ResourceManager/PowerBIEmbedded/": [
     ".\\src\\ResourceManager\\PowerBIEmbedded\\Commands.PowerBIEmbedded.Test\\bin\\Debug\\Microsoft.Azure.Commands.PowerBIEmbedded.Test.dll"
   ],

TestMappings.json

@@ -53,7 +53,7 @@
     <NetCore Condition=" $(NetCore) == '' " >false</NetCore>
     <SkipHelp Condition =" '$(SkipHelp)' == '' ">false</SkipHelp>
     <BuildTasksPath>$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks\bin\$(Configuration)</BuildTasksPath>
-    <Stack Condition = "'$(Scope)' == '' or '$(Scope)' == 'all' or '$(Scope)' == 'Stack' ">true</Stack>
+    <Stack Condition = "(('$(Scope)' == '' or '$(Scope)' == 'all') and '$(NetCore)' == 'false') or '$(Scope)' == 'Stack' ">true</Stack>
     <Latest Condition = "'$(Scope)' == '' or '$(Scope)' != 'Stack'">true</Latest>
   </PropertyGroup>
   <ItemGroup>
@@ -71,7 +71,7 @@
 
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
     <LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
-	  <LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" />
+	  <LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
   </ItemGroup>
 
   <!-- Tasks -->
@@ -254,7 +254,7 @@
 
     <Message Importance="high" Text="Running Static Analyser" />
     <CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
-    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 &quot;" />
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
   </Target>
 
@@ -417,7 +417,7 @@
       Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
 
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(LibrarySourceFolder)\Package\$(Configuration) &quot;"
-        ContinueOnError="ErrorAndContinue" />
+        ContinueOnError="ErrorAndContinue" Condition="'$(NetCore)' == 'false'"/>
 
     <!-- Copying signed shortcut back -->
     <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"

build.proj

@@ -49,6 +49,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Network                               | `AzureRM.Network`                       | [![Network](https://img.shields.io/powershellgallery/v/AzureRM.Network.svg?style=flat-square&label=AzureRM.Network)](https://www.powershellgallery.com/packages/AzureRM.Network/) |
 | Notification Hubs                     | `AzureRM.NotificationHubs`              | [![Notification Hubs](https://img.shields.io/powershellgallery/v/AzureRM.NotificationHubs.svg?style=flat-square&label=AzureRM.NotificationHubs)](https://www.powershellgallery.com/packages/AzureRM.NotificationHubs/) |
 | Operational Insights                  | `AzureRM.OperationalInsights`           | [![Operational Insights](https://img.shields.io/powershellgallery/v/AzureRM.OperationalInsights.svg?style=flat-square&label=AzureRM.OperationalInsights)](https://www.powershellgallery.com/packages/AzureRM.OperationalInsights/) |
+| Policy Insights                       | `AzureRM.PolicyInsights`                | [![Policy Insights](https://img.shields.io/powershellgallery/v/AzureRM.PolicyInsights.svg?style=flat-square&label=AzureRM.PolicyInsights)](https://www.powershellgallery.com/packages/AzureRM.PolicyInsights/) |
 | Power BI Embedded                     | `AzureRM.PowerBIEmbedded`               | [![Power BI Embedded](https://img.shields.io/powershellgallery/v/AzureRM.PowerBIEmbedded.svg?style=flat-square&label=AzureRM.PowerBIEmbedded)](https://www.powershellgallery.com/packages/AzureRM.PowerBIEmbedded/) |
 | Profile                               | `AzureRM.Profile`                       | [![Profile](https://img.shields.io/powershellgallery/v/AzureRM.Profile.svg?style=flat-square&label=AzureRM.Profile)](https://www.powershellgallery.com/packages/AzureRM.Profile/) |
 | Recovery Services                     | `AzureRM.RecoveryServices`              | [![Recovery Services](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.svg?style=flat-square&label=AzureRM.RecoveryServices)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices/) |

documentation/azure-powershell-modules.md

@@ -28,7 +28,6 @@ The Azure PowerShell Developer Guide was created to help with the development an
     - [Enable Running PowerShell when Debugging](#enable-running-powershell-when-debugging)
         - [Importing Modules](#importing-modules)
     - [Adding Help Content](#adding-help-content)
-    - [Updating the Installer](#updating-the-installer)
 - [Adding Tests](#adding-tests)
     - [Using Azure TestFramework](#using-azure-testframework)
     - [Scenario Tests](#scenario-tests)
@@ -55,7 +54,7 @@ The following prerequisites should be completed before contributing to the Azure
 - Install the latest version of [Git](https://git-scm.com/downloads)
 - Install the latest version of [WiX](http://wixtoolset.org/releases/)
     - After installation, ensure that the path to "WiX Toolset\bin" has been added to your `PATH` environment variable
-- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/help-generation.md#installing-platyps)
+- Install the [`platyPS` module](https://github.com/Azure/azure-powershell/blob/preview/documentation/development-docs/help-generation.md#installing-platyps)
 - Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
     - `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`
     - `C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe`
@@ -256,23 +255,6 @@ Each cmdlet has a markdown file that contains the help content that is displayed
 
 For complete documentation, see [`help-generation.md`](./help-generation.md) in the `documentation` folder.
 
-## Updating the Installer
-
-The installer should be updated whenever a library dependency is added/removed from your project module, or file paths are changed.
-
-To regenerate the install wxi file, follow these steps:
-
-- Ensure that the WiX tools bin folder is in your `PATH` environment variable
-- Set the `AzurePSRoot` environment variable to the path of your locally cloned Azure PowerShell repository
-    - `set AzurePSRoot=C:\<PATH_TO_REPO>\azure-powershell`
-- Build the cmdlets
-    - Follow the steps mentioned in [building the environment](#building-the-environment)
-    - This builds both the cmdlets and the installer - if your changes have removed or renamed files previously contained in the installer, the installer build may fail. In this case, you can ignore installer build failures
--  Generate the new wxi file using the `generate.ps1` script
-    - `powershell .\tools\installer\generate.ps1 <BUILD_CONFIG>`
-    - `<BUILD_CONFIG>` is `DEBUG` or `RELEASE`, depending on which build configuration you are using
-- Verify that the changes look correct uses `git diff`. Often times, unintended changes happen if your repository is not clean; if this occurs, revert the changes made to the wxi file, commit all other changes, and use `git clean -xdf` to wipe out all untracked files from your local git repository
-
 # Adding Tests
 
 _Note_: As mentioned in the prerequisites section, set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
@@ -391,7 +373,7 @@ Once all of your cmdlets have been created and the appropriate tests have been a
 ## Publish to PowerShell Gallery
 
 - To publish your module to the [official PowerShell gallery](http://www.powershellgallery.com/), or the test gallery site, contact the Azure PowerShell team
-- To create a signed module package for local usage, use the [powershell-sign](http://azuresdkci.cloudapp.net/view/1-AzurePowerShell/job/powershell-sign/) job on Jenkins
+- To create a signed module package for local usage, use the [ps-sign](https://azuresdkci.westus2.cloudapp.azure.com/job/ps-sign/) job on Jenkins
 
 ## AsJob Parameter
 

documentation/development-docs/azure-powershell-developer-guide.md

@@ -128,9 +128,13 @@ public static class Property
         /// <summary>
         /// Backup login Uri for MSI
         /// </summary>
-        MSILoginUriBackup = "MSILoginBackup";
+        MSILoginUriBackup = "MSILoginBackup",
 
 
+        /// <summary>
+        /// Secret that may be used with MSI login
+        /// </summary>
+        MSILoginSecret = "MSILoginSecret";
         }
     }
 }

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

@@ -17,6 +17,7 @@
 using Microsoft.Rest.Azure;
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 
@@ -72,6 +73,10 @@ public ManagedServiceAccessToken(IAzureAccount account, IAzureEnvironment enviro
             }
 
             _tokenGetter = factory.GetHttpOperations<ManagedServiceTokenInfo>(true).WithHeader("Metadata", new[] { "true" });
+            if (account.IsPropertySet(AzureAccount.Property.MSILoginSecret))
+            {
+                _tokenGetter = _tokenGetter.WithHeader("Secret", new[] { account.GetProperty(AzureAccount.Property.MSILoginSecret) });
+            }
         }
 
         public string AccessToken
@@ -119,11 +124,12 @@ void GetOrRenewAuthentication()
                         RequestUris.Clear();
                         RequestUris.Enqueue(currentRequestUri);
                     }
-                    catch (CloudException) when (RequestUris.Count > 0)
+                    catch (Exception e) when ( (e is CloudException || e is HttpRequestException) && RequestUris.Count > 0)
                     {
-                        // do nothing
+                        // skip to the next uri
                     }
                 }
+
                 SetToken(info);
             }
         }

src/Common/Commands.Common.Authentication/Authentication/ManagedServiceAccessToken.cs

@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.12" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Security.SecureString" Version="4.3.0" />

src/Common/Commands.Common.Authentication/Common.Authentication.Netcore.csproj

@@ -689,6 +689,18 @@ public void RemoveAllSpCredentials(string spObjectId)
             PatchSpPasswordCredentials(spObjectId, passwordCredentials: null);
         }
 
+        public string GetObjectIdFromUPN(string upn)
+        {
+            var odataQueryFilter = new Rest.Azure.OData.ODataQuery<User>(s => s.UserPrincipalName == upn);
+            var user = GraphClient.Users.List(odataQueryFilter.ToString()).SingleOrDefault();
+            if (user == null)
+            {
+                throw new InvalidOperationException(String.Format(ProjectResources.UserWithUPNDoesntExist, upn));
+            }
+
+            return user.ObjectId;
+        }
+
         public string GetObjectIdFromSPN(string spn)
         {
             var odataQueryFilter = new Rest.Azure.OData.ODataQuery<ServicePrincipal>(s => s.ServicePrincipalNames.Contains(spn));

src/Common/Commands.Common.Graph.RBAC/ActiveDirectory/ActiveDirectoryClient.cs

@@ -144,4 +144,7 @@
   <data name="ServicePrincipalWithSPNDoesntExist" xml:space="preserve">
     <value>Service principal with SPN '{0}' does not exist.</value>
   </data>
+  <data name="UserWithUPNDoesntExist" xml:space="preserve">
+    <value>User with UPN '{0}' does not exist.</value>
+  </data>
 </root>

src/Common/Commands.Common.Graph.RBAC/Properties/Resources.Designer.cs

@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.2.12" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="6.5.0-preview" />
-    <PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
   </ItemGroup>
 

src/Common/Commands.Common.Graph.RBAC/Properties/Resources.resx

@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "5.6.0";
+        public const string AssemblyVersion = "5.7.0";
 
-        public const string AssemblyFileVersion = "5.6.0";
+        public const string AssemblyFileVersion = "5.7.0";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/Common/Commands.Common.Storage/Common.Storage.Netcore.csproj

@@ -202,6 +202,18 @@ public static void SafeCopyParameterSet<T>(this T source, T target) where T : Az
             }
         }
 
+        /// <summary>
+        /// Return the value of a paramater, or null if not set
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cmdlet">the executing cmdlet</param>
+        /// <param name="parameterName">The name of the parameter to return</param>
+        /// <returns>true if the parameter was provided by the user, otherwise false</returns>
+        public static bool IsBound(this PSCmdlet cmdlet, string parameterName) 
+        {
+            return cmdlet.MyInvocation.BoundParameters.ContainsKey(parameterName);
+        }
+
         public static string AsAbsoluteLocation(this string realtivePath)
         {
             return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath));

src/Common/Commands.Common/AzurePowerShell.cs

@@ -209,8 +209,6 @@ public static void ValidateInternetConnection()
             {
                 throw new Exception(Resources.NoInternetConnection);
             }
-#else
-			throw new NotSupportedException();			
 #endif
         }