Skip to content

Gateway Load Balancer Cross tenant issue fix #15195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2021
Merged

Gateway Load Balancer Cross tenant issue fix #15195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d784a
fix
Jun 7, 2021
bddd9d8
name fix
Jun 7, 2021
f87ccd4
put await next to create update
Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/Network/Network/Generated/LoadBalancer/NewAzureRMLoadBalancerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,37 @@ public override void Execute()
}
}

List<string> resourceIdsRequiringAuthToken = new List<string>();
Dictionary<string, List<string>> auxAuthHeader = null;

// Get aux token for each gateway lb references
foreach (FrontendIPConfiguration frontend in vLoadBalancerModel.FrontendIPConfigurations)
{
if (frontend.GatewayLoadBalancer != null)
{
//Get the aux header for the remote vnet
resourceIdsRequiringAuthToken.Add(frontend.GatewayLoadBalancer.Id);
}
}

if (resourceIdsRequiringAuthToken.Count > 0)
{
var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
{
auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
}
}


ConfirmAction(
Force.IsPresent,
string.Format(Properties.Resources.OverwritingResource, Name),
Properties.Resources.CreatingResourceMessage,
Name,
() =>
{
this.NetworkClient.NetworkManagementClient.LoadBalancers.CreateOrUpdate(this.ResourceGroupName, this.Name, vLoadBalancerModel);
this.NetworkClient.NetworkManagementClient.LoadBalancers.CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.Name, vLoadBalancerModel, auxAuthHeader).GetAwaiter().GetResult();
var getLoadBalancer = this.NetworkClient.NetworkManagementClient.LoadBalancers.Get(this.ResourceGroupName, this.Name);
var psLoadBalancer = NetworkResourceManagerProfile.Mapper.Map<PSLoadBalancer>(getLoadBalancer);
psLoadBalancer.ResourceGroupName = this.ResourceGroupName;
Expand Down
24 changes: 23 additions & 1 deletion src/Network/Network/Generated/LoadBalancer/SetAzureRMLoadBalancerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,30 @@ public override void Execute()
var vLoadBalancerModel = NetworkResourceManagerProfile.Mapper.Map<MNM.LoadBalancer>(this.LoadBalancer);
vLoadBalancerModel.Tags = TagsConversionHelper.CreateTagDictionary(this.LoadBalancer.Tag, validate: true);

List<string> resourceIds = new List<string>();
Dictionary<string, List<string>> auxAuthHeader = null;

// Get aux token for each gateway lb references
foreach (FrontendIPConfiguration frontend in vLoadBalancerModel.FrontendIPConfigurations)
{
if (frontend.GatewayLoadBalancer != null)
{
//Get the aux header for the remote vnet
resourceIds.Add(frontend.GatewayLoadBalancer.Id);
}
}

if (resourceIds.Count > 0)
{
var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIds);
if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
{
auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
}
}

// Execute the PUT LoadBalancer call
this.NetworkClient.NetworkManagementClient.LoadBalancers.CreateOrUpdate(this.LoadBalancer.ResourceGroupName, this.LoadBalancer.Name, vLoadBalancerModel);
this.NetworkClient.NetworkManagementClient.LoadBalancers.CreateOrUpdateWithHttpMessagesAsync(this.LoadBalancer.ResourceGroupName, this.LoadBalancer.Name, vLoadBalancerModel, auxAuthHeader).GetAwaiter().GetResult();

var getLoadBalancer = this.NetworkClient.NetworkManagementClient.LoadBalancers.Get(this.LoadBalancer.ResourceGroupName, this.LoadBalancer.Name);
var psLoadBalancer = NetworkResourceManagerProfile.Mapper.Map<PSLoadBalancer>(getLoadBalancer);
Expand Down
24 changes: 23 additions & 1 deletion src/Network/Network/NetworkInterface/NewAzureNetworkInterfaceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,35 @@ private PSNetworkInterface CreateNetworkInterface()
networkInterface.NetworkSecurityGroup.Id = this.NetworkSecurityGroupId;
}

List<string> resourceIdsRequiringAuthToken = new List<string>();
Dictionary<string, List<string>> auxAuthHeader = null;

// Get aux token for each gateway lb references
foreach (var ipConfiguration in networkInterface.IpConfigurations)
{
if (ipConfiguration.GatewayLoadBalancer != null)
{
//Get the aux header for the remote vnet
resourceIdsRequiringAuthToken.Add(ipConfiguration.GatewayLoadBalancer.Id);
}
}

if (resourceIdsRequiringAuthToken.Count > 0)
{
var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
{
auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
}
}

var networkInterfaceModel = NetworkResourceManagerProfile.Mapper.Map<MNM.NetworkInterface>(networkInterface);

this.NullifyApplicationSecurityGroupIfAbsent(networkInterfaceModel);

networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.Tag, validate: true);

this.NetworkInterfaceClient.CreateOrUpdate(this.ResourceGroupName, this.Name, networkInterfaceModel);
this.NetworkInterfaceClient.CreateOrUpdateWithHttpMessagesAsync(this.ResourceGroupName, this.Name, networkInterfaceModel, auxAuthHeader).GetAwaiter().GetResult();

var getNetworkInterface = this.GetNetworkInterface(this.ResourceGroupName, this.Name);

Expand Down
23 changes: 21 additions & 2 deletions src/Network/Network/NetworkInterface/SetAzureNetworkInterfaceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
using Microsoft.Azure.Management.Network;
using System;
using System.Collections.Generic;
using System.Management.Automation;
using MNM = Microsoft.Azure.Management.Network.Models;

Expand All @@ -43,14 +44,32 @@ public override void Execute()
throw new ArgumentException(Microsoft.Azure.Commands.Network.Properties.Resources.ResourceNotFound);
}

// Verify if PublicIpAddress is empty
List<string> resourceIdsRequiringAuthToken = new List<string>();
Dictionary<string, List<string>> auxAuthHeader = null;

foreach (var ipconfig in NetworkInterface.IpConfigurations)
{
// Verify if PublicIpAddress is empty
if (ipconfig.PublicIpAddress != null &&
string.IsNullOrEmpty(ipconfig.PublicIpAddress.Id))
{
ipconfig.PublicIpAddress = null;
}

if (ipconfig.GatewayLoadBalancer != null)
{
//Get the aux header for the remote vnet
resourceIdsRequiringAuthToken.Add(ipconfig.GatewayLoadBalancer.Id);
}
}

if (resourceIdsRequiringAuthToken.Count > 0)
{
var auxHeaderDictionary = GetAuxilaryAuthHeaderFromResourceIds(resourceIdsRequiringAuthToken);
if (auxHeaderDictionary != null && auxHeaderDictionary.Count > 0)
{
auxAuthHeader = new Dictionary<string, List<string>>(auxHeaderDictionary);
}
}

// Map to the sdk object
Expand All @@ -60,7 +79,7 @@ public override void Execute()

networkInterfaceModel.Tags = TagsConversionHelper.CreateTagDictionary(this.NetworkInterface.Tag, validate: true);

this.NetworkInterfaceClient.CreateOrUpdate(this.NetworkInterface.ResourceGroupName, this.NetworkInterface.Name, networkInterfaceModel);
this.NetworkInterfaceClient.CreateOrUpdateWithHttpMessagesAsync(this.NetworkInterface.ResourceGroupName, this.NetworkInterface.Name, networkInterfaceModel, auxAuthHeader).GetAwaiter().GetResult();

var getNetworkInterface = this.GetNetworkInterface(this.NetworkInterface.ResourceGroupName, this.NetworkInterface.Name);
WriteObject(getNetworkInterface);
Expand Down