Skip to content

Add validation to the name field for ip groups #11999

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

Merged
merged 3 commits into from
May 27, 2020
Merged

Add validation to the name field for ip groups #11999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7503a21
Add validation to the name field for ip groups
tejasshah7 May 26, 2020
4aab5d9
Update ChangeLog.md
VeryEarly May 27, 2020
bdbbf92
Merge branch 'master' into tesha/AddIpGroupNameValidation
VeryEarly May 27, 2020
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
1 change: 1 addition & 0 deletions src/Network/Network/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--->

## Upcoming Release
* Added name validation for `New-AzIpGroup`

## Version 3.0.0
* Added breaking change attribute to notify that Zone default behaviour will be changed
Expand Down
13 changes: 13 additions & 0 deletions src/Network/Network/IpGroup/NewIpGroupCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Management.Automation;
using System.Text.RegularExpressions;
using Microsoft.Azure.Commands.Network.Models;
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
Expand Down Expand Up @@ -88,6 +89,8 @@ public override void Execute()
throw new PSArgumentException(string.Format(Properties.Resources.ResourceAlreadyPresentInResourceGroup, this.Name, this.ResourceGroupName));
}

ValidateName(this.Name);

ConfirmAction(
Force.IsPresent,
string.Format(Properties.Resources.OverwritingResource, Name),
Expand Down Expand Up @@ -115,5 +118,15 @@ private PSIpGroup CreateIpGroups()
this.IpGroupsClient.CreateOrUpdate(this.ResourceGroupName, this.Name, ipGroupSdkObject);
return this.GetIpGroup(this.ResourceGroupName, this.Name);
}

private void ValidateName(string name)
{
var IpgroupNameRegex = new Regex("^[^_\\W]([\\w-.]{0,78}[\\w])?$");

if (!IpgroupNameRegex.IsMatch(name))
{
throw new PSArgumentException(string.Format(Properties.Resources.InvalidName, this.Name));
}
}
}
}
62 changes: 32 additions & 30 deletions src/Network/Network/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Network/Network/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@
<data name="ResourceAlreadyPresentInResourceGroup" xml:space="preserve">
<value>A resource with the same name {0} and same type already exists in ResourceGroup {1}. If you wish to modify this resource please use the Update operation instead.</value>
</data>
<data name="InvalidName" xml:space="preserve">
<value>Field Name {0} contains invalid character.</value>
</data>
<data name="VirtualHubToUpdateNotFound" xml:space="preserve">
<value>The VirtualHub to update could not be found.</value>
</data>
Expand Down