Skip to content

Commit 760c4b7

Browse files
hdurand0710Gopher Bot
authored andcommitted
MINOR: remove deprecated req_ssl_sni replaced with req.ssl_sni
This change only concerns example but it has an effect on the example generated part of the CRDs generated out of the models.
1 parent 37795ba commit 760c4b7

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

config-parser/tests/configs/haproxy_generated.cfg.go

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

config-parser/tests/integration/backend_data_test.go

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

config-parser/tests/use-server_generated_test.go

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

config-parser/types/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,8 +1194,8 @@ type UseFcgiApp struct {
11941194
//name:use-server
11951195
//is:multiple
11961196
//no:parse
1197-
//test:ok:use-server www if { req_ssl_sni -i www.example.com }
1198-
//test:ok:use-server www if { req_ssl_sni -i www.example.com } # comment
1197+
//test:ok:use-server www if { req.ssl_sni -i www.example.com }
1198+
//test:ok:use-server www if { req.ssl_sni -i www.example.com } # comment
11991199
//test:fail:use-server
12001200
type UseServer struct {
12011201
Name string

models/backend_switching_rule.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/server_switching_rule.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7229,7 +7229,7 @@ definitions:
72297229
description: HAProxy backend switching rule configuration (corresponds to use_backend directive)
72307230
example:
72317231
cond: if
7232-
cond_test: '{ req_ssl_sni -i www.example.com }'
7232+
cond_test: '{ req.ssl_sni -i www.example.com }'
72337233
index: 0
72347234
name: test_backend
72357235
properties:
@@ -7272,7 +7272,7 @@ definitions:
72727272
description: HAProxy server switching rule configuration (corresponds to use-server directive)
72737273
example:
72747274
cond: if
7275-
cond_test: '{ req_ssl_sni -i www.example.com }'
7275+
cond_test: '{ req.ssl_sni -i www.example.com }'
72767276
target_server: www
72777277
properties:
72787278
cond:

specification/models/configuration/switching.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ backend_switching_rule:
3333
index: 0
3434
name: test_backend
3535
cond: if
36-
cond_test: "{ req_ssl_sni -i www.example.com }"
36+
cond_test: "{ req.ssl_sni -i www.example.com }"
3737
server_switching_rule:
3838
title: Server Switching Rule
3939
description: HAProxy server switching rule configuration (corresponds to use-server directive)
@@ -66,4 +66,4 @@ server_switching_rule:
6666
example:
6767
target_server: www
6868
cond: if
69-
cond_test: "{ req_ssl_sni -i www.example.com }"
69+
cond_test: "{ req.ssl_sni -i www.example.com }"

0 commit comments

Comments
 (0)