Merge remote-tracking branch 'refs/remotes/Azure/preview' into feature/updates4aug

Author: Dragos Avadanei

setup/azurecmdfiles.wxi

@@ -2228,6 +2228,9 @@
                         <Component Id="cmp1460DC2324E946B9F5F76360ED57C0FE" Guid="*">
                             <File Id="fil63597DE31C6B3211017C4B4EAD93F683" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
                         </Component>
+                        <Component Id="cmp95697C7A2E29A43F7195D799D68E138B" Guid="*">
+                            <File Id="fil53FA53B6DEFBC23592C3C2A82969E769" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
+                        </Component>
                         <Component Id="cmp3BEF3C9459257F053CAAC956B7CFA10D" Guid="*">
                             <File Id="fil830F7BE66C1E1324FCE632956432C2C7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
                         </Component>
@@ -6063,6 +6066,7 @@
             <ComponentRef Id="cmpE2AF801EDF4F7F1C347F9D7052313074" />
             <ComponentRef Id="cmp6004E0F8B6FA21BF5CAE3CFCA2CA9E67" />
             <ComponentRef Id="cmp1460DC2324E946B9F5F76360ED57C0FE" />
+            <ComponentRef Id="cmp95697C7A2E29A43F7195D799D68E138B" />
             <ComponentRef Id="cmp3BEF3C9459257F053CAAC956B7CFA10D" />
             <ComponentRef Id="cmpB7D392D58F12D947C1D915326ABA98EA" />
             <ComponentRef Id="cmp61D87C757ACDE206CC79A5B19CE403B2" />

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -311,11 +311,19 @@ protected override void Dispose(bool disposing)
         protected override void BeginProcessing()
         {
             AzureSession.Instance.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
-            AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
-                () => new ResourceManagementClient(
-                    DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                    AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager)),
-                s => DebugMessages.Enqueue(s)));
+            if (DefaultContext != null && DefaultContext.Subscription != null)
+            {
+                AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
+                    () =>
+                    {
+                        var client = new ResourceManagementClient(
+                            DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
+                            AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager));
+                        client.SubscriptionId = DefaultContext.Subscription.Id;
+                        return client;
+                    },
+                    s => DebugMessages.Enqueue(s)));
+            }
 
             base.BeginProcessing();
         }

src/ResourceManager/Common/Commands.ResourceManager.Common/Utilities/ResourceManagementClientExtensions.cs

@@ -56,6 +56,12 @@ public static List<GenericResource> FilterResources(this IResourceManagementClie
                 }
             }
 
+            foreach (var resource in resources)
+            {
+                var identifier = new ResourceIdentifier(resource.Id);
+                resource.ResourceGroupName = identifier.ResourceGroupName;
+            }
+
             return resources;
         }
     }

src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs

