Skip to content

Commit b98628a

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 caaa49b commit b98628a

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
@@ -1294,8 +1294,8 @@ type UseFcgiApp struct {
12941294
//name:use-server
12951295
//is:multiple
12961296
//no:parse
1297-
//test:ok:use-server www if { req_ssl_sni -i www.example.com }
1298-
//test:ok:use-server www if { req_ssl_sni -i www.example.com } # comment
1297+
//test:ok:use-server www if { req.ssl_sni -i www.example.com }
1298+
//test:ok:use-server www if { req.ssl_sni -i www.example.com } # comment
12991299
//test:fail:use-server
13001300
type UseServer struct {
13011301
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
@@ -7835,7 +7835,7 @@ definitions:
78357835
description: HAProxy backend switching rule configuration (corresponds to use_backend directive)
78367836
example:
78377837
cond: if
7838-
cond_test: '{ req_ssl_sni -i www.example.com }'
7838+
cond_test: '{ req.ssl_sni -i www.example.com }'
78397839
index: 0
78407840
name: test_backend
78417841
properties:
@@ -7881,7 +7881,7 @@ definitions:
78817881
description: HAProxy server switching rule configuration (corresponds to use-server directive)
78827882
example:
78837883
cond: if
7884-
cond_test: '{ req_ssl_sni -i www.example.com }'
7884+
cond_test: '{ req.ssl_sni -i www.example.com }'
78857885
target_server: www
78867886
properties:
78877887
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)