gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 15:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1402 from gravitl/feature_v0.14.6_addressrangevalidation

Browse source 
Fixed by adding validation tags.
This commit is contained in:
dcarns 2022-07-21 08:51:46 -04:00 committed by GitHub
parent 177c10b60f 38e4950ed1
commit 5293a08c94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
controllers/network_test.go
View file

@ -223,16 +223,16 @@ func TestValidateNetwork(t *testing.T) {
NetID: "skynet",
AddressRange: "10.0.0.256",
},
errMessage: "Field validation for 'AddressRange' failed on the 'cidr' tag",
errMessage: "Field validation for 'AddressRange' failed on the 'cidrv4' tag",
},
{
testname: "InvalidAddress6",
network: models.Network{
NetID: "skynet1",
AddressRange6: "2607::ffff/130",
},
errMessage: "Field validation for 'AddressRange6' failed on the 'cidrv6' tag",
},
//{
// testname: "InvalidAddress6",
// network: models.Network{
// NetID: "skynet1",
// AddressRange6: "2607::ffff/130",
// },
// errMessage: "Field validation for 'AddressRange6' failed on the 'cidr' tag",
//},
{
testname: "InvalidNetID",
network: models.Network{
@ -287,7 +287,7 @@ func TestValidateNetwork(t *testing.T) {
network.SetDefaults()
err := logic.ValidateNetwork(&network, false)
assert.NotNil(t, err)
assert.Contains(t, err.Error(), tc.errMessage)
assert.Contains(t, err.Error(), tc.errMessage) // test passes if err.Error() contains the expected errMessage.
})
}
}

4
models/network.go
View file

@ -7,8 +7,8 @@ import (
// Network Struct - contains info for a given unique network
//At some point, need to replace all instances of Name with something else like Identifier
type Network struct {
AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidr"`
AddressRange6 string `json:"addressrange6" bson:"addressrange6"`
AddressRange string `json:"addressrange" bson:"addressrange" validate:"omitempty,cidrv4"`
AddressRange6 string `json:"addressrange6" bson:"addressrange6" validate:"omitempty,cidrv6"`
NetID string `json:"netid" bson:"netid" validate:"required,min=1,max=12,netid_valid"`
NodesLastModified int64 `json:"nodeslastmodified" bson:"nodeslastmodified"`
NetworkLastModified int64 `json:"networklastmodified" bson:"networklastmodified"`