Skip to content

Commit 0b165fa

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 38930d8 commit 0b165fa

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
@@ -1192,8 +1192,8 @@ type UseFcgiApp struct {
11921192
//name:use-server
11931193
//is:multiple
11941194
//no:parse
1195-
//test:ok:use-server www if { req_ssl_sni -i www.example.com }
1196-
//test:ok:use-server www if { req_ssl_sni -i www.example.com } # comment
1195+
//test:ok:use-server www if { req.ssl_sni -i www.example.com }
1196+
//test:ok:use-server www if { req.ssl_sni -i www.example.com } # comment
11971197
//test:fail:use-server
11981198
type UseServer struct {
11991199
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
@@ -6796,7 +6796,7 @@ definitions:
67966796
description: HAProxy backend switching rule configuration (corresponds to use_backend directive)
67976797
example:
67986798
cond: if
6799-
cond_test: '{ req_ssl_sni -i www.example.com }'
6799+
cond_test: '{ req.ssl_sni -i www.example.com }'
68006800
index: 0
68016801
name: test_backend
68026802
properties:
@@ -6843,7 +6843,7 @@ definitions:
68436843
description: HAProxy server switching rule configuration (corresponds to use-server directive)
68446844
example:
68456845
cond: if
6846-
cond_test: '{ req_ssl_sni -i www.example.com }'
6846+
cond_test: '{ req.ssl_sni -i www.example.com }'
68476847
index: 0
68486848
target_server: www
68496849
properties:

specification/models/configuration/switching.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ backend_switching_rule:
3737
index: 0
3838
name: test_backend
3939
cond: if
40-
cond_test: "{ req_ssl_sni -i www.example.com }"
40+
cond_test: "{ req.ssl_sni -i www.example.com }"
4141
server_switching_rule:
4242
title: Server Switching Rule
4343
description: HAProxy server switching rule configuration (corresponds to use-server directive)
@@ -75,4 +75,4 @@ server_switching_rule:
7575
index: 0
7676
target_server: www
7777
cond: if
78-
cond_test: "{ req_ssl_sni -i www.example.com }"
78+
cond_test: "{ req.ssl_sni -i www.example.com }"

0 commit comments

Comments
 (0)