change data structure in PSAzureFirewallWhitelist to string[]

Author: b564518128

src/Network/Network.Test/ScenarioTests/AzureFirewallTests.ps1

@@ -1112,15 +1112,15 @@ function Test-AzureFirewallThreatIntelWhitelistCRUD {
 
         # Verify
         $getAzureFirewall = Get-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname
-        Assert-AreEqual $threatIntelWhitelist1.FQDNs $getAzureFirewall.ThreatIntelWhitelist.FQDNs
-        Assert-AreEqual $threatIntelWhitelist1.IpAddresses $getAzureFirewall.ThreatIntelWhitelist.IpAddresses
+        Assert-AreEqual true (-not (Compare-Object $threatIntelWhitelist1.FQDNs $getAzureFirewall.ThreatIntelWhitelist.FQDNs))
+        Assert-AreEqual true (-not (Compare-Object $threatIntelWhitelist1.IpAddresses $getAzureFirewall.ThreatIntelWhitelist.IpAddresses))
 
         # Modify
         $azureFirewall.ThreatIntelWhitelist = $threatIntelWhitelist2
         Set-AzFirewall -AzureFirewall $azureFirewall
         $getAzureFirewall = Get-AzFirewall -Name $azureFirewallName -ResourceGroupName $rgname
-        Assert-AreEqual $threatIntelWhitelist2.FQDNs $getAzureFirewall.ThreatIntelWhitelist.FQDNs
-        Assert-AreEqual $threatIntelWhitelist2.IpAddresses $getAzureFirewall.ThreatIntelWhitelist.IpAddresses
+		Assert-AreEqual true (-not (Compare-Object $threatIntelWhitelist2.FQDNs $getAzureFirewall.ThreatIntelWhitelist.FQDNs))
+        Assert-AreEqual true (-not (Compare-Object $threatIntelWhitelist2.IpAddresses $getAzureFirewall.ThreatIntelWhitelist.IpAddresses))
     }
     finally {
         # Cleanup

src/Network/Network/AzureFirewall/ThreatIntelWhitelist/NewAzureFirewallThreatIntelWhitelistCommand.cs

@@ -41,8 +41,8 @@ public override void Execute()
 
             var threatIntelWhitelist = new PSAzureFirewallThreatIntelWhitelist
             {
-                FQDNs = this.FQDN?.Select(str => str.Trim()).Aggregate((result, item) => result + "," + item),
-                IpAddresses = this.IpAddress?.Select(str => str.Trim()).Aggregate((result, item) => result + "," + item),
+                FQDNs = this.FQDN?.Select(str => str.Trim()).ToArray(),
+                IpAddresses = this.IpAddress?.Select(str => str.Trim()).ToArray(),
             };
             WriteObject(threatIntelWhitelist);
         }

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -1117,8 +1117,8 @@ private static void Initialize()
 
                     dest.AdditionalProperties = new Dictionary<string, string>()
                     {
-                        { "ThreatIntel.Whitelist.FQDNs", src.ThreatIntelWhitelist.FQDNs },
-                        { "ThreatIntel.Whitelist.IpAddresses", src.ThreatIntelWhitelist.IpAddresses }
+                        { "ThreatIntel.Whitelist.FQDNs", src.ThreatIntelWhitelist.FQDNs.Aggregate((result, item) => result + "," + item) },
+                        { "ThreatIntel.Whitelist.IpAddresses", src.ThreatIntelWhitelist.IpAddresses.Aggregate((result, item) => result + "," + item) },
                     };
                 }); ;
                 cfg.CreateMap<CNM.PSAzureFirewallSku, MNM.AzureFirewallSku>();
@@ -1138,8 +1138,8 @@ private static void Initialize()
                 {
                     dest.ThreatIntelWhitelist = new CNM.PSAzureFirewallThreatIntelWhitelist
                     {
-                        FQDNs = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs")).Value,
-                        IpAddresses = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses")).Value
+                        FQDNs = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.FQDNs")).Value?.Split(',').Select(str => str.Trim()).ToArray(),
+                        IpAddresses = src.AdditionalProperties.SingleOrDefault(kvp => kvp.Key.Equals("ThreatIntel.Whitelist.IpAddresses")).Value?.Split(',').Select(str => str.Trim()).ToArray()
                     };
                 }); ;
                 cfg.CreateMap<MNM.AzureFirewallSku, CNM.PSAzureFirewallSku>();

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

@@ -17,8 +17,8 @@ namespace Microsoft.Azure.Commands.Network.Models
 {
     public class PSAzureFirewallThreatIntelWhitelist
     {
-        public string FQDNs { get; set; }
+        public string[] FQDNs { get; set; }
 
-        public string IpAddresses { get; set; }
+        public string[] IpAddresses { get; set; }
     }
 }