Skip to content

Commit 017a971

Browse files
saisujithreddymsaisujithreddym
committed
pascal case changes for firewall policy
1 parent 41f9854 commit 017a971

19 files changed

+118
-102
lines changed

‎src/Network/Network.Test/ScenarioTests/AzureFirewallPolicyTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ function Test-AzureFirewallPolicyCRUD {
150150

151151
Assert-AreEqual 3 @($getRg.properties.ruleCollection).Count
152152

153-
$filterRuleCollection1 = $getRg.properties.GetRuleCollectionByName($appRcName)
154-
$natRuleCollection = $getRg.properties.GetRuleCollectionByName($networkRcName)
153+
$filterRuleCollection1 = $getRg.Properties.GetRuleCollectionByName($appRcName)
154+
$natRuleCollection = $getRg.Properties.GetRuleCollectionByName($networkRcName)
155155

156156
# Verify filter Rule1
157157
Assert-AreEqual $appRcName $filterRuleCollection1.Name

‎src/Network/Network/AzureFirewallPolicy/ApplicationRuleCondition/NewAzureFirewallPolicyApplicationRuleCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ public override void Execute()
7676

7777
var applicationRule = new PSAzureFirewallPolicyApplicationRule
7878
{
79-
name = this.Name,
79+
Name = this.Name,
8080
SourceAddresses = this.SourceAddress?.ToList(),
8181
Protocols = protocolsAsWeExpectThem,
8282
TargetFqdns = this.TargetFqdn?.ToList(),
8383
FqdnTags = this.FqdnTag?.ToList(),
84-
ruleType = "ApplicationRuleCondition"
84+
RuleType = "ApplicationRuleCondition"
8585
};
8686
WriteObject(applicationRule);
8787
}

‎src/Network/Network/AzureFirewallPolicy/FilterRule/NewAzureFirewallPolicyFilterRuleCollectionCommand.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ public override void Execute()
5858

5959
var filterRule = new PSAzureFirewallPolicyFilterRuleCollection
6060
{
61-
name = this.Name,
62-
priority = this.Priority,
63-
rules = this.Rule?.ToList(),
64-
Action = new PSAzureFirewallPolicyFilterRuleCollectionAction { type = ActionType },
65-
ruleCollectionType = "FirewallPolicyFilterRule"
61+
Name = this.Name,
62+
Priority = this.Priority,
63+
Rules = this.Rule?.ToList(),
64+
Action = new PSAzureFirewallPolicyFilterRuleCollectionAction { Type = ActionType },
65+
RuleCollectionType = "FirewallPolicyFilterRule"
6666
};
6767
WriteObject(filterRule);
6868
}

‎src/Network/Network/AzureFirewallPolicy/NatRule/NewAzureFirewallPolicyNatRuleCollectionCommand.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ public override void Execute()
7171

7272
var natRuleCollections = new PSAzureFirewallPolicyNatRuleCollection
7373
{
74-
name = this.Name,
75-
priority = this.Priority,
76-
rule = this.Rule,
77-
Action = new PSAzureFirewallPolicyNatRuleCollectionAction { type = ActionType },
78-
translatedAddress = this.TranslatedAddress,
79-
translatedPort = this.TranslatedPort,
80-
ruleCollectionType = "FirewallPolicyNatRule"
74+
Name = this.Name,
75+
Priority = this.Priority,
76+
Rule = this.Rule,
77+
Action = new PSAzureFirewallPolicyNatRuleCollectionAction { Type = ActionType },
78+
TranslatedAddress = this.TranslatedAddress,
79+
TranslatedPort = this.TranslatedPort,
80+
RuleCollectionType = "FirewallPolicyNatRule"
8181
};
8282

8383
WriteObject(natRuleCollections);

‎src/Network/Network/AzureFirewallPolicy/NetworkRuleCondition/NewAzureFirewallPolicyNetworkRuleCommand.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ public override void Execute()
7171

7272
var networkRule = new PSAzureFirewallPolicyNetworkRule
7373
{
74-
name = this.Name,
74+
Name = this.Name,
7575
protocols = this.Protocol?.ToList(),
76-
sourceAddresses = this.SourceAddress?.ToList(),
77-
destinationAddresses = this.DestinationAddress?.ToList(),
78-
destinationPorts = this.DestinationPort?.ToList(),
79-
ruleType = "NetworkRuleCondition"
76+
SourceAddresses = this.SourceAddress?.ToList(),
77+
DestinationAddresses = this.DestinationAddress?.ToList(),
78+
DestinationPorts = this.DestinationPort?.ToList(),
79+
RuleType = "NetworkRuleCondition"
8080
};
8181
WriteObject(networkRule);
8282
}