@@ -532,7 +532,7 @@ public static string GetConfigValueFromPrivateConfig(string configurationPath, s
         /// 1. The one get from StorageContext parameter
         /// 2. The one parsed from the diagnostics configuration file
         /// </summary>
-        public static string InitializeStorageAccountName(AzureStorageContext storageContext = null, string configurationPath = null)
+        public static string InitializeStorageAccountName(IStorageContext storageContext = null, string configurationPath = null)
         {
             string storageAccountName = null;
             var configFileType = GetConfigFileType(configurationPath);
@@ -594,7 +594,7 @@ public static string InitializeStorageAccountKey(IStorageManagementClient storag
         /// 4. The one get from current Azure Environment
         /// </summary>
         public static string InitializeStorageAccountEndpoint(string storageAccountName, string storageAccountKey, IStorageManagementClient storageClient,
-            AzureStorageContext storageContext = null, string configurationPath = null, IAzureContext defaultContext = null)
+            IStorageContext storageContext = null, string configurationPath = null, IAzureContext defaultContext = null)
         {
             string storageAccountEndpoint = null;
             StorageAccount storageAccount = null;
@@ -653,7 +653,7 @@ private static AzureStorageContext CreateStorageContext(Uri blobEndpoint, Uri qu
             return new AzureStorageContext(cloudStorageAccount);
         }
 
-        private static string GetEndpointFromStorageContext(AzureStorageContext context)
+        private static string GetEndpointFromStorageContext(IStorageContext context)
         {
             var scheme = context.BlobEndPoint.StartsWith("https://", StringComparison.OrdinalIgnoreCase) ? "https://" : "http://";
             return scheme + context.EndPointSuffix;

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/SetAzureRmVMDiagnosticsExtension.cs

@@ -98,7 +98,7 @@ public string DiagnosticsConfigurationPath
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The storage connection context.")]
         [ValidateNotNullOrEmpty]
-        public AzureStorageContext StorageContext { get; set; }
+        public IStorageContext StorageContext { get; set; }
 
         [Parameter(
             Mandatory = false,

src/ResourceManager/Compute/Commands.Compute/Extension/SqlServer/NewAzureVMSqlServerAutoBackupConfig.cs

@@ -87,7 +87,7 @@ public class NewAzureVMSqlServerAutoBackupConfigCommand : AzureRMCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The storage connection context")]
         [ValidateNotNullOrEmpty]
-        public AzureStorageContext StorageContext
+        public IStorageContext StorageContext
         {
             get;
             set;

src/ResourceManager/DataLakeStore/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix for issue: https://github.com/Azure/azure-powershell/issues/4323
 
 ## Version 4.2.1
 

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreClient.cs

@@ -114,12 +114,6 @@ public DataLakeStoreAccount CreateAccount(
 
             var toReturn = _client.Account.Create(resourceGroupName, accountName, parameters);
 
-            // enable the key vault for the user so they don't have to run an additional command.
-            if (encryptionType.HasValue && encryptionType.Value == EncryptionConfigType.UserManaged)
-            {
-                this.EnableKeyVault(resourceGroupName, accountName);
-            }
-
             return toReturn;
         }
 
@@ -158,12 +152,6 @@ public DataLakeStoreAccount UpdateAccount(
 
             var toReturn = _client.Account.Update(resourceGroupName, accountName, parameters);
 
-            // auto enable the key vault for the user if they updated it.
-            if (userConfig != null)
-            {
-                this.EnableKeyVault(resourceGroupName, accountName);
-            }
-
             return toReturn;
         }
 

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -300,8 +300,7 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'Get-AzureRmVirtualNetworkGatewayAdvertisedRoute', 
                'Get-AzureRmVirtualNetworkGatewayLearnedRoute', 
                'Get-AzureRmNetworkUsage',
-               'Get-AzureRmVirtualNetworkUsageList',
-               'Get-AzureRmVirtualNetworkPrivateAccessService'
+               'Get-AzureRmVirtualNetworkUsageList'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Network/ChangeLog.md

@@ -24,13 +24,10 @@
 	- PeerAddressType
 * Remove-AzureRmExpressRouteCircuitPeeringConfig: Added IPv6 support. New optional parameter added
 	- PeerAddressType
-
-* Added support for private access services to Virtual Network Subnets
-    - Updated Add-AzureRmVirtualSubnetConfig: Added optional parameter -PrivateAccessService
-    - Updated New-AzureRmVirtualSubnetConfig: Added optional parameter -PrivateAccessService
-    - Updated Set-AzureRmVirtualSubnetConfig: Added optional parameter -PrivateAccessService
-* Added cmdlet to list private access services available in the location
-    - Get-AzureRmVirtualNetworkPrivateAccessService
+* Marked parameter -ProbeEnabled as obsolete
+    - Add-AzureRmApplicationGatewayBackendHttpSettings
+    - New-AzureRmApplicationGatewayBackendHttpSettings
+    - Set-AzureRmApplicationGatewayBackendHttpSettings 
 
 ## Version 4.2.1
 

src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

@@ -179,7 +179,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="NetworkResourcesController.cs" />
     <Compile Include="ScenarioTests\ApplicationGatewayTests.cs" />
-    <Compile Include="ScenarioTests\AvailablePrivateAccessServiceTests.cs" />
     <Compile Include="ScenarioTests\MultiIpConfigOnNicTests.cs" />
     <Compile Include="ScenarioTests\ExpressRouteServiceProviderTests.cs" />
     <Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
@@ -211,9 +210,6 @@
     <None Include="ScenarioTests\ApplicationGatewayTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ScenarioTests\AvailablePrivateAccessServiceTests.ps1">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="ScenarioTests\Data\ApplicationGatewayAuthCert.cer">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -280,9 +276,6 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestAvailableWafRuleSets.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.AvailablePrivateAccessServiceTests\TestAvailablePrivateAccessServicesList.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteBgpServiceCommunitiesGet.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -517,9 +510,6 @@
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkSubnetCRUD.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkSubnetPrivateAccess.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkUsage.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -563,4 +553,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ApplicationGatewayTests.ps1

@@ -87,7 +87,8 @@ function Test-ApplicationGatewayCRUD
 	$nic01Name = Get-ResourceName
 	$nic02Name = Get-ResourceName
 	$authCertName = Get-ResourceName
-	$probeHttpsName = Get-ResourceName
+	$probe01Name = Get-ResourceName
+	$probe02Name = Get-ResourceName
 
 	try 
 	{
@@ -104,7 +105,6 @@ function Test-ApplicationGatewayCRUD
 
 		# Create public ip
 		$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic
-		#$publicip = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName 
 
 		# create 2 nics to add to backend
 		$nic01 = New-AzureRmNetworkInterface -Name $nic01Name -ResourceGroupName $rgname -Location $location -Subnet $nicSubnet
@@ -125,18 +125,33 @@ function Test-ApplicationGatewayCRUD
 
 		$authCertFilePath = $basedir + "\ScenarioTests\Data\ApplicationGatewayAuthCert.cer"
 		$authcert01 = New-AzureRmApplicationGatewayAuthenticationCertificate -Name $authCertName -CertificateFile $authCertFilePath
-		$probeHttps = New-AzureRmApplicationGatewayProbeConfig -Name $probeHttpsName -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8
+		
+		# Create match with undefined statuscode list
+		$match1 = New-AzureRmApplicationGatewayProbeHealthResponseMatch -Body "helloworld"
+		Assert-Null $match1.StatusCodes
+		
+		$probe01 = New-AzureRmApplicationGatewayProbeConfig -Name $probe01Name -Match $match1 -Protocol Http -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8
 
 		$connectionDraining01 = New-AzureRmApplicationGatewayConnectionDraining -Enabled $True -DrainTimeoutInSec 42
-		$poolSetting01 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting01Name -Port 80 -Protocol Http -CookieBasedAffinity Disabled -ConnectionDraining $connectionDraining01
+		$poolSetting01 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting01Name -Port 80 -Protocol Http -Probe $probe01 -CookieBasedAffinity Disabled -ConnectionDraining $connectionDraining01
 		Assert-NotNull $poolSetting01.connectionDraining
 		Assert-AreEqual $True $poolSetting01.connectionDraining.Enabled
 		Assert-AreEqual 42 $poolSetting01.connectionDraining.DrainTimeoutInSec
+		Assert-NotNull $poolSetting01.Probe
 
-		$poolSetting02 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting02Name -Port 443 -Protocol Https -Probe $probeHttps -CookieBasedAffinity Enabled -AuthenticationCertificates $authcert01
+		# Create match with empty statuscode list
+		$match2 = New-AzureRmApplicationGatewayProbeHealthResponseMatch -Body "helloworld" -StatusCode "200"
+		Assert-NotNull $match2.StatusCodes
+		$match2.StatusCodes.RemoveAt(0)
+		Assert-AreEqual 0 $match2.StatusCodes.Count
+
+		$probe02 = New-AzureRmApplicationGatewayProbeConfig -Name $probe02Name -Match $match2 -Protocol Https -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8
+
+		$poolSetting02 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting02Name -Probe $probe02 -Port 443 -Protocol Https -CookieBasedAffinity Enabled -AuthenticationCertificates $authcert01
 		Assert-Null $poolSetting02.connectionDraining
+		Assert-NotNull $poolSetting02.Probe
 
-		#Test setting and removing connectiondraining
+		# Test setting and removing connectiondraining
 		Set-AzureRmApplicationGatewayConnectionDraining -BackendHttpSettings $poolSetting02 -Enabled $False -DrainTimeoutInSec 3600
 		$connectionDraining02 = Get-AzureRmApplicationGatewayConnectionDraining -BackendHttpSettings $poolSetting02
 		Assert-NotNull $connectionDraining02
@@ -160,7 +175,7 @@ function Test-ApplicationGatewayCRUD
 		$firewallConfig = New-AzureRmApplicationGatewayWebApplicationFirewallConfiguration -Enabled $true -FirewallMode Prevention -RuleSetType "OWASP" -RuleSetVersion "2.2.9" -DisabledRuleGroups $disabledRuleGroup1,$disabledRuleGroup2
 
 		# Create Application Gateway
-		$appgw = New-AzureRmApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Location $location -Probes $probeHttps -BackendAddressPools $pool, $nicPool -BackendHttpSettingsCollection $poolSetting01,$poolSetting02 -FrontendIpConfigurations $fipconfig01, $fipconfig02  -GatewayIpConfigurations $gipconfig -FrontendPorts $fp01, $fp02 -HttpListeners $listener01, $listener02 -RequestRoutingRules $rule01, $rule02 -Sku $sku -SslPolicy $sslPolicy -AuthenticationCertificates $authcert01 -WebApplicationFirewallConfiguration $firewallConfig
+		$appgw = New-AzureRmApplicationGateway -Name $appgwName -ResourceGroupName $rgname -Location $location -Probes $probe01, $probe02 -BackendAddressPools $pool, $nicPool -BackendHttpSettingsCollection $poolSetting01,$poolSetting02 -FrontendIpConfigurations $fipconfig01, $fipconfig02  -GatewayIpConfigurations $gipconfig -FrontendPorts $fp01, $fp02 -HttpListeners $listener01, $listener02 -RequestRoutingRules $rule01, $rule02 -Sku $sku -SslPolicy $sslPolicy -AuthenticationCertificates $authcert01 -WebApplicationFirewallConfiguration $firewallConfig
 
 		# Get Application Gateway
 		$getgw = Get-AzureRmApplicationGateway -Name $appgwName -ResourceGroupName $rgname
@@ -170,6 +185,21 @@ function Test-ApplicationGatewayCRUD
 		Compare-ConnectionDraining $poolSetting02 $getgw.BackendHttpSettingsCollection[1]
 		Compare-WebApplicationFirewallConfiguration $firewallConfig $getgw.WebApplicationFirewallConfiguration
 
+		# Check probes
+		Assert-NotNull $getgw.Probes
+		Assert-AreEqual 2 $getgw.Probes.Count
+
+		# Check that statuscode of probe[0] is still null
+		Assert-NotNull $getgw.Probes[0]
+		Assert-NotNull $getgw.Probes[0].Match
+		Assert-Null $getgw.Probes[0].Match.StatusCodes
+
+		# Check that statuscode of probe[1] is still an emtpy list
+		Assert-NotNull $getgw.Probes[1]
+		Assert-NotNull $getgw.Probes[1].Match
+		Assert-NotNull $getgw.Probes[1].Match.StatusCodes
+		Assert-AreEqual 0 $getgw.Probes[1].Match.StatusCodes.Count
+
 		# Get Application Gateway backend health with expanded resource
 		$backendHealth = Get-AzureRmApplicationGatewayBackendHealth -Name $appgwName -ResourceGroupName $rgname -ExpandResource "backendhealth/applicationgatewayresource"
 		Assert-NotNull $backendHealth.BackendAddressPools[0].BackendAddressPool.Name
@@ -357,7 +387,7 @@ function Test-ApplicationGatewayCRUD2
 		$pool = New-AzureRmApplicationGatewayBackendAddressPool -Name $poolName -BackendIPAddresses www.microsoft.com, www.bing.com
 		$match = New-AzureRmApplicationGatewayProbeHealthResponseMatch -Body "helloworld" -StatusCode "200-300","404"
 		$probeHttp = New-AzureRmApplicationGatewayProbeConfig -Name $probeHttpName -Protocol Http -HostName "probe.com" -Path "/path/path.htm" -Interval 89 -Timeout 88 -UnhealthyThreshold 8 -Match $match
-		$poolSetting01 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting01Name -Port 80 -Protocol Http -Probe $probeHttp -CookieBasedAffinity Enabled -ProbeEnabled -PickHostNameFromBackendAddress
+		$poolSetting01 = New-AzureRmApplicationGatewayBackendHttpSettings -Name $poolSetting01Name -Port 80 -Protocol Http -Probe $probeHttp -CookieBasedAffinity Enabled -PickHostNameFromBackendAddress
 
 		# rule part
 		$redirect01 = New-AzureRmApplicationGatewayRedirectConfiguration -Name $redirect01Name -RedirectType Permanent -TargetListener $listener01