Skip to content

Commit ad313b8

Browse files
committed
MINOR: specification: allow HAProxy variables in object name fields
Relax name regex on peer entries, nameservers, mailer entries, userlist groups/users, and frontend log_tag to accept ${VAR} substitution. Section names are unchanged.
1 parent 6d3828d commit ad313b8

12 files changed

Lines changed: 30 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
@@ -3602,7 +3602,7 @@ definitions:
36023602
x-go-name: LogSteps
36033603
x-omitempty: true
36043604
log_tag:
3605-
pattern: ^[A-Za-z0-9-_.:]+$
3605+
pattern: ^[A-Za-z0-9-_.:${}]+$
36063606
type: string
36073607
logasap:
36083608
enum:
@@ -4535,7 +4535,7 @@ definitions:
45354535
secure_password:
45364536
type: boolean
45374537
username:
4538-
pattern: ^[A-Za-z0-9-_.:]+$
4538+
pattern: ^[A-Za-z0-9-_.:${}]+$
45394539
type: string
45404540
x-nullable: false
45414541
required:
@@ -4557,7 +4557,7 @@ definitions:
45574557
additionalProperties:
45584558
type: object
45594559
name:
4560-
pattern: ^[A-Za-z0-9-_.:]+$
4560+
pattern: ^[A-Za-z0-9-_.:${}]+$
45614561
type: string
45624562
x-nullable: false
45634563
users:
@@ -4623,7 +4623,7 @@ definitions:
46234623
additionalProperties:
46244624
type: object
46254625
name:
4626-
pattern: ^[A-Za-z0-9-_]+$
4626+
pattern: ^[A-Za-z0-9-_${}]+$
46274627
type: string
46284628
x-nullable: false
46294629
port:
@@ -4712,7 +4712,7 @@ definitions:
47124712
additionalProperties:
47134713
type: object
47144714
name:
4715-
pattern: ^[A-Za-z0-9-_.:]+$
4715+
pattern: ^[A-Za-z0-9-_.:${}]+$
47164716
type: string
47174717
x-nullable: false
47184718
port:
@@ -11067,7 +11067,7 @@ definitions:
1106711067
additionalProperties:
1106811068
type: object
1106911069
name:
11070-
pattern: ^[A-Za-z0-9-_.:]+$
11070+
pattern: ^[A-Za-z0-9-_.:${}]+$
1107111071
type: string
1107211072
x-nullable: false
1107311073
port:

specification/models/configuration/frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ frontend_base:
9292
x-display-name: Log Format SD
9393
log_tag:
9494
type: string
95-
pattern: '^[A-Za-z0-9-_.:]+$'
95+
pattern: '^[A-Za-z0-9-_.:${}]+$'
9696
log_steps:
9797
type: array
9898
x-omitempty: true

specification/models/configuration/mailers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ mailer_entry:
4343
properties:
4444
name:
4545
type: string
46-
pattern: '^[A-Za-z0-9-_]+$'
46+
pattern: '^[A-Za-z0-9-_${}]+$'
4747
x-nullable: false
4848
address:
4949
type: string

specification/models/configuration/peers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ peer_entry:
6363
properties:
6464
name:
6565
type: string
66-
pattern: '^[A-Za-z0-9-_.:]+$'
66+
pattern: '^[A-Za-z0-9-_.:${}]+$'
6767
x-nullable: false
6868
address:
6969
type: string

0 commit comments

Comments
 (0)