|
15 | 15 | namespace Microsoft.Azure.Commands.Network
|
16 | 16 | {
|
17 | 17 | using AutoMapper;
|
| 18 | + using System; |
18 | 19 | using System.Collections.Generic;
|
19 | 20 | using System.Linq;
|
| 21 | + using System.Management.Automation; |
20 | 22 | using WindowsAzure.Commands.Common;
|
21 | 23 | using CNM = Microsoft.Azure.Commands.Network.Models;
|
22 | 24 | using MNM = Microsoft.Azure.Management.Network.Models;
|
@@ -1130,12 +1132,25 @@ private static void Initialize()
|
1130 | 1132 | // MNM to CNM
|
1131 | 1133 | cfg.CreateMap<MNM.AzureFirewall, CNM.PSAzureFirewall>().AfterMap((src, dest) =>
|
1132 | 1134 | {
|
1133 |
| - dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist |
| 1135 | + // TODO: refactor after backend is refactored |
| 1136 | + dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist(); |
| 1137 | + try |
1134 | 1138 | {
|
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 | + }); |
1139 | 1154 | cfg.CreateMap<MNM.AzureFirewallSku, CNM.PSAzureFirewallSku>();
|
1140 | 1155 | cfg.CreateMap<MNM.AzureFirewallIPConfiguration, CNM.PSAzureFirewallIpConfiguration>();
|
1141 | 1156 | cfg.CreateMap<MNM.AzureFirewallApplicationRuleCollection, CNM.PSAzureFirewallApplicationRuleCollection>();
|
|
0 commit comments