Skip to content

Commit 107ee10

Browse files
committed
fix test
1 parent 05db17a commit 107ee10

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

src/Network/Network/Common/NetworkResourceManagerProfile.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
namespace Microsoft.Azure.Commands.Network
1616
{
1717
using AutoMapper;
18+
using System;
1819
using System.Collections.Generic;
1920
using System.Linq;
21+
using System.Management.Automation;
2022
using WindowsAzure.Commands.Common;
2123
using CNM = Microsoft.Azure.Commands.Network.Models;
2224
using MNM = Microsoft.Azure.Management.Network.Models;
@@ -1130,12 +1132,25 @@ private static void Initialize()
11301132
// MNM to CNM
11311133
cfg.CreateMap<MNM.AzureFirewall, CNM.PSAzureFirewall>().AfterMap((src, dest) =>
11321134
{
1133-
dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist
1135+
// TODO: refactor after backend is refactored
1136+
dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist();
1137+
try
11341138
{
1135-
FQDNs = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs")).Value?.Split(',').Select(str => str.Trim()).ToArray(),
1136-
IpAddresses = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses")).Value?.Split(',').Select(str => str.Trim()).ToArray()
1137-
};
1138-
}); ;
1139+
dest.ThreatIntelWhitelist.FQDNs = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs", StringComparison.OrdinalIgnoreCase)).Value?.Split(',').Select(str => str.Trim()).ToArray();
1140+
}
1141+
catch (PSArgumentException)
1142+
{
1143+
dest.ThreatIntelWhitelist.FQDNs = null;
1144+
}
1145+
try
1146+
{
1147+
dest.ThreatIntelWhitelist.IpAddresses = src.AdditionalProperties?.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses", StringComparison.OrdinalIgnoreCase)).Value?.Split(',').Select(str => str.Trim()).ToArray();
1148+
}
1149+
catch (PSArgumentException)
1150+
{
1151+
dest.ThreatIntelWhitelist.IpAddresses = null;
1152+
}
1153+
});
11391154
cfg.CreateMap<MNM.AzureFirewallSku, CNM.PSAzureFirewallSku>();
11401155
cfg.CreateMap<MNM.AzureFirewallIPConfiguration, CNM.PSAzureFirewallIpConfiguration>();
11411156
cfg.CreateMap<MNM.AzureFirewallApplicationRuleCollection, CNM.PSAzureFirewallApplicationRuleCollection>();

src/Network/Network/Models/AzureFirewall/PSAzureFirewallThreatIntelWhitelist.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ private void ValidateFqdns(string[] fqdns)
6464

6565
private void ValidateIpAddresses(string[] ipAddresses)
6666
{
67-
if (IpAddresses == null)
67+
if (ipAddresses == null)
6868
return;
69-
foreach (var ip in IpAddresses)
69+
foreach (var ip in ipAddresses)
7070
{
7171
IPAddress ipVal;
7272
if (!IPAddress.TryParse(ip, out ipVal) || ipVal.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)

0 commit comments

Comments
 (0)