Skip to content

Commit 8a9576e

Browse files
committed
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 8314678 commit 8a9576e

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
@@ -1322,8 +1322,8 @@ type UseFcgiApp struct {
13221322
//name:use-server
13231323
//is:multiple
13241324
//no:parse
1325-
//test:ok:use-server www if { req_ssl_sni -i www.example.com }
1326-
//test:ok:use-server www if { req_ssl_sni -i www.example.com } # comment
1325+
//test:ok:use-server www if { req.ssl_sni -i www.example.com }
1326+
//test:ok:use-server www if { req.ssl_sni -i www.example.com } # comment
13271327
//test:fail:use-server
13281328
type UseServer struct {
13291329
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
@@ -7921,7 +7921,7 @@ definitions:
79217921
description: HAProxy backend switching rule configuration (corresponds to use_backend directive)
79227922
example:
79237923
cond: if
7924-
cond_test: '{ req_ssl_sni -i www.example.com }'
7924+
cond_test: '{ req.ssl_sni -i www.example.com }'
79257925
index: 0
79267926
name: test_backend
79277927
properties:
@@ -7967,7 +7967,7 @@ definitions:
79677967
description: HAProxy server switching rule configuration (corresponds to use-server directive)
79687968
example:
79697969
cond: if
7970-
cond_test: '{ req_ssl_sni -i www.example.com }'
7970+
cond_test: '{ req.ssl_sni -i www.example.com }'
79717971
target_server: www
79727972
properties:
79737973
cond:

specification/models/configuration/switching.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ backend_switching_rule:
3636
index: 0
3737
name: test_backend
3838
cond: if
39-
cond_test: "{ req_ssl_sni -i www.example.com }"
39+
cond_test: "{ req.ssl_sni -i www.example.com }"
4040
server_switching_rule:
4141
title: Server Switching Rule
4242
description: HAProxy server switching rule configuration (corresponds to use-server directive)
@@ -72,4 +72,4 @@ server_switching_rule:
7272
example:
7373
target_server: www
7474
cond: if
75-
cond_test: "{ req_ssl_sni -i www.example.com }"
75+
cond_test: "{ req.ssl_sni -i www.example.com }"

0 commit comments

Comments
 (0)