‎src/Network/Network/AzureFirewallPolicy/RuleGroup/AzureFirewallPolicyRuleGroupBaseCmdlet.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,21 @@ public PSAzureFirewallPolicyRuleCollectionGroupWrapper GetAzureFirewallPolicyRul
5959
{
6060
MNM.FirewallPolicyFilterRule filterRule = (MNM.FirewallPolicyFilterRule)getRuleCollectionGroup.Rules[ruleCollectionIndex];
6161
PSAzureFirewallPolicyFilterRuleCollection filterRuleCollection = JsonConvert.DeserializeObject<PSAzureFirewallPolicyFilterRuleCollection>(JsonConvert.SerializeObject(getRuleCollectionGroup.Rules[ruleCollectionIndex]));
62-
filterRuleCollection.ruleCollectionType = "FirewallPolicyFilterRule";
63-
filterRuleCollection.rules = new List<PSAzureFirewallPolicyRule>();
62+
filterRuleCollection.RuleCollectionType = "FirewallPolicyFilterRule";
63+
filterRuleCollection.Rules = new List<PSAzureFirewallPolicyRule>();
6464
for (int ruleIndex = 0; ruleIndex < filterRule.RuleConditions.Count; ruleIndex++)
6565
{
6666
if (filterRule.RuleConditions[ruleIndex] is MNM.ApplicationRuleCondition)
6767
{
6868
PSAzureFirewallPolicyApplicationRule rule = JsonConvert.DeserializeObject<PSAzureFirewallPolicyApplicationRule>(JsonConvert.SerializeObject(filterRule.RuleConditions[ruleIndex]));
69-
rule.ruleType = "ApplicationRuleCondition";
70-
filterRuleCollection.rules.Add(rule);
69+
rule.RuleType = "ApplicationRuleCondition";
70+
filterRuleCollection.Rules.Add(rule);
7171
}
7272
else
7373
{
7474
PSAzureFirewallPolicyNetworkRule rule = JsonConvert.DeserializeObject<PSAzureFirewallPolicyNetworkRule>(JsonConvert.SerializeObject(filterRule.RuleConditions[ruleIndex]));
75-
rule.ruleType = "NetworkRuleCondition";
76-
filterRuleCollection.rules.Add(rule);
75+
rule.RuleType = "NetworkRuleCondition";
76+
filterRuleCollection.Rules.Add(rule);
7777
}
7878
}
7979
ruleCollectionGroup.ruleCollection.Add(filterRuleCollection);
@@ -82,18 +82,18 @@ public PSAzureFirewallPolicyRuleCollectionGroupWrapper GetAzureFirewallPolicyRul
8282
{
8383
MNM.FirewallPolicyNatRule natRule = (MNM.FirewallPolicyNatRule)getRuleCollectionGroup.Rules[ruleCollectionIndex];
8484
PSAzureFirewallPolicyNatRuleCollection natRuleCollection = JsonConvert.DeserializeObject<PSAzureFirewallPolicyNatRuleCollection>(JsonConvert.SerializeObject(getRuleCollectionGroup.Rules[ruleCollectionIndex]));
85-
natRuleCollection.ruleCollectionType = "FirewallPolicyNatRule";
86-
natRuleCollection.rule = JsonConvert.DeserializeObject<PSAzureFirewallPolicyNetworkRule>(JsonConvert.SerializeObject(natRule.RuleCondition));
87-
natRuleCollection.rule.ruleType = "NetworkRuleCondition";
85+
natRuleCollection.RuleCollectionType = "FirewallPolicyNatRule";
86+
natRuleCollection.Rule = JsonConvert.DeserializeObject<PSAzureFirewallPolicyNetworkRule>(JsonConvert.SerializeObject(natRule.RuleCondition));
87+
natRuleCollection.Rule.RuleType = "NetworkRuleCondition";
8888
ruleCollectionGroup.ruleCollection.Add(natRuleCollection);
8989
}
9090
}
9191

