@marcel91200 / caddy Mirror · read-only / commits / dd5decab
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 12, 07:00 UTC

tests: fix caddyfile adapt warnings (#6619)

Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>

Mohammed Al Sahaf committed Oct 10, 2024 at 22:38 UTC dd5decabe7379a069c3b198e0930ec94d75c7bd4
3 files changed +12 -10
caddytest/integration/caddyfile_adapt/acme_server_sign_with_root.caddyfiletest
+2 -2
@@ -5,15 +5,15 @@
5 root_cn "Internal Root Cert"
6 intermediate_cn "Internal Intermediate Cert"
7 }
8 - }
8 + }
9 }
10 -
10 acme.example.com {
11 acme_server {
12 ca internal
13 sign_with_root
14 }
15 }
16 +
17 ----------
18 {
19 "apps": {
caddytest/integration/caddyfile_adapt/heredoc.caddyfiletest
+2 -1
@@ -1,11 +1,12 @@
1 example.com {
2 - respond <<EOF
2 + respond <<EOF
3 <html>
4 <head><title>Foo</title>
5 <body>Foo</body>
6 </html>
7 EOF 200
8 }
9 +
10 ----------
11 {
12 "apps": {
caddytest/integration/caddyfile_adapt/map_and_vars_with_raw_types.caddyfiletest
+8 -7
@@ -1,23 +1,23 @@
1 example.com
2
3 -map {host} {my_placeholder} {magic_number} {
3 +map {host} {my_placeholder} {magic_number} {
4 # Should output boolean "true" and an integer
5 - example.com true 3
5 + example.com true 3
6
7 # Should output a string and null
8 - foo.example.com "string value"
8 + foo.example.com "string value"
9
10 # Should output two strings (quoted int)
11 - (.*)\.example.com "${1} subdomain" "5"
11 + (.*)\.example.com "${1} subdomain" "5"
12
13 # Should output null and a string (quoted int)
14 - ~.*\.net$ - `7`
14 + ~.*\.net$ - `7`
15
16 # Should output a float and the string "false"
17 - ~.*\.xyz$ 123.456 "false"
17 + ~.*\.xyz$ 123.456 "false"
18
19 # Should output two strings, second being escaped quote
20 - default "unknown domain" \"""
20 + default "unknown domain" \"""
21 }
22
23 vars foo bar
@@ -27,6 +27,7 @@ vars {
27 ghi 2.3
28 jkl "mn op"
29 }
30 +
31 ----------
32 {
33 "apps": {