Skip to content

Commit 08085e9

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 4deceff commit 08085e9

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
@@ -1320,8 +1320,8 @@ type UseFcgiApp struct {
13201320
//name:use-server
13211321
//is:multiple
13221322
//no:parse
1323-
//test:ok:use-server www if { req_ssl_sni -i www.example.com }
1324-
//test:ok:use-server www if { req_ssl_sni -i www.example.com } # comment
1323+
//test:ok:use-server www if { req.ssl_sni -i www.example.com }
1324+
//test:ok:use-server www if { req.ssl_sni -i www.example.com } # comment
13251325
//test:fail:use-server
13261326
type UseServer struct {
13271327
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
@@ -7914,7 +7914,7 @@ definitions:
79147914
description: HAProxy backend switching rule configuration (corresponds to use_backend directive)
79157915
example:
79167916
cond: if
7917-
cond_test: '{ req_ssl_sni -i www.example.com }'
7917+
cond_test: '{ req.ssl_sni -i www.example.com }'
79187918
index: 0
79197919
name: test_backend
79207920
properties:
@@ -7960,7 +7960,7 @@ definitions:
79607960
description: HAProxy server switching rule configuration (corresponds to use-server directive)
79617961
example:
79627962
cond: if
7963-
cond_test: '{ req_ssl_sni -i www.example.com }'
7963+
cond_test: '{ req.ssl_sni -i www.example.com }'
79647964
target_server: www
79657965
properties:
79667966
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)