9292
var ruleCollectionGroupWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper();
93-
ruleCollectionGroup.priority = (uint)getRuleCollectionGroup.Priority;
94-
ruleCollectionGroupWrapper.properties = ruleCollectionGroup;
95-
ruleCollectionGroupWrapper.name = getRuleCollectionGroup.Name;
96-
ruleCollectionGroupWrapper.properties.Id = getRuleCollectionGroup.Id;
93+
ruleCollectionGroup.Priority = (uint)getRuleCollectionGroup.Priority;
94+
ruleCollectionGroupWrapper.Properties = ruleCollectionGroup;
95+
ruleCollectionGroupWrapper.Name = getRuleCollectionGroup.Name;
96+
ruleCollectionGroupWrapper.Properties.Id = getRuleCollectionGroup.Id;
9797

9898
return ruleCollectionGroupWrapper;
9999
}

‎src/Network/Network/AzureFirewallPolicy/RuleGroup/NewAzureFirewallPolicyRuleCollectionGroupCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ public override void Execute()
8585

8686
var ruleGroup = new PSAzureFirewallPolicyRuleCollectionGroup
8787
{
88-
priority = this.Priority,
88+
Priority = this.Priority,
8989
ruleCollection = this.RuleCollection?.ToList(),
9090
};
9191

9292
var rcWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper
9393
{
94-
name = this.Name,
95-
properties = ruleGroup
94+
Name = this.Name,
95+
Properties = ruleGroup
9696
};
9797

9898
var settings = new JsonSerializerSettings

‎src/Network/Network/AzureFirewallPolicy/RuleGroup/RemoveAzureFirewallPolicyRuleCollectionGroupCmdlet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public override void Execute()
9797
}
9898
else if (this.IsParameterBound(c => c.InputObject))
9999
{
100-
this.Name = InputObject.name;
101-
var resourceId = InputObject.properties.Id;
100+
this.Name = InputObject.Name;
101+
var resourceId = InputObject.Properties.Id;
102102

103103
var resourceInfo = new ResourceIdentifier(resourceId);
104104
this.AzureFirewallPolicyName = resourceInfo.ParentResource.Split('/')[1];

‎src/Network/Network/AzureFirewallPolicy/RuleGroup/SetAzureFirewallPolicyRuleCollectionGroupCmdlet.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,23 @@ public override void Execute()
109109

110110
if (this.IsParameterBound(c => c.InputObject))
111111
{
112-
this.Name = InputObject.name;
113-
var resourceId = InputObject.properties.Id;
112+
this.Name = InputObject.Name;
113+
var resourceId = InputObject.Properties.Id;
114114

115115
var resourceInfo = new ResourceIdentifier(resourceId);
116116
this.FirewallPolicyName = resourceInfo.ParentResource.Split('/')[1];
117117
this.ResourceGroupName = resourceInfo.ResourceGroupName;
118118

119119
ruleGroup = new PSAzureFirewallPolicyRuleCollectionGroup
120120
{
121-
priority = this.IsParameterBound(c => c.Priority) ? Priority : InputObject.properties.priority,
122-
ruleCollection = this.IsParameterBound(c => c.RuleCollection) ? RuleCollection.ToList() : InputObject.properties.ruleCollection?.ToList()
121+
Priority = this.IsParameterBound(c => c.Priority) ? Priority : InputObject.Properties.Priority,
122+
ruleCollection = this.IsParameterBound(c => c.RuleCollection) ? RuleCollection.ToList() : InputObject.Properties.ruleCollection?.ToList()
123123
};
124124

125125
rcWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper
126126
{
127-
name = InputObject.name,
128-
properties = ruleGroup
127+
Name = InputObject.Name,
128+
Properties = ruleGroup
129129
};
130130

131131
}
@@ -137,13 +137,13 @@ public override void Execute()
137137
this.FirewallPolicyName = resourceInfo.ParentResource.Split('/')[1];
138138
ruleGroup = new PSAzureFirewallPolicyRuleCollectionGroup
139139
{
140-
priority = Priority,
140+
Priority = Priority,
141141
ruleCollection = this.RuleCollection?.ToList()
142142
};
143143
rcWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper
144144
{
145-
name = this.Name,
146-
properties = ruleGroup
145+
Name = this.Name,
146+
Properties = ruleGroup
147147
};
148148
}
149149
else if (this.IsParameterBound(c => c.FirewallPolicyObject))
@@ -152,26 +152,26 @@ public override void Execute()
152152
this.FirewallPolicyName = FirewallPolicyObject.Name;
153153
ruleGroup = new PSAzureFirewallPolicyRuleCollectionGroup
154154
{
155-
priority = Priority,
155+
Priority = Priority,
156156
ruleCollection = this.RuleCollection?.ToList()
157157
};
158158
rcWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper
159159
{
160-
name = this.Name,
161-
properties = ruleGroup
160+
Name = this.Name,
161+
Properties = ruleGroup
162162
};
163163
}
164164
else if (this.IsParameterBound(c => c.FirewallPolicyName))
165165
{
166166
ruleGroup = new PSAzureFirewallPolicyRuleCollectionGroup
167167
{
168-
priority = Priority,
168+
Priority = Priority,
169169
ruleCollection = this.RuleCollection?.ToList()
170170
};
171171
rcWrapper = new PSAzureFirewallPolicyRuleCollectionGroupWrapper
172172
{
173-
name = this.Name,
174-
properties = ruleGroup
173+
Name = this.Name,
174+
Properties = ruleGroup
175175
};
176176
}
177177

