BUG/MINOR: http-request: fix enum for default-errorfile in return action

haproxytech · Feb 14, 2024 · b462418 · b462418
1 parent c8aff4c
commit b462418
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/models/http_error_rule.go b/models/http_error_rule.go
diff --git a/models/http_request_rule.go b/models/http_request_rule.go
diff --git a/models/http_response_rule.go b/models/http_response_rule.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -3951,7 +3951,7 @@ definitions:
                           - lf-string
           return_content_format:
               enum:
-                  - default-errorfile
+                  - default-errorfiles
                   - errorfile
                   - errorfiles
                   - file
@@ -4534,7 +4534,7 @@ definitions:
                           - lf-string
           return_content_format:
               enum:
-                  - default-errorfile
+                  - default-errorfiles
                   - errorfile
                   - errorfiles
                   - file
@@ -5079,7 +5079,7 @@ definitions:
                           - lf-string
           return_content_format:
               enum:
-                  - default-errorfile
+                  - default-errorfiles
                   - errorfile
                   - errorfiles
                   - file

diff --git a/specification/models/configuration/http/error.yaml b/specification/models/configuration/http/error.yaml
@@ -33,7 +33,7 @@ http_error_rule:
       x-nullable: true
     return_content_format:
       type: string
-      enum: [default-errorfile, errorfile, errorfiles, file, lf-file, string, lf-string]
+      enum: [default-errorfiles, errorfile, errorfiles, file, lf-file, string, lf-string]
       x-dependency:
         type:
           value: status

diff --git a/specification/models/configuration/http/request.yaml b/specification/models/configuration/http/request.yaml
@@ -531,7 +531,7 @@ http_request_rule:
       x-nullable: true
     return_content_format:
       type: string
-      enum: [default-errorfile, errorfile, errorfiles, file, lf-file, string, lf-string]
+      enum: [default-errorfiles, errorfile, errorfiles, file, lf-file, string, lf-string]
       x-dependency:
         type:
           value: [deny, tarpit, return]

diff --git a/specification/models/configuration/http/response.yaml b/specification/models/configuration/http/response.yaml
@@ -377,7 +377,7 @@ http_response_rule:
       x-nullable: true
     return_content_format:
       type: string
-      enum: [default-errorfile, errorfile, errorfiles, file, lf-file, string, lf-string]
+      enum: [default-errorfiles, errorfile, errorfiles, file, lf-file, string, lf-string]
       x-dependency:
         type:
           value: [deny, return]