Merge branch 'master' into master

Author: talhers

ChangeLog.md

@@ -1,6 +1,63 @@
+## 1.1.0 - January 2019
+#### Az.Accounts
+* Add 'Local' Scope to Enable-AzureRmAlias
+
+#### Az.Compute
+* Name is now optional in ID parameter set for Restart/Start/Stop/Remove/Set-AzVM and Save-AzVMImage
+* Updated the description of ID in help files
+* Fix backward compatibility issue with Az.Accounts module
+
+#### Az.DataLakeStore
+* Update the sdk version of dataplane to 1.1.14 for SDK fixes.
+    - Fix handling of negative acesstime and modificationtime for getfilestatus and liststatus, Fix async cancellation token
+
+#### Az.EventGrid
+* Updated to use the 2019-01-01 API version.
+* Update the following cmdlets to support new scenario in 2019-01-01 API version
+    - New-AzureRmEventGridSubscription: Add new optional parameters for specifying:
+        - Event Time-To-Live,
+        - Maximum number of delivery attempts for the events,
+        - Dead letter endpoint.
+    - Update-AzureRmEventGridSubscription: Add new optional parameters for specifying:
+        - Event Time-To-Live,
+        - Maximum number of delivery attempts for the events,
+        - Dead letter endpoint.
+* Add new enum values (namely, storageQueue and hybridConnection) for EndpointType option in New-AzureRmEventGridSubscription and Update-AzureRmEventGridSubscription cmdlets.
+* Show warning message if creating or updating the event subscription is expected to entail manual action from user.
+
+#### Az.IotHub
+* Updated to the latest version of the IotHub SDK
+
+#### Az.LogicApp
+* Get-AzLogicApp lists all without specified Name
+
+#### Az.Resources
+* Fix parameter set issue when providing '-ODataQuery' and '-ResourceId' parameters for 'Get-AzResource'
+    - More information here: https://github.com/Azure/azure-powershell/issues/7875
+* Fix handling of the -Custom parameter in New/Set-AzPolicyDefinition
+* Fix typo in New-AzDeployment documentation
+* Made '-MailNickname' parameter mandatory for 'New-AzADUser'
+    - More information here: https://github.com/Azure/azure-powershell/issues/8220
+
+#### Az.SignalR
+* Fix backward compatibility issue with Az.Accounts module
+
+#### Az.Sql
+* Converted the Storage management client dependency to the common SDK implementation.
+
+#### Az.Storage
+* Set the StorageAccountName of Storage context as the real Storage Account Name, when it's created with Sas Token, OAuth or Anonymous
+    - New-AzStorageContext
+* Create Sas Token of Blob Snapshot Object with '-FullUri' parameter, fix the returned Uri to be the sanpshot Uri
+    - New-AzStorageBlobSASToken
+
+#### Az.Websites
+* Fixed a date parsing bug in 'Get-AzDeletedWebApp'
+* Fix backward compatibility issue with Az.Accounts module
+
 ## Version 1.0.0 - December 2018
 
 #### General
 
 * General availability of `Az` module
-* For more information about the `Az` module, please visit the following: https://aka.ms/azps-announce
+* For more information about the `Az` module, please visit the following: https://aka.ms/azps-announce

CodeSign.targets

@@ -19,7 +19,9 @@
     <Message Text="----> Dlls signing section" Importance="high"/>
     <!-- Azure -->
     <ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest' or '$(Scope)' == 'Netcore'">
-      <DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*PowerShell*Cmdlets*.dll" />
+      <DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*PowerShell*Cmdlets*.dll;
+        $(PackageDirectory)\$(Configuration)\Az.Accounts\Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll;
+        $(PackageDirectory)\$(Configuration)\Az.Accounts\Microsoft.Azure.PowerShell.Authentication.dll" />
     </ItemGroup>
 
     <Message Importance="high" Text="$(PackageDirectory)\$(Configuration) does not contains any files to sign. Code sign will skip." Condition="'@(DelaySignedAssembliesToSign)' == ''" />

build.proj

