Pass AuxilaryAuthHeader for referenced resourceIds during Put Connection. (Azure#27349)

Author: Nilambari

src/Network/Network/ChangeLog.md

@@ -19,6 +19,9 @@
 --->
 
 ## Upcoming Release
+* Updated VirtualNetworkGatewayConnection cmdlets to pass AuxilaryAuthHeader for referenced resourceIds i.e. LocalNetworkGateway2, VirtualNetworkGateway2. This is needed in case referenced resourceIds are in different AAD Tenant.
+    - `New-AzVirtualNetworkGatewayConnection`
+    - `Set-AzVirtualNetworkGatewayConnection`
 
 ## Version 7.15.0
 * Updated cmdlet `AddAzureVirtualNetworkPeering` to add support for subnet peering

src/Network/Network/Cortex/VpnServerConfigurationPolicyGroup/NewAzureRmVpnServerConfigurationPolicyGroupCommand.cs

@@ -83,7 +83,7 @@ public class NewAzureRmVpnServerConfigurationPolicyGroupCommand : VpnServerConfi
 
         [Parameter(
             Mandatory = true,
-            HelpMessage = "The Priority of the policy group.",
+            HelpMessage = "The Priority of the policy group. Priority should be in consecutive orders.",
             ValueFromPipelineByPropertyName = true)]
         public int Priority { get; set; }
 

src/Network/Network/Cortex/VpnServerConfigurationPolicyGroup/UpdateAzureRmVpnServerConfigurationPolicyGroupCommand.cs

@@ -83,7 +83,7 @@ public class UpdateAzureRmVpnServerConfigurationPolicyGroupCommand : VpnServerCo
 
         [Parameter(
             Mandatory = false,
-            HelpMessage = "The Priority of the policy group.",
+            HelpMessage = "The Priority of the policy group. Priority should be in consecutive orders.",
             ValueFromPipelineByPropertyName = true)]
         public int Priority { get; set; }
 

src/Network/Network/VirtualNetworkGatewayConnection/NewAzureVirtualNetworkGatewayConnectionCommand.cs

@@ -229,13 +229,32 @@ public override void Execute()
 
         private PSVirtualNetworkGatewayConnection CreateVirtualNetworkGatewayConnection()
         {
+            Dictionary<string, List<string>> auxAuthHeader = null;
+            List<string> resourceIds = new List<string>();
             var vnetGatewayConnection = new PSVirtualNetworkGatewayConnection();
             vnetGatewayConnection.Name = this.Name;
             vnetGatewayConnection.ResourceGroupName = this.ResourceGroupName;
             vnetGatewayConnection.Location = this.Location;
             vnetGatewayConnection.VirtualNetworkGateway1 = this.VirtualNetworkGateway1;
-            vnetGatewayConnection.VirtualNetworkGateway2 = this.VirtualNetworkGateway2;
-            vnetGatewayConnection.LocalNetworkGateway2 = this.LocalNetworkGateway2;
+
+            // Get the aux header for the LNG2/VNG2
+            if (this.VirtualNetworkGateway2 != null)
+            {
+                vnetGatewayConnection.VirtualNetworkGateway2 = this.VirtualNetworkGateway2;
+                resourceIds.Add(this.VirtualNetworkGateway2.Id);
+            }
+
+            if (this.LocalNetworkGateway2 != null)
+            {
+                vnetGatewayConnection.LocalNetworkGateway2 = this.LocalNetworkGateway2;
+                resourceIds.Add(this.LocalNetworkGateway2.Id);
+            }
+            var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
+            if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+            {
+                auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
+            }
+
             vnetGatewayConnection.ConnectionType = this.ConnectionType;
             vnetGatewayConnection.RoutingWeight = this.RoutingWeight;
             vnetGatewayConnection.DpdTimeoutSeconds = this.DpdTimeoutInSeconds;
@@ -322,7 +341,7 @@ private PSVirtualNetworkGatewayConnection CreateVirtualNetworkGatewayConnection(
             vnetGatewayConnectionModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);
 
             // Execute the Create VirtualNetworkConnection call
-            this.VirtualNetworkGatewayConnectionClient.CreateOrUpdate(this.ResourceGroupName, this.Name, vnetGatewayConnectionModel);
+            this.VirtualNetworkGatewayConnectionClient.CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.Name, vnetGatewayConnectionModel, auxAuthHeader).GetAwaiter().GetResult();
 
             var getVirtualNetworkGatewayConnection = this.GetVirtualNetworkGatewayConnection(this.ResourceGroupName, this.Name);
 

src/Network/Network/VirtualNetworkGatewayConnection/UpdateAzureVirtualNetworkGatewayConnectionCommand.cs

@@ -225,16 +225,34 @@ public override void Execute()
                         }
                     }
 
+                    Dictionary<string, List<string>> auxAuthHeader = null;
+                    List<string> resourceIds = new List<string>();
+
+                    // Get the aux header for the LNG2/VNG2
+                    if (this.VirtualNetworkGatewayConnection.VirtualNetworkGateway2 != null)
+                    {
+                        resourceIds.Add(this.VirtualNetworkGatewayConnection.VirtualNetworkGateway2.Id);
+                    }
+
+                    if (this.VirtualNetworkGatewayConnection.LocalNetworkGateway2 != null)
+                    {
+                        resourceIds.Add(this.VirtualNetworkGatewayConnection.LocalNetworkGateway2.Id);
+                    }
+                    var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
+                    if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
+                    {
+                        auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
+                    }
+
                     var vnetGatewayConnectionModel = NetworkResourceManagerProfile.Mapper.Map<MNM.VirtualNetworkGatewayConnection>(this.VirtualNetworkGatewayConnection);
 
                     vnetGatewayConnectionModel.Tags =
                         ParameterSetName.Equals(VirtualNetworkGatewayParameterSets.UpdateResourceWithTags) ?
                         TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true) :
                         TagsConversionHelper.CreateTagDictionary(this.VirtualNetworkGatewayConnection.Tag, validate: true);
 
-                    this.VirtualNetworkGatewayConnectionClient.CreateOrUpdate(
-                        this.VirtualNetworkGatewayConnection.ResourceGroupName,
-                        this.VirtualNetworkGatewayConnection.Name, vnetGatewayConnectionModel);
+                    this.VirtualNetworkGatewayConnectionClient.CreateOrUpdateWithHttpMessagesAsync(this.VirtualNetworkGatewayConnection.ResourceGroupName, this.VirtualNetworkGatewayConnection.Name, vnetGatewayConnectionModel, auxAuthHeader).GetAwaiter().GetResult();
+
                     var getvnetGatewayConnection = this.GetVirtualNetworkGatewayConnection(this.VirtualNetworkGatewayConnection.ResourceGroupName, this.VirtualNetworkGatewayConnection.Name);
                     WriteObject(getvnetGatewayConnection);
                 });