Skip to content
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

Jump to bottom

Duplicate handling of ips and vnet rules for cognitive services. #26001

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+58 −23
Open

Duplicate handling of ips and vnet rules for cognitive services. #26001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 58 additions & 23 deletions ...CognitiveServices/CognitiveServicesAccount/AddAzureCognitiveServicesAccountNetworkRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ----------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,6 +12,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System;
using System.Management.Automation;
using System.Collections.Generic;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
Expand Down Expand Up @@ -116,46 +117,28 @@ public override void ExecuteCmdlet()
{
accountACL.VirtualNetworkRules = new List<VirtualNetworkRule>();
}

foreach (string s in VirtualNetworkResourceId)
{
VirtualNetworkRule rule = new VirtualNetworkRule(s, null, true);
accountACL.VirtualNetworkRules.Add(rule);
}
accountACL.VirtualNetworkRules = MergeVirtualNetworkRules(accountACL.VirtualNetworkRules, VirtualNetworkResourceId);
break;
case IpRuleStringParameterSet:
if (accountACL.IPRules == null)
{
accountACL.IPRules = new List<IpRule>();
}

foreach (string s in IpAddressOrRange)
{
IpRule rule = new IpRule(s);
accountACL.IPRules.Add(rule);
}
accountACL.IPRules = MergeIpRules(accountACL.IPRules, IpAddressOrRange);
break;
case NetworkRuleObjectParameterSet:
if (accountACL.VirtualNetworkRules == null)
{
accountACL.VirtualNetworkRules = new List<VirtualNetworkRule>();
}

foreach (PSVirtualNetworkRule rule in VirtualNetworkRule)
{
accountACL.VirtualNetworkRules.Add(rule.ToVirtualNetworkRule());
}
accountACL.VirtualNetworkRules = MergeVirtualNetworkRules(accountACL.VirtualNetworkRules, VirtualNetworkRule);
break;
case IpRuleObjectParameterSet:
if (accountACL.IPRules == null)
{
accountACL.IPRules = new List<IpRule>();
}

foreach (PSIpRule rule in IpRule)
{
accountACL.IPRules.Add(rule.ToIpRule());
}
accountACL.IPRules = MergeIpRules(accountACL.IPRules, IpRule);
break;
}

Expand Down Expand Up @@ -185,5 +168,57 @@ public override void ExecuteCmdlet()
}
}
}

private List<VirtualNetworkRule> MergeVirtualNetworkRules(IList<VirtualNetworkRule> existingRules, string[] newRuleIds)
{
var updatedRules = new List<VirtualNetworkRule>(existingRules);
foreach (var id in newRuleIds)
{
if (!updatedRules.Exists(r => string.Equals(r.Id, id, StringComparison.OrdinalIgnoreCase)))
{
updatedRules.Add(new VirtualNetworkRule(id, null, true));
}
}
return updatedRules;
}

private List<VirtualNetworkRule> MergeVirtualNetworkRules(IList<VirtualNetworkRule> existingRules, PSVirtualNetworkRule[] newRules)
{
var updatedRules = new List<VirtualNetworkRule>(existingRules);
foreach (var rule in newRules)
{
if (!updatedRules.Exists(r => string.Equals(r.Id, rule.VirtualNetworkResourceId, StringComparison.OrdinalIgnoreCase)))
{
updatedRules.Add(rule.ToVirtualNetworkRule());
}
}
return updatedRules;
}

private List<IpRule> MergeIpRules(IList<IpRule> existingRules, string[] newRules)
{
var updatedRules = new List<IpRule>(existingRules);
foreach (var rule in newRules)
{
if (!updatedRules.Exists(r => string.Equals(r.Value, rule, StringComparison.OrdinalIgnoreCase)))
{
updatedRules.Add(new IpRule(rule));
}
}
return updatedRules;
}

private List<IpRule> MergeIpRules(IList<IpRule> existingRules, PSIpRule[] newRules)
{
var updatedRules = new List<IpRule>(existingRules);
foreach (var rule in newRules)
{
if (!updatedRules.Exists(r => string.Equals(r.Value, rule.IpAddressOrRange, StringComparison.OrdinalIgnoreCase)))
{
updatedRules.Add(rule.ToIpRule());
}
}
return updatedRules;
}
}
}
Loading