self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-21 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow dash in resource labels.

Browse source
This commit is contained in:
Roman Tkachenko 2018-11-16 13:26:47 -08:00
parent 44f128640a
commit f7424e5c95
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/services/resource.go
View file

@ -292,7 +292,7 @@ const MetadataSchema = `{
"type": "object",
"additionalProperties": false,
"patternProperties": {
"^[a-zA-Z/.0-9_*]+$": { "type": "string" }
"^[a-zA-Z/.0-9_*-]+$": { "type": "string" }
}
}
}

4
lib/services/role.go
View file

@ -1986,7 +1986,7 @@ const RoleSpecV3SchemaDefinitions = `
"type": "object",
"additionalProperties": false,
"patternProperties": {
"^[a-zA-Z/.0-9_*]+$": { "anyOf": [{"type": "string"}, { "type": "array", "items": {"type": "string"}}]}
"^[a-zA-Z/.0-9_*-]+$": { "anyOf": [{"type": "string"}, { "type": "array", "items": {"type": "string"}}]}
}
},
"logins": {
@ -2034,7 +2034,7 @@ const RoleSpecV2SchemaTemplate = `{
"node_labels": {
"type": "object",
"patternProperties": {
"^[a-zA-Z/.0-9_]$": { "type": "string" }
"^[a-zA-Z/.0-9_-]$": { "type": "string" }
}
},
"namespaces": {

7
lib/services/role_test.go
View file

@ -215,7 +215,7 @@ func (s *RoleSuite) TestRoleParse(c *C) {
in: `{
"kind": "role",
"version": "v3",
"metadata": {"name": "name1"},
"metadata": {"name": "name1", "labels": {"a-b": "c"}},
"spec": {
"options": {
"cert_format": "standard",
@ -225,7 +225,7 @@ func (s *RoleSuite) TestRoleParse(c *C) {
"disconnect_expired_cert": "yes"
},
"allow": {
"node_labels": {"a": "b"},
"node_labels": {"a": "b", "c-d": "e"},
"namespaces": ["default"],
"rules": [
{
@ -249,6 +249,7 @@ func (s *RoleSuite) TestRoleParse(c *C) {
Metadata: Metadata{
Name: "name1",
Namespace: defaults.Namespace,
Labels: map[string]string{"a-b": "c"},
},
Spec: RoleSpecV3{
Options: RoleOptions{
@ -259,7 +260,7 @@ func (s *RoleSuite) TestRoleParse(c *C) {
DisconnectExpiredCert: NewBool(true),
},
Allow: RoleConditions{
NodeLabels: Labels{"a": []string{"b"}},
NodeLabels: Labels{"a": []string{"b"}, "c-d": []string{"e"}},
Namespaces: []string{"default"},
Rules: []Rule{
Rule{