Merge branch 'master' into tc-core-automation

Author: vladimir-shcherbakov

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
 

documentation/testing-docs/using-azure-test-framework.md

@@ -6,10 +6,8 @@
 	- [New-TestCredential](#new-testcredential)
 		- [Create New Service Principal](#create-new-service-principal)
 		- [Use Existing Service Principal](#use-existing-service-principal)
-		- [UserId](#userid)
 	- [Set-TestEnvironment](#set-testenvironment)
 		- [Existing Service Principal](#existing-service-principal)
-		- [UserId](#userid)
 	- [Manually Set Environment Variables](#manually-set-environment-variables)
 		- [Environment Variables](#environment-variables)
 		- [Playback Test](#playback-test)
@@ -51,11 +49,11 @@ This cmdlet, located in the [`Repo-Tasks` module](/tools/Repo-Tasks.psd1), which
 Using a service principal is the preferred option for recording tests because it works with both .NET Framework and .NET Core.  In order to create a new service principal, run this command with an unused service principal display name:
 
 ```powershell
-New-TestCredential -ServicePrincipalDisplayName "ScenarioTestCredentials" -ServicePrincipalSecret `
-"testpassword" -SubscriptionId <subscriptionId> -TenantId <tenantId> -RecordMode "Record"
+New-TestCredential -ServicePrincipalDisplayName "ScenarioTestCredentials" -SubscriptionId `
+<subscriptionId> -TenantId <tenantId> -RecordMode "Record"
 ```
 
-This command will create a new service principal, set the correct role assignment for this service principal based upon the subscription provided, and place the service principal id and secret into the credentials file.
+This command will create a new service principal, set the correct role assignment for this service principal based upon the subscription provided, and place the service principal id and automatically generated secret into the credentials file.
 
 Alternatively, to create a service principal, follow the [Azure AD guide to create a Application Service Principal](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal#create-an-active-directory-application). The application type should be `Web app / API` and the sign-on URL value is irrelevant (you can set any value).
 
@@ -68,15 +66,6 @@ New-TestCredential -ServicePrincipalDisplayName "Existing Service Principal" -Se
 "testpassword" -SubscriptionId <subscriptionId> -TenantId <tenantId> -RecordMode "Record"
 ```
 
-#### UserId
-
-This is no longer the preferred option because it only works when running on .NET Framework. When running on .NET Core you may get an error like `Interactive Login is supported only in NET45 projects`.  Additionally, you will have to manually log in when running the scenario tests rather than being automatically validated.
-
-```powershell
-New-TestCredential -UserId "[email protected]" -SubscriptionId <subscriptionId> `
--TenantId <tenantId> -RecordMode "Record"
-```
-
 ### Set-TestEnvironment
 
 This cmdlet, located in the [`Repo-Tasks` module](/tools/Repo-Tasks.psd1), will directly set the environment variable for the session.
@@ -90,15 +79,6 @@ Set-TestEnvironment -ServicePrincipalId <servicePrincipalId> -ServicePrincipalSe
 "testpassword" -SubscriptionId <subscriptionId> -TenantId <tenantId> -RecordMode "Record"
 ```
 
-#### UserId
-
-This is no longer the preferred option because it only works when running on .NET Framework. When running on .NET Core you may get an error like `Interactive Login is supported only in NET45 projects`.
-
-```powershell
-Set-TestEnvironment -UserId "[email protected]" -SubscriptionId <subscriptionId> `
--TenantId <tenantId> -RecordMode "Record"
-```
-
 ### Manually Set Environment Variables
 
 #### Environment Variables
@@ -118,21 +98,8 @@ TEST_CSM_ORGID_AUTHENTICATION=
 AZURE_TEST_MODE=Playback
 ```
 
-#### Record Test with Interactive login using OrgId
-
-This is no longer the preferred option because it only works when running on .NET Framework. When running on .NET Core you may get an error like `Interactive Login is supported only in NET45 projects`.
-
-To use this option, set the following environment variables before starting Visual Studio:
-
-```
-TEST_CSM_ORGID_AUTHENTICATION=SubscriptionId={SubId};UserId={orgId};AADTenant={tenantId};Environment={env};HttpRecorderMode=Record;
-AZURE_TEST_MODE=Record
-```
-
 #### Record Test with service principal
 
-This is the preferred option for recording tests because it works with both .NET Framework and .NET Core.
-
 After the service principal is created, you will need to give it access to Azure resources. This can be done with the following PowerShell command, with the [Service Principal Application ID](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal#get-application-id-and-authentication-key) (this is a guid, not the display name of the service principal) substituted in for `{clientId}`.
 
 ```powershell

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");
         }
     }
 }