Skip to content

Commit ccee93b

Browse files
committed
BUG/MINOR: spec: add " to name regexes to support variable names
1 parent 843d212 commit ccee93b

13 files changed

Lines changed: 150 additions & 30 deletions

File tree

models/frontend.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
@@ -2660,7 +2660,7 @@ definitions:
26602660
- disabled
26612661
type: string
26622662
log_tag:
2663-
pattern: ^[A-Za-z0-9-_.:]+$
2663+
pattern: ^[A-Za-z0-9-_.:${}"]+$
26642664
type: string
26652665
logasap:
26662666
enum:
@@ -3437,7 +3437,7 @@ definitions:
34373437
secure_password:
34383438
type: boolean
34393439
username:
3440-
pattern: ^[A-Za-z0-9-_.:]+$
3440+
pattern: ^[A-Za-z0-9-_.:${}"]+$
34413441
type: string
34423442
x-nullable: false
34433443
required:
@@ -3456,7 +3456,7 @@ definitions:
34563456
description: HAProxy userlist group
34573457
properties:
34583458
name:
3459-
pattern: ^[A-Za-z0-9-_.:]+$
3459+
pattern: ^[A-Za-z0-9-_.:${}"]+$
34603460
type: string
34613461
x-nullable: false
34623462
users:
@@ -3503,7 +3503,7 @@ definitions:
35033503
type: string
35043504
x-nullable: false
35053505
name:
3506-
pattern: ^[A-Za-z0-9-_]+$
3506+
pattern: ^[A-Za-z0-9-_${}"]+$
35073507
type: string
35083508
x-nullable: false
35093509
port:
@@ -3563,7 +3563,7 @@ definitions:
35633563
pattern: ^[^\s]+$
35643564
type: string
35653565
name:
3566-
pattern: ^[A-Za-z0-9-_.:]+$
3566+
pattern: ^[A-Za-z0-9-_.:${}"]+$
35673567
type: string
35683568
x-nullable: false
35693569
port:
@@ -9590,7 +9590,7 @@ definitions:
95909590
pattern: ^[^\s]+$
95919591
type: string
95929592
name:
9593-
pattern: ^[A-Za-z0-9-_.:]+$
9593+
pattern: ^[A-Za-z0-9-_.:${}"]+$
95949594
type: string
95959595
x-nullable: false
95969596
port:

specification/models/configuration/frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ frontend:
4848
x-display-name: Log Format SD
4949
log_tag:
5050
type: string
51-
pattern: '^[A-Za-z0-9-_.:]+$'
51+
pattern: '^[A-Za-z0-9-_.:${}"]+$'
5252
log_separate_errors:
5353
type: string
5454
enum: [enabled, disabled]

specification/models/configuration/mailers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mailer_entry:
2727
properties:
2828
name:
2929
type: string
30-
pattern: '^[A-Za-z0-9-_]+$'
30+
pattern: '^[A-Za-z0-9-_${}"]+$'
3131
x-nullable: false
3232
address:
3333
type: string

specification/models/configuration/peers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ peer_entry:
3737
properties:
3838
name:
3939
type: string
40-
pattern: '^[A-Za-z0-9-_.:]+$'
40+
pattern: '^[A-Za-z0-9-_.:${}"]+$'
4141
x-nullable: false
4242
address:
4343
type: string

0 commit comments

Comments
 (0)