Skip to content

Commit 4c21b71

Browse files
committed
CLEANUP/MINOR: spec: fix names to match snake case in spec
1 parent 3e40044 commit 4c21b71

File tree

9 files changed

+49
-49
lines changed

9 files changed

+49
-49
lines changed

models/fcgi_app_base.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/fcgi_apps.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/fcgi_log_stderr.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/fcgi_pass_header.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/fcgi_set_param.go

Lines changed: 1 addition & 1 deletion
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: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ definitions:
5454
type: array
5555
items:
5656
$ref: "#/definitions/program"
57-
fcgiApp:
57+
fcgi_app:
5858
allOf:
59-
- $ref: '#/definitions/fcgiAppBase'
59+
- $ref: '#/definitions/fcgi_app_base'
6060
- properties:
6161
acl_list:
6262
$ref: '#/definitions/acls'
@@ -65,7 +65,7 @@ definitions:
6565
description: App with all it's children resources
6666
type: object
6767
x-go-name: FCGIApp
68-
fcgiAppBase:
68+
fcgi_app_base:
6969
description: HAProxy FastCGI application configuration
7070
properties:
7171
docroot:
@@ -88,7 +88,7 @@ definitions:
8888
type: string
8989
log_stderrs:
9090
items:
91-
$ref: '#/definitions/fcgiLogStderr'
91+
$ref: '#/definitions/fcgi_log_stderr'
9292
x-go-name: FCGIAppLogStderr
9393
type: array
9494
x-omitempty: true
@@ -113,7 +113,7 @@ definitions:
113113
x-nullable: false
114114
pass_headers:
115115
items:
116-
$ref: '#/definitions/fcgiPassHeader'
116+
$ref: '#/definitions/fcgi_pass_header'
117117
x-go-name: FCGIAppLogPassHeader
118118
type: array
119119
x-omitempty: true
@@ -125,19 +125,19 @@ definitions:
125125
type: string
126126
set_params:
127127
items:
128-
$ref: '#/definitions/fcgiSetParam'
128+
$ref: '#/definitions/fcgi_set_param'
129129
type: array
130130
x-omitempty: true
131131
required:
132132
- name
133133
- docroot
134134
title: FCGI application base
135135
type: object
136-
fcgiApps:
136+
fcgi_apps:
137137
type: array
138138
items:
139-
$ref: "#/definitions/fcgiApp"
140-
fcgiSetParam:
139+
$ref: "#/definitions/fcgi_app"
140+
fcgi_set_param:
141141
description: |-
142142
Sets a FastCGI parameter to pass to this application.
143143
Its value, defined by <format> can take a formatted string, the same as the log directive.
@@ -160,7 +160,7 @@ definitions:
160160
name:
161161
type: string
162162
type: object
163-
fcgiPassHeader:
163+
fcgi_pass_header:
164164
description: |-
165165
Specifies the name of a request header to pass to the FastCGI application.
166166
Optionally, you can follow it with an ACL-based condition, in which case the FastCGI application evaluates it only if the condition is true.
@@ -184,7 +184,7 @@ definitions:
184184
name:
185185
type: string
186186
type: object
187-
fcgiLogStderr:
187+
fcgi_log_stderr:
188188
description: |-
189189
Enables logging of STDERR messages that the FastCGI application reports.
190190
It is an optional setting. By default, HAProxy Enterprise ignores STDERR messages.
@@ -14898,7 +14898,7 @@ paths:
1489814898
description: Configuration file version
1489914899
type: string
1490014900
schema:
14901-
$ref: '#/definitions/fcgiApps'
14901+
$ref: '#/definitions/fcgi_apps'
1490214902
default:
1490314903
$ref: '#/responses/DefaultError'
1490414904
summary: Return an array of FCGI apps
@@ -14912,7 +14912,7 @@ paths:
1491214912
name: data
1491314913
required: true
1491414914
schema:
14915-
$ref: '#/definitions/fcgiApp'
14915+
$ref: '#/definitions/fcgi_app'
1491614916
- $ref: '#/parameters/transaction_id'
1491714917
- $ref: '#/parameters/version'
1491814918
- $ref: '#/parameters/force_reload'
@@ -14921,15 +14921,15 @@ paths:
1492114921
"201":
1492214922
description: Application created
1492314923
schema:
14924-
$ref: '#/definitions/fcgiApp'
14924+
$ref: '#/definitions/fcgi_app'
1492514925
"202":
1492614926
description: Configuration change accepted and reload requested
1492714927
headers:
1492814928
Reload-ID:
1492914929
description: ID of the requested reload
1493014930
type: string
1493114931
schema:
14932-
$ref: '#/definitions/fcgiApp'
14932+
$ref: '#/definitions/fcgi_app'
1493314933
"400":
1493414934
$ref: '#/responses/BadRequest'
1493514935
"409":
@@ -14987,7 +14987,7 @@ paths:
1498714987
description: Configuration file version
1498814988
type: string
1498914989
schema:
14990-
$ref: '#/definitions/fcgiApp'
14990+
$ref: '#/definitions/fcgi_app'
1499114991
"404":
1499214992
$ref: '#/responses/NotFound'
1499314993
default:
@@ -15008,7 +15008,7 @@ paths:
1500815008
name: data
1500915009
required: true
1501015010
schema:
15011-
$ref: '#/definitions/fcgiApp'
15011+
$ref: '#/definitions/fcgi_app'
1501215012
- $ref: '#/parameters/transaction_id'
1501315013
- $ref: '#/parameters/version'
1501415014
- $ref: '#/parameters/force_reload'
@@ -15017,15 +15017,15 @@ paths:
1501715017
"200":
1501815018
description: Application replaced
1501915019
schema:
15020-
$ref: '#/definitions/fcgiApp'
15020+
$ref: '#/definitions/fcgi_app'
1502115021
"202":
1502215022
description: Configuration change accepted and reload requested
1502315023
headers:
1502415024
Reload-ID:
1502515025
description: ID of the requested reload
1502615026
type: string
1502715027
schema:
15028-
$ref: '#/definitions/fcgiApp'
15028+
$ref: '#/definitions/fcgi_app'
1502915029
"400":
1503015030
$ref: '#/responses/BadRequest'
1503115031
"404":

