Skip to content

Commit d7e1d8a

Browse files
committed
BUG/MINOR: spec: add " to name regexes to support variable names
1 parent e542128 commit d7e1d8a

13 files changed

Lines changed: 150 additions & 30 deletions

File tree

models/frontend_base.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/group.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/mailer_entry.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/nameserver.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/peer_entry.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/user.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3056,7 +3056,7 @@ definitions:
30563056
- disabled
30573057
type: string
30583058
log_tag:
3059-
pattern: ^[A-Za-z0-9-_.:${}]+$
3059+
pattern: ^[A-Za-z0-9-_.:${}"]+$
30603060
type: string
30613061
logasap:
30623062
enum:
@@ -3942,7 +3942,7 @@ definitions:
39423942
secure_password:
39433943
type: boolean
39443944
username:
3945-
pattern: ^[A-Za-z0-9-_.:${}]+$
3945+
pattern: ^[A-Za-z0-9-_.:${}"]+$
39463946
type: string
39473947
x-nullable: false
39483948
required:
@@ -3961,7 +3961,7 @@ definitions:
39613961
description: HAProxy userlist group
39623962
properties:
39633963
name:
3964-
pattern: ^[A-Za-z0-9-_.:${}]+$
3964+
pattern: ^[A-Za-z0-9-_.:${}"]+$
39653965
type: string
39663966
x-nullable: false
39673967
users:
@@ -4021,7 +4021,7 @@ definitions:
40214021
type: string
40224022
x-nullable: false
40234023
name:
4024-
pattern: ^[A-Za-z0-9-_${}]+$
4024+
pattern: ^[A-Za-z0-9-_${}"]+$
40254025
type: string
40264026
x-nullable: false
40274027
port:
@@ -4104,7 +4104,7 @@ definitions:
41044104
pattern: ^[^\s]+$
41054105
type: string
41064106
name:
4107-
pattern: ^[A-Za-z0-9-_.:${}]+$
4107+
pattern: ^[A-Za-z0-9-_.:${}"]+$
41084108
type: string
41094109
x-nullable: false
41104110
port:
@@ -10015,7 +10015,7 @@ definitions:
1001510015
pattern: ^[^\s]+$
1001610016
type: string
1001710017
name:
10018-
pattern: ^[A-Za-z0-9-_.:${}]+$
10018+
pattern: ^[A-Za-z0-9-_.:${}"]+$
1001910019
type: string
1002010020
x-nullable: false
1002110021
port:

specification/models/configuration/frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ frontend_base:
8686
x-display-name: Log Format SD
8787
log_tag:
8888
type: string
89-
pattern: '^[A-Za-z0-9-_.:${}]+$'
89+
pattern: '^[A-Za-z0-9-_.:${}"]+$'
9090
log_separate_errors:
9191
type: string
9292
enum: [enabled, disabled]

specification/models/configuration/mailers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mailer_entry:
4040
properties:
4141
name:
4242
type: string
43-
pattern: '^[A-Za-z0-9-_${}]+$'
43+
pattern: '^[A-Za-z0-9-_${}"]+$'
4444
x-nullable: false
4545
address:
4646
type: string

specification/models/configuration/peers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ peer_entry:
6060
properties:
6161
name:
6262
type: string
63-
pattern: '^[A-Za-z0-9-_.:${}]+$'
63+
pattern: '^[A-Za-z0-9-_.:${}"]+$'
6464
x-nullable: false
6565
address:
6666
type: string

0 commit comments

Comments
 (0)