diff --git a/command/agent/agent.go b/command/agent/agent.go index 4b71fcce99..2753d31592 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -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) } diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index 42e3269f74..3306da2854 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -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 diff --git a/consul/structs/structs_test.go b/consul/structs/structs_test.go index 13714e993e..c1a39c4f99 100644 --- a/consul/structs/structs_test.go +++ b/consul/structs/structs_test.go @@ -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")