specification/haproxy-spec.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ definitions:
2020
type: array
2121
items:
2222
$ref: "#/definitions/program"
23-
fcgiApp:
23+
fcgi_app:
2424
$ref: "models/configuration/fcgi.yaml#/app"
25-
fcgiAppBase:
25+
fcgi_app_base:
2626
$ref: "models/configuration/fcgi.yaml#/app_base"
27-
fcgiApps:
27+
fcgi_apps:
2828
type: array
2929
items:
30-
$ref: "#/definitions/fcgiApp"
31-
fcgiSetParam:
32-
$ref: "models/configuration/fcgi.yaml#/setParam"
33-
fcgiPassHeader:
34-
$ref: "models/configuration/fcgi.yaml#/passHeader"
35-
fcgiLogStderr:
36-
$ref: "models/configuration/fcgi.yaml#/logStderr"
30+
$ref: "#/definitions/fcgi_app"
31+
fcgi_set_param:
32+
$ref: "models/configuration/fcgi.yaml#/set_param"
33+
fcgi_pass_header:
34+
$ref: "models/configuration/fcgi.yaml#/pass_header"
35+
fcgi_log_stderr:
36+
$ref: "models/configuration/fcgi.yaml#/log_stderr"
3737
bind_params:
3838
$ref: "models/configuration/bind_params.yaml#/bind_params"
3939
server_params:

