Merge branch 'release-2018-12-18' into fix-mds

Author: markcowl

src/ResourceManager/Network/Commands.Network/ApplicationGateway/NewAzureApplicationGatewayCommand.cs

@@ -12,7 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using AutoMapper;
 using Microsoft.Azure.Commands.Network.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
@@ -183,6 +182,15 @@ public class NewAzureApplicationGatewayCommand : ApplicationGatewayBaseCmdlet
             HelpMessage = "A hashtable which represents resource tags.")]
         public Hashtable Tag { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "ResourceId of the user assigned identity to be assigned to Application Gateway.")]
+        [ValidateNotNullOrEmpty]
+        [Alias("UserAssignedIdentity")]
+        public string UserAssignedIdentityId { get; set; }
+
+
         [Parameter(
             Mandatory = false,
             HelpMessage = "Do not ask for confirmation if you want to overrite a resource")]
@@ -322,6 +330,18 @@ private PSApplicationGateway CreateApplicationGateway()
                 applicationGateway.Zones = this.Zone?.ToList();
             }
 
+            if (this.UserAssignedIdentityId != null)
+            {
+                applicationGateway.Identity = new PSManagedServiceIdentity
+                {
+                    Type = MNM.ResourceIdentityType.UserAssigned,
+                    UserAssignedIdentities = new Dictionary<string, PSManagedServiceIdentityUserAssignedIdentitiesValue>
+                    {
+                        { this.UserAssignedIdentityId, new PSManagedServiceIdentityUserAssignedIdentitiesValue() }
+                    }
+                };
+            }
+
             if (this.CustomErrorConfiguration != null)
             {
                 applicationGateway.CustomErrorConfigurations = this.CustomErrorConfiguration?.ToList();

src/ResourceManager/Network/Commands.Network/ApplicationGateway/SslCertificate/AzureApplicationGatewaySslCertificateBase.cs

@@ -29,24 +29,36 @@ public class AzureApplicationGatewaySslCertificateBase : NetworkBaseCmdlet
         public string Name { get; set; }
 
         [Parameter(
-               Mandatory = true,
+               Mandatory = false,
                HelpMessage = "Path of certificate PFX file")]
         [ValidateNotNullOrEmpty]
         public string CertificateFile { get; set; }
 
         [Parameter(
-               Mandatory = true,
+               Mandatory = false,
                HelpMessage = "Certificate password")]
         [ValidateNotNullOrEmpty]
         public SecureString Password { get; set; }
 
+        [Parameter(
+               Mandatory = false,
+               HelpMessage = "SecretId (uri) of the KeyVault Secret. Use this option when a specific version of secret needs to be used.")]
+        [ValidateNotNullOrEmpty]
+        public string KeyVaultSecretId { get; set; }
+
         public PSApplicationGatewaySslCertificate NewObject()
         {
             var sslCertificate = new PSApplicationGatewaySslCertificate();
 
             sslCertificate.Name = this.Name;
-            sslCertificate.Data = Convert.ToBase64String(File.ReadAllBytes(this.CertificateFile));
-            sslCertificate.Password = this.Password;
+            if (this.CertificateFile != null)
+            {
+                sslCertificate.Data = Convert.ToBase64String(File.ReadAllBytes(this.CertificateFile));
+                sslCertificate.Password = this.Password;
+            }
+
+            sslCertificate.KeyVaultSecretId = this.KeyVaultSecretId;
+
             sslCertificate.Id =
                 ApplicationGatewayChildResourceHelper.GetResourceNotSetId(
                     this.NetworkClient.NetworkManagementClient.SubscriptionId,

src/ResourceManager/Network/Commands.Network/ChangeLog.md

@@ -40,4 +40,10 @@
         - New-AzureRmApplicationGatewayUrlPathMapConfig
 * Removed deprecated -ResourceId parameter from Get-AzServiceEndpointPolicyDefinition
 * Removed deprecated EnableVmProtection property from PSVirtualNetwork
-* Removed deprecated Set-AzVirtualNetworkGatewayVpnClientConfig cmdlet
+* Removed deprecated Set-AzVirtualNetworkGatewayVpnClientConfig cmdlet
+* Added KeyVault Support to Application Gateway using Identity.
+    - Cmdlets updated with optonal parameter -KeyVaultSecretId, -KeyVaultSecret
+        - Add-AzApplicationGatewaySslCertificate
+        - New-AzApplicationGatewaySslCertificate
+        - Set-AzApplicationGatewaySslCertificate
+    - New-AzApplicationGateway cmdlet updated with optional parameter -UserAssignedIdentityId, -UserAssignedIdentity

src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj

@@ -68,4 +68,4 @@
   <ItemGroup>
     <Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-</Project>
+</Project>

src/ResourceManager/Network/Commands.Network/Common/NetworkResourceManagerProfile.cs

@@ -56,6 +56,12 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSResourceId, MNM.SubResource>();
                 cfg.CreateMap<MNM.SubResource, CNM.PSResourceId>();
 
+                // Managed Service Identity
+                cfg.CreateMap<CNM.PSManagedServiceIdentity, MNM.ManagedServiceIdentity>();
+                cfg.CreateMap<MNM.ManagedServiceIdentity, CNM.PSManagedServiceIdentity>();
+                cfg.CreateMap<CNM.PSManagedServiceIdentityUserAssignedIdentitiesValue, MNM.ManagedServiceIdentityUserAssignedIdentitiesValue>();
+                cfg.CreateMap<MNM.ManagedServiceIdentityUserAssignedIdentitiesValue, CNM.PSManagedServiceIdentityUserAssignedIdentitiesValue>();
+
                 // Route Filter 
                 cfg.CreateMap<CNM.PSRouteFilter, MNM.RouteFilter>();
                 cfg.CreateMap<MNM.RouteFilter, CNM.PSRouteFilter>();

src/ResourceManager/Network/Commands.Network/Models/PSApplicationGateway.cs

@@ -75,6 +75,9 @@ public class PSApplicationGateway : PSTopLevelResource
         [Ps1Xml(Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }
 
+        [Ps1Xml(Target = ViewControl.Table)]
+        public PSManagedServiceIdentity Identity { get; set; }
+
         [JsonIgnore]
         public string GatewayIpConfigurationsText
         {

src/ResourceManager/Network/Commands.Network/Models/PSApplicationGatewaySslCertificate.cs

@@ -23,6 +23,7 @@ public class PSApplicationGatewaySslCertificate : PSChildResource
         public string Data { get; set; }
         public SecureString Password { get; set; }
         public string PublicCertData { get; set; }
+        public string KeyVaultSecretId { get; set; }
         [Ps1Xml(Target = ViewControl.Table)]
         public string ProvisioningState { get; set; }
         public string Type { get; set; }

src/ResourceManager/Network/Commands.Network/Models/PSManagedServiceIdentity.cs

@@ -0,0 +1,33 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// 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.
+//
+
+using Microsoft.Azure.Management.Network.Models;
+using Microsoft.WindowsAzure.Commands.Common.Attributes;
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSManagedServiceIdentity
+    {
+        [Ps1Xml(Target = ViewControl.Table)]
+        public ResourceIdentityType? Type { get; set; }
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string PrincipalId { get; set; }
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string TenantId { get; set; }
+        [Ps1Xml(Target = ViewControl.Table)]
+        public Dictionary<string, PSManagedServiceIdentityUserAssignedIdentitiesValue> UserAssignedIdentities { get; set; }
+    }
+}

src/ResourceManager/Network/Commands.Network/Models/PSManagedServiceIdentityUserAssignedIdentitiesValue.cs

@@ -0,0 +1,27 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// 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.
+//
+
+using Microsoft.WindowsAzure.Commands.Common.Attributes;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSManagedServiceIdentityUserAssignedIdentitiesValue
+    {
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string PrincipalId { get; set; }
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string ClientId { get; set; }
+    }
+}

src/ResourceManager/Network/Commands.Network/help/Add-AzApplicationGatewaySslCertificate.md

@@ -15,16 +15,16 @@ Adds an SSL certificate to an application gateway.
 
 ```
 Add-AzApplicationGatewaySslCertificate -ApplicationGateway <PSApplicationGateway> -Name <String>
- -CertificateFile <String> -Password <SecureString> [-DefaultProfile <IAzureContextContainer>]
- [<CommonParameters>]
+ [-CertificateFile <String>] [-Password <SecureString>] [-KeyVaultSecretId <String>]
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
 The **Add-AzApplicationGatewaySslCertificate** cmdlet adds an SSL certificate to an application gateway.
 
 ## EXAMPLES
 
-### Example 1: Add an SSL certificate to an application gateway.
+### Example 1: Add an SSL certificate using pfx to an application gateway.
 ```
 PS C:\> $AppGW = Get-AzApplicationGateway -Name "ApplicationGateway01" -ResourceGroupName "ResourceGroup01"
 PS C:\> $password = ConvertTo-SecureString "P@ssw0rd" -AsPlainText -Force
@@ -33,6 +33,28 @@ PS C:\> $AppGW = Add-AzApplicationGatewaySslCertificate -ApplicationGateway $App
 
 This command gets an application gateway named ApplicationGateway01 and then adds an SSL certificate named Cert01 to it.
 
+### Example 2: Add an SSL certificate using KeyVault Secret (version-less secretId) to an application gateway.
+```
+PS C:\> $AppGW = Get-AzApplicationGateway -Name "ApplicationGateway01" -ResourceGroupName "ResourceGroup01"
+PS C:\> $secret = Get-AzKeyVaultSecret -VaultName "keyvault01" -Name "sslCert01"
+PS C:\> $secretId = $secret.Id.Replace($secret.Version, "") # https://<keyvaultname>.vault.azure.net/secrets/
+PS C:\> $AppGW = Add-AzApplicationGatewaySslCertificate -ApplicationGateway $AppGW -Name "Cert01" -KeyVaultSecretId $secretId
+```
+
+Get the secret and reference it in the `Add-AzApplicationGatewaySslCertificate` to add it to the Application Gateway with name `Cert01`.
+Note: As version-less secretId is provided here, Application Gateway will sync the certificate in regular intervals with the KeyVault.
+
+### Example 3: Add an SSL certificate using KeyVault Secret (versioned secretId) to an application gateway.
+```
+PS C:\> $AppGW = Get-AzApplicationGateway -Name "ApplicationGateway01" -ResourceGroupName "ResourceGroup01"
+PS C:\> $secret = Get-AzKeyVaultSecret -VaultName "keyvault01" -Name "sslCert01"
+PS C:\> $secretId = $secret.Id # https://<keyvaultname>.vault.azure.net/secrets/<hash>
+PS C:\> $AppGW = Add-AzApplicationGatewaySslCertificate -ApplicationGateway $AppGW -Name "Cert01" -KeyVaultSecretId $secretId
+```
+
+Get the secret and reference it in the `Add-AzApplicationGatewaySslCertificate` to add it to the Application Gateway with name `Cert01`.
+Note: If it is required that Application Gateway syncs the certificate with the KeyVault, please provide the version-less secretId.
+
 ## PARAMETERS
 
 ### -ApplicationGateway
@@ -58,7 +80,7 @@ Type: System.String
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
@@ -80,6 +102,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -KeyVaultSecretId
+SecretId (uri) of the KeyVault Secret. Use this option when a specific version of secret needs to be used.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 Specifies the name of the SSL certificate that this cmdlet adds.
 
@@ -103,7 +140,7 @@ Type: System.Security.SecureString
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False

src/ResourceManager/Network/Commands.Network/help/New-AzApplicationGateway.md

@@ -30,7 +30,7 @@ New-AzApplicationGateway -Name <String> -ResourceGroupName <String> -Location <S
  [-RedirectConfigurations <PSApplicationGatewayRedirectConfiguration[]>]
  [-WebApplicationFirewallConfiguration <PSApplicationGatewayWebApplicationFirewallConfiguration>]
  [-AutoscaleConfiguration <PSApplicationGatewayAutoscaleConfiguration>] [-EnableHttp2] [-EnableFIPS]
- [-Zone <String[]>] [-Tag <Hashtable>] [-Force] [-AsJob]
+ [-Zone <String[]>] [-Tag <Hashtable>] [-UserAssignedIdentityId <String>] [-Force] [-AsJob]
  [-CustomErrorConfiguration <PSApplicationGatewayCustomError[]>] [-DefaultProfile <IAzureContextContainer>]
  [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
@@ -501,6 +501,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -UserAssignedIdentityId
+ResourceId of the user assigned identity to be assigned to Application Gateway.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases: UserAssignedIdentity
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -WebApplicationFirewallConfiguration
 Specifies a web application firewall (WAF) configuration. You can use the
 Get-AzApplicationGatewayWebApplicationFirewallConfiguration cmdlet to get a WAF.

src/ResourceManager/Network/Commands.Network/help/New-AzApplicationGatewaySslCertificate.md

@@ -14,8 +14,8 @@ Creates an SSL certificate for an Azure application gateway.
 ## SYNTAX
 
 ```
-New-AzApplicationGatewaySslCertificate -Name <String> -CertificateFile <String> -Password <SecureString>
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+New-AzApplicationGatewaySslCertificate -Name <String> [-CertificateFile <String>] [-Password <SecureString>]
+ [-KeyVaultSecretId <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -31,6 +31,26 @@ PS C:\> $cert = New-AzApplicationGatewaySslCertificate -Name "Cert01" -Certifica
 
 This command creates a SSL certificate named Cert01 for the default application gateway and stores the result in the variable named $Cert.
 
+### Example 2: Create an SSL certificate using KeyVault Secret (version-less secretId) and add to an application gateway.
+```
+PS C:\> $secret = Get-AzKeyVaultSecret -VaultName "keyvault01" -Name "sslCert01"
+PS C:\> $secretId = $secret.Id.Replace($secret.Version, "") # https://<keyvaultname>.vault.azure.net/secrets/
+PS C:\> $cert = New-AzApplicationGatewaySslCertificate -Name "Cert01" -KeyVaultSecretId $secretId
+```
+
+Get the secret and create an SSL Certificate using `New-AzApplicationGatewaySslCertificate`.
+Note: As version-less secretId is provided here, Application Gateway will sync the certificate in regular intervals with the KeyVault.
+
+### Example 3: Create an SSL certificate using KeyVault Secret and add to an Application Gateway.
+```
+PS C:\> $secret = Get-AzKeyVaultSecret -VaultName "keyvault01" -Name "sslCert01"
+PS C:\> $secretId = $secret.Id # https://<keyvaultname>.vault.azure.net/secrets/<hash>
+PS C:\> $cert = New-AzApplicationGatewaySslCertificate -Name "Cert01" -KeyVaultSecretId $secretId
+```
+
+Get the secret and create an SSL Certificate using `New-AzApplicationGatewaySslCertificate`.
+Note: If it is required that Application Gateway syncs the certificate with the KeyVault, please provide the version-less secretId.
+
 ## PARAMETERS
 
 ### -CertificateFile
@@ -41,7 +61,7 @@ Type: System.String
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
@@ -63,6 +83,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -KeyVaultSecretId
+SecretId (uri) of the KeyVault Secret. Use this option when a specific version of secret needs to be used.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 Specifies the name of the SSL certificate that this cmdlet creates.
 
@@ -86,7 +121,7 @@ Type: System.Security.SecureString
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False