luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix formatting

This commit is contained in:
Kyle Havlovitz 2017-01-09 13:40:50 -08:00
parent 12da452136
commit 6b5cf20b1c
No known key found for this signature in database
GPG Key ID: 8A5E6B173056AD6C
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/agent/agent.go
View File

@ -47,13 +47,13 @@ const (
metaKeyReservedPrefix = "consul-"
// The maximum number of metadata key pairs allowed to be registered
metaMaxKeyPairs = 64
metaMaxKeyPairs = 64
// The maximum allowed length of a metadata key
metaKeyMaxLength = 128
metaKeyMaxLength = 128
// The maximum allowed length of a metadata value
metaValueMaxLength = 512
metaValueMaxLength = 512
)
var (
@ -1728,9 +1728,6 @@ func validateMetaPair(key, value string) error {
if len(key) > metaKeyMaxLength {
return fmt.Errorf("Key is longer than %d chars", metaKeyMaxLength)
}
if strings.Contains(key, ":") {
return fmt.Errorf("Key contains ':' character")
}
if strings.HasPrefix(key, metaKeyReservedPrefix) {
return fmt.Errorf("Key prefix '%s' is reserved for internal use", metaKeyReservedPrefix)
}

2
command/agent/agent_test.go
View File

@ -1901,8 +1901,6 @@ func TestAgent_validateMetaPair(t *testing.T) {
{"", "value", false},
// allowed special chars in key name
{"k_e-y", "value", true},
// ':' in key name
{"k:ey", "value", false},
// disallowed special chars in key name
{"(%key&)", "value", false},
// key too long

2
consul/structs/structs_test.go
View File

@ -143,7 +143,7 @@ func TestStructs_RegisterRequest_ChangesNode(t *testing.T) {
check(func() { req.Node = "nope" }, func() { req.Node = "test" })
check(func() { req.Address = "127.0.0.2" }, func() { req.Address = "127.0.0.1" })
check(func() { req.TaggedAddresses["wan"] = "nope" }, func() { delete(req.TaggedAddresses, "wan") })
check(func() { req.NodeMeta["invalid"] = "nope" }, func() { delete(req.NodeMeta, "invalid")})
check(func() { req.NodeMeta["invalid"] = "nope" }, func() { delete(req.NodeMeta, "invalid") })
if !req.ChangesNode(nil) {
t.Fatalf("should change")