‎src/Network/Network/Models/AzureFirewallPolicy/PSAzureFirewallPolicyApplicationRuleCollectionProtocol.cs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,27 @@
1717
using System.Collections.Generic;
1818
using System.Linq;
1919
using System.Text.RegularExpressions;
20+
using Newtonsoft.Json;
2021
using MNM = Microsoft.Azure.Management.Network.Models;
2122

2223
namespace Microsoft.Azure.Commands.Network.Models
2324
{
2425
public class PSAzureFirewallPolicyApplicationRuleProtocol
2526
{
26-
public string protocolType { get; set; }
27-
public uint port { get; set; }
27+
[JsonProperty(PropertyName = "protocolType")]
28+
public string ProtocolType { get; set; }
29+
30+
[JsonProperty(PropertyName = "port")]
31+
public uint Port { get; set; }
2832

2933
public static PSAzureFirewallPolicyApplicationRuleProtocol MapUserInputToApplicationRuleProtocol(string userInput)
3034
{
3135
var protocolRegEx = new Regex("^[hH][tT][tT][pP][sS]?(:[1-9][0-9]*)?$");
3236

3337
var supportedProtocolsAndTheirDefaultPorts = new List<PSAzureFirewallPolicyApplicationRuleProtocol>
3438
{
35-
new PSAzureFirewallPolicyApplicationRuleProtocol { protocolType = MNM.AzureFirewallApplicationRuleProtocolType.Http, port = 80 },
36-
new PSAzureFirewallPolicyApplicationRuleProtocol { protocolType = MNM.AzureFirewallApplicationRuleProtocolType.Https, port = 443 }
39+
new PSAzureFirewallPolicyApplicationRuleProtocol { ProtocolType = MNM.AzureFirewallApplicationRuleProtocolType.Http, Port = 80 },
40+
new PSAzureFirewallPolicyApplicationRuleProtocol { ProtocolType = MNM.AzureFirewallApplicationRuleProtocolType.Https, Port = 443 }
3741
};
3842

3943
//The actual validation is performed in NRP. Here we are just trying to map user info to our model
@@ -49,18 +53,18 @@ public static PSAzureFirewallPolicyApplicationRuleProtocol MapUserInputToApplica
4953
PSAzureFirewallPolicyApplicationRuleProtocol supportedProtocol;
5054
try
5155
{
52-
supportedProtocol = supportedProtocolsAndTheirDefaultPorts.Single(protocol => protocol.protocolType.Equals(userProtocolText, StringComparison.InvariantCultureIgnoreCase));
56+
supportedProtocol = supportedProtocolsAndTheirDefaultPorts.Single(protocol => protocol.ProtocolType.Equals(userProtocolText, StringComparison.InvariantCultureIgnoreCase));
5357
}
5458
catch
5559
{
56-
throw new ArgumentException($"Unsupported protocol {userProtocolText}. Supported protocols are {string.Join(", ", supportedProtocolsAndTheirDefaultPorts.Select(proto => proto.protocolType))}");
60+
throw new ArgumentException($"Unsupported protocol {userProtocolText}. Supported protocols are {string.Join(", ", supportedProtocolsAndTheirDefaultPorts.Select(proto => proto.ProtocolType))}");
5761
}
5862

5963
uint port;
6064
if (userPortText == null)
6165
{
6266
// Use default port for this protocol
63-
port = supportedProtocol.port;
67+
port = supportedProtocol.Port;
6468
}
6569
else if (!uint.TryParse(userPortText, out port))
6670
{
@@ -69,8 +73,8 @@ public static PSAzureFirewallPolicyApplicationRuleProtocol MapUserInputToApplica
6973

7074
return new PSAzureFirewallPolicyApplicationRuleProtocol
7175
{
72-
protocolType = supportedProtocol.protocolType,
73-
port = port
76+
ProtocolType = supportedProtocol.ProtocolType,
77+
Port = port
7478
};
7579
}
7680
}

‎src/Network/Network/Models/AzureFirewallPolicy/PSAzureFirewallPolicyBaseRuleCollection.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ namespace Microsoft.Azure.Commands.Network.Models
2020
public class PSAzureFirewallPolicyBaseRuleCollection
2121
{
2222

23-
[JsonProperty(Order = 1)]
24-
public string name { get; set; }
23+
[JsonProperty(Order = 1,PropertyName = "name")]
24+
public string Name { get; set; }
2525

26-
[JsonProperty(Order = 2)]
27-
public uint priority { get; set; }
26+
[JsonProperty(Order = 2,PropertyName = "priority")]
27+
public uint Priority { get; set; }
2828

2929
[JsonProperty("ruleType")]
30-
public string ruleCollectionType { get; set; }
30+
public string RuleCollectionType { get; set; }
3131
}
3232
}

‎src/Network/Network/Models/AzureFirewallPolicy/PSAzureFirewallPolicyFilterRuleCollection.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class PSAzureFirewallPolicyFilterRuleCollection : PSAzureFirewallPolicyBa
2626
public PSAzureFirewallPolicyFilterRuleCollectionAction Action { get; set; }
2727

2828
[JsonProperty("ruleConditions")]
29-
public List<PSAzureFirewallPolicyRule> rules { get; set; }
29+
public List<PSAzureFirewallPolicyRule> Rules { get; set; }
3030

3131

3232
[JsonIgnore]
@@ -38,25 +38,25 @@ public string ActionText
3838
[JsonIgnore]
3939
public string RulesText
4040
{
41-
get { return JsonConvert.SerializeObject(rules, Formatting.Indented); }
41+
get { return JsonConvert.SerializeObject(Rules, Formatting.Indented); }
4242
}
4343

4444
public void AddRule(PSAzureFirewallPolicyApplicationRule rule)
4545
{
4646
// Validate
47-
if (this.rules != null)
47+
if (this.Rules != null)
4848
{
49-
if (this.rules.Any(rc => rc.name.Equals(rule.name)))
49+
if (this.Rules.Any(rc => rc.Name.Equals(rule.Name)))
5050
{
51-
throw new ArgumentException($"Application Rule names must be unique. {rule.name} name is already used.");
51+
throw new ArgumentException($"Application Rule names must be unique. {rule.Name} name is already used.");
5252
}
5353
}
5454
else
5555
{
56-
this.rules = new List<PSAzureFirewallPolicyRule>();
56+
this.Rules = new List<PSAzureFirewallPolicyRule>();
5757
}
5858

59-
this.rules.Add(rule);
59+
this.Rules.Add(rule);
6060
}
6161

6262
public PSAzureFirewallPolicyRule GetRuleByName(string ruleName)
@@ -66,7 +66,7 @@ public PSAzureFirewallPolicyRule GetRuleByName(string ruleName)
6666
throw new ArgumentException($"Rule name cannot be an empty string.");
6767
}
6868

69-
var rule = this.rules?.FirstOrDefault(r => ruleName.Equals(r.name, StringComparison.OrdinalIgnoreCase));
69+
var rule = this.Rules?.FirstOrDefault(r => ruleName.Equals(r.Name, StringComparison.OrdinalIgnoreCase));
7070

7171
if (rule == null)
7272
{
@@ -80,7 +80,7 @@ public PSAzureFirewallPolicyRule GetRuleByName(string ruleName)
8080
public void RemoveRuleByName(string ruleName)
8181
{
8282
var rule = this.GetRuleByName(ruleName);
83-
this.rules?.Remove(rule);
83+
this.Rules?.Remove(rule);
8484
}
8585
}
8686
}

0 commit comments

Comments
 (0)