@@ -388,6 +388,7 @@
       </ModuleCsprojFilesRelative>
     </ItemGroup>
     <Exec Command="dotnet sln Azure.PowerShell.sln add @(ModuleCsprojFilesRelative->'%(RelativePath)', ' ')" />
+    <Exec Command="dotnet sln Azure.PowerShell.sln add $(LibraryRoot)tools/ScenarioTest.ResourceManager/ScenarioTest.ResourceManager.csproj $(LibraryRoot)tools/TestFx/TestFx.csproj" />
     <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
     <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
     <Exec Command="dotnet test Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework netcoreapp2.0 --logger trx" />

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

@@ -174,13 +174,13 @@ After the solution file is updated, save and close it. Now, open the solution fi
     <PsModuleName>Cdn</PsModuleName>
   </PropertyGroup>
 ```
-- Remove the entry:
+- **Remove the entry**:
 ```xml
   <PropertyGroup>
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)</RootNamespace>
   </PropertyGroup>
 ```
-This is not needed since this is a new project.
+**Note**: This is not needed since this is a new project and does not use legacy namespace conventions.
 
 - Update this entry to use your SDK:
 ```xml
@@ -244,8 +244,11 @@ Please see our guide on [Using Azure TestFramework](../testing-docs/using-azure-
 
 ### Adding Scenario Tests
 
-- Create a new class in `Commands.<SERVICE>.Test`
-- Create a ps1 file in the same folder that contains the actual tests ([see sample](../../src/Media/Commands.Media.Test/ScenarioTests))
+- Create a new class in `<SERVICE>.Test`
+    - Add `[Fact]` as an attribute to every test
+    - Add `[Trait(Category.AcceptanceType, Category.CheckIn)]` as an attribute to any test that should be run during CI in Playback mode.
+    - Add `[Trait(Category.AcceptanceType, Category.LiveOnly)]` as an attribute to any test that cannot be run in Playback mode (for example, if a test depends on a Dataplane SDK).
+- Create a ps1 file in the same folder that contains the actual tests ([see sample](../../src/Media/Media.Test/ScenarioTests))
     - Use `Assert-AreEqual x y` to verify that values are the same
     - Use `Assert-AreNotEqual x y` to verify that values are not the same
     - Use `Assert-Throws scriptblock message` to verify an exception is being thrown
@@ -256,7 +259,7 @@ Please see our guide on [Using Azure TestFramework](../testing-docs/using-azure-
     - Use `Assert-Null object` to verify that an object is null
     - Use `Assert-NotNull object` to verify that an object is not null
     - Use `Assert-Exists path` to verify that a file exists
-    - Use `Assert-AreEqualArray a1 a2` to verify that arrays are the sam
+    - Use `Assert-AreEqualArray a1 a2` to verify that arrays are the same
 
 ### Using Active Directory
 
@@ -270,14 +273,8 @@ Please see our guide on [Using Azure TestFramework](../testing-docs/using-azure-
 
 ### AD Scenario Tests
 
-Create these environment variables for the AD scenario tests:
+Create this environment variables for the AD scenario tests:
 
-- `AZURE_LIVEID` should be UserId and Password for a valid LiveId account.
-  - `AZURE_LIVEID=UserId=<[email protected]>;Password=<Password>`
-- `AZURE_ORGID_FPO` should be an orgid and password for an account that does not have any subscriptions or role assignments associated with it. It is supposed to be a foreign principal in your current tenant.
-  - `AZURE_ORGID_FPO=UserId=<[email protected]>;Password=<Password>`
--  `AZURE_ORGID_ONE_TENANT_ONE_SUBSCRIPTION` should be an account that is in a single tenant and has access to the subscription managed by that AD tenant.
-  - `AZURE_ORGID_ONE_TENANT_ONE_SUBSCRIPTION=UserId=<[email protected]>;Password=<Password>;SubscriptionId=<SubscriptionId>;AADAuthEndpoint=https://login.windows.net/`
 - `AZURE_SERVICE_PRINCIPAL` should be a service principal - an application defined in the subscription's tenant - that has management access to the subscription (or at least to a resource group in the tenant)
   - `AZURE_SERVICE_PRINCIPAL=UserId=<UserGuid>;Password=<Password>;AADTenant=<TenantGuid>;SubscriptionId=<SubscriptionId>`
 
@@ -287,7 +284,7 @@ Create these environment variables for the AD scenario tests:
 - Run the test in Visual Studio in the Test Explorer window and make sure you got a generated JSON file that matches the test name in the bin folder under the `SessionRecords` folder
 - Copy this `SessionRecords` folder and place it inside the test project
   - Inside Visual Studio, add all of the generated JSON files, making sure to change the "Copy to Output Directory" property for each one to "Copy if newer"
-  -  Make sure that all of these JSON files appear in your `Commands.<SERVICE>.Test.csproj` file
+  -  Make sure that all of these JSON files appear in your `<SERVICE>.Test.csproj` file
 
 # After Development
 

setup/azurecmd.wxs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
   <Product Id="*"
            Name="$(var.productName)"

src/Accounts/Accounts.Test/Accounts.Test.csproj

@@ -12,6 +12,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Accounts\Accounts.csproj" />
+    <ProjectReference Include="..\Authentication.ResourceManager\Authentication.ResourceManager.csproj" />
+    <ProjectReference Include="..\Authentication\Authentication.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Accounts/Accounts.Test/ArgumentCompleterTests.cs

@@ -25,21 +25,21 @@ public ArgumentCompleterTests(ITestOutputHelper output)
         {
         }
 
-        [Fact(Skip = "Failure needs investigated. Not returning list of locations.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestLocationCompleter()
         {
             TestRunner.RunTestScript("Test-LocationCompleter");
         }
 
-        [Fact(Skip = "Failure needs investigated. Cannot bind argument to parameter 'DifferenceObject' because it is null.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResourceGroupCompleter()
         {
             TestRunner.RunTestScript("Test-ResourceGroupCompleter");
         }
 
-        [Fact(Skip = "AzureRM.Resources.ps1 needs Get-AzureRmResource to be implemented")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestResourceIdCompleter()
         {

src/Accounts/Accounts.Test/ArgumentCompleterTests.ps1

@@ -18,14 +18,9 @@ Tests location completer
 #>
 function Test-LocationCompleter
 {
-	$filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.PowerShell.ResourceManager.dll"
-    if (!(Test-Path $filePath)) {
-        $filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.Commands.ResourceManager.Common.dll"
-    }
-	$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
 	$resourceTypes = @("Microsoft.Batch/operations")
 	$locations = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.LocationCompleterAttribute]::FindLocations($resourceTypes, -1)
-	$expectedResourceType = Get-AzureRmResourceProvider -ProviderNamespace "Microsoft.Batch" | Where-Object {$_.ResourceTypes.ResourceTypeName -eq "operations"}
+	$expectedResourceType = (Get-AzResourceProvider -ProviderNamespace "Microsoft.Batch").ResourceTypes | Where-Object {$_.ResourceType -eq "operations"}
 	$expectedLocations = $expectedResourceType.Locations | ForEach-Object {"`'" + $_ + "`'"}
 	Assert-AreEqualArray $locations $expectedLocations
 }
@@ -37,13 +32,8 @@ Tests resource group completer
 #>
 function Test-ResourceGroupCompleter
 {
-	$filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.PowerShell.ResourceManager.dll"
-    if (!(Test-Path $filePath)) {
-        $filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.Commands.ResourceManager.Common.dll"
-    }
-	$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
 	$resourceGroups = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceGroupCompleterAttribute]::GetResourceGroups(-1)
-	$expectResourceGroups = Get-AzureRmResourceGroup | ForEach-Object {$_.ResourceGroupName}
+	$expectResourceGroups = Get-AzResourceGroup | ForEach-Object {$_.Name}
 	Assert-AreEqualArray $resourceGroups $expectResourceGroups
 }
 
@@ -53,13 +43,8 @@ Tests resource id completer
 #>
 function Test-ResourceIdCompleter
 {
-    $filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.PowerShell.ResourceManager.dll"
-    if (!(Test-Path $filePath)) {
-        $filePath = Join-Path -Path $PSScriptRoot -ChildPath "\Microsoft.Azure.Commands.ResourceManager.Common.dll"
-    }
-    [System.Reflection.Assembly]::LoadFrom($filePath)
     $resourceType = "Microsoft.Storage/storageAccounts"
-    $expectResourceIds = Get-AzureRmResource -ResourceType  $resourceType | ForEach-Object {$_.Id}
+    $expectResourceIds = Get-AzResource -ResourceType $resourceType | ForEach-Object {$_.Id}
     # take data from Azure and put to cache
     $resourceIds = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceIdCompleterAttribute]::GetResourceIds($resourceType)
     Assert-AreEqualArray $resourceIds $expectResourceIds
@@ -71,4 +56,4 @@ function Test-ResourceIdCompleter
     # take data from Azure again and put to cache
     $resourceIds = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceIdCompleterAttribute]::GetResourceIds($resourceType)
     Assert-AreEqualArray $resourceIds $expectResourceIds
-}
+}

src/Network/Network.Test/ScenarioTests/ExpressRouteCrossConnectionTests.cs renamed to src/Accounts/Accounts.Test/AzureRmAliasTests.cs

@@ -12,29 +12,24 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace Commands.Network.Test.ScenarioTests
+namespace Microsoft.Azure.Commands.Profile.Test
 {
-    public class ExpressRouteCrossConnectionTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
+    public class AzureRmAliasTests : AccountsTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ExpressRouteCrossConnectionTests(ITestOutputHelper output)
+        public AzureRmAliasTests(ITestOutputHelper output)
+            : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        [Trait(Category.Owner, NrpTeamAlias.pgtm)]
-        public void TestExpressRouteCrossConnectionApis()
+        public void AzureRmAliasCRUD()
         {
-            NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCrossConnectionApis");
+            TestRunner.RunTestScript("Test-AzureRmAlias");
         }
     }
 }

src/Accounts/Accounts.Test/AzureRmAliasTests.ps1

@@ -0,0 +1,60 @@
+# ----------------------------------------------------------------------------------
+#
+# 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
+Tests Enable-AzureRmAlias and Disable-AzureRmAlias
+#>
+function Test-AzureRmAlias
+{
+	Disable-AzureRmAlias
+	Assert-Throws { Get-AzureRmSubscription }
+	Enable-AzureRmAlias
+	Get-AzureRmSubscription
+
+	Disable-AzureRmAlias -Scope "Process" -Module Az.Accounts
+	Assert-Throws { Get-AzureRmSubscription }
+	Enable-AzureRmAlias -Module Az.Compute, Az.Resources
+	Assert-Throws { Get-AzureRmSubscription }
+	Enable-AzureRmAlias -Scope "Process" -Module Az.Accounts
+	Get-AzureRmSubscription
+
+	$PROFILE = New-Object PSObject -Property @{
+		CurrentUserAllHosts = Join-Path $PSScriptRoot "CurrentUserProfile.ps1"; 
+		AllUsersAllHosts = Join-Path $PSScriptRoot "AllUsersProfile.ps1"
+	}
+
+	Disable-AzureRmAlias
+	Assert-Throws { Get-AzureRmSubscription }
+	Enable-AzureRmAlias -Scope "CurrentUser" -Module Az.Accounts
+	Get-AzureRmSubscription
+	$azureSession = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance
+	$file = $azureSession.DataStore.ReadFileAsText($PROFILE.CurrentUserAllHosts)
+	
+	$expected = 
+"*#Begin Azure PowerShell alias import*Import-Module Az.Accounts -ErrorAction SilentlyContinue -ErrorVariable importError"+
+"*if (`$importerror.Count -eq 0) { *    Enable-AzureRmAlias -Module Az.Accounts -ErrorAction SilentlyContinue; *}*#End Azure PowerShell alias import"
+	
+	if ($file -notlike $expected)
+	{
+		throw "Incorrect string written to file."
+	}
+
+	Enable-AzureRmAlias -Scope "LocalMachine" -Module Az.Accounts
+	$file = $azureSession.DataStore.ReadFileAsText($PROFILE.AllUsersAllHosts)
+	if ($file -notlike $expected)
+	{
+		throw "Incorrect string written to file."
+	}
+}