specification/models/configuration/fcgi.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ app:
44
description: App with all it's children resources
55
x-go-name: FCGIApp
66
allOf:
7-
- $ref: "#/definitions/fcgiAppBase"
7+
- $ref: "#/definitions/fcgi_app_base"
88
- type: object
99
properties:
1010
acl_list:
@@ -34,13 +34,13 @@ app_base:
3434
x-omitempty: true
3535
items:
3636
x-go-name: FCGIAppLogStderr
37-
$ref: "#/definitions/fcgiLogStderr"
37+
$ref: "#/definitions/fcgi_log_stderr"
3838
pass_headers:
3939
type: array
4040
x-omitempty: true
4141
items:
4242
x-go-name: FCGIAppLogPassHeader
43-
$ref: "#/definitions/fcgiPassHeader"
43+
$ref: "#/definitions/fcgi_pass_header"
4444
path_info:
4545
type: string
4646
description: |-
@@ -68,12 +68,12 @@ app_base:
6868
type: array
6969
x-omitempty: true
7070
items:
71-
$ref: "#/definitions/fcgiSetParam"
71+
$ref: "#/definitions/fcgi_set_param"
7272
metadata:
7373
additionalProperties:
7474
type: object
7575

76-
setParam:
76+
set_param:
7777
description: |-
7878
Sets a FastCGI parameter to pass to this application.
7979
Its value, defined by <format> can take a formatted string, the same as the log directive.
@@ -95,7 +95,7 @@ setParam:
9595
cond:
9696
required: true
9797

98-
passHeader:
98+
pass_header:
9999
description: |-
100100
Specifies the name of a request header to pass to the FastCGI application.
101101
Optionally, you can follow it with an ACL-based condition, in which case the FastCGI application evaluates it only if the condition is true.
@@ -118,7 +118,7 @@ passHeader:
118118
cond:
119119
required: true
120120

121-
logStderr:
121+
log_stderr:
122122
description: |-
123123
Enables logging of STDERR messages that the FastCGI application reports.
124124
It is an optional setting. By default, HAProxy Enterprise ignores STDERR messages.

specification/paths/configuration/fcgi-app.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apps:
1717
description: Configuration file version
1818
type: string
1919
schema:
20-
$ref: "#/definitions/fcgiApps"
20+
$ref: "#/definitions/fcgi_apps"
2121
'default':
2222
$ref: '#/responses/DefaultError'
2323
post:
@@ -29,7 +29,7 @@ apps:
2929
required: true
3030
in: body
3131
schema:
32-
$ref: "#/definitions/fcgiApp"
32+
$ref: "#/definitions/fcgi_app"
3333
- $ref: "#/parameters/transaction_id"
3434
- $ref: "#/parameters/version"
3535
- $ref: "#/parameters/force_reload"
@@ -44,11 +44,11 @@ apps:
4444
description: ID of the requested reload
4545
type: string
4646
schema:
47-
$ref: "#/definitions/fcgiApp"
47+
$ref: "#/definitions/fcgi_app"
4848
'201':
4949
description: Application created
5050
schema:
51-
$ref: "#/definitions/fcgiApp"
51+
$ref: "#/definitions/fcgi_app"
5252
'409':
5353
$ref: '#/responses/AlreadyExists'
5454
'400':
@@ -78,7 +78,7 @@ apps_one:
7878
description: Configuration file version
7979
type: string
8080
schema:
81-
$ref: "#/definitions/fcgiApp"
81+
$ref: "#/definitions/fcgi_app"
8282
'404':
8383
$ref: '#/responses/NotFound'
8484
'default':
@@ -99,7 +99,7 @@ apps_one:
9999
required: true
100100
in: body
101101
schema:
102-
$ref: "#/definitions/fcgiApp"
102+
$ref: "#/definitions/fcgi_app"
103103
- $ref: "#/parameters/transaction_id"
104104
- $ref: "#/parameters/version"
105105
- $ref: "#/parameters/force_reload"
@@ -112,11 +112,11 @@ apps_one:
112112
description: ID of the requested reload
113113
type: string
114114
schema:
115-
$ref: "#/definitions/fcgiApp"
115+
$ref: "#/definitions/fcgi_app"
116116
'200':
117117
description: Application replaced
118118
schema:
119-
$ref: "#/definitions/fcgiApp"
119+
$ref: "#/definitions/fcgi_app"
120120
'400':
121121
$ref: '#/responses/BadRequest'
122122
'404':

0 commit comments

Comments
 (0)