tests: fix caddyfile adapt warnings (#6619)

mohammed90 · web-flow · commit dd5decabe737 · 2024-10-10T13:38:49.000-06:00
Signed-off-by: Mohammed Al Sahaf &lt;msaa1990@gmail.com&gt;
diff --git a/caddytest/integration/caddyfile_adapt/acme_server_sign_with_root.caddyfiletest b/caddytest/integration/caddyfile_adapt/acme_server_sign_with_root.caddyfiletest
@@ -5,15 +5,15 @@
 			root_cn "Internal Root Cert"
 			intermediate_cn "Internal Intermediate Cert"
 		}
-    }
+	}
 }
-
 acme.example.com {
 	acme_server {
 		ca internal
 		sign_with_root
 	}
 }
+
 ----------
 {
 	"apps": {
diff --git a/caddytest/integration/caddyfile_adapt/heredoc.caddyfiletest b/caddytest/integration/caddyfile_adapt/heredoc.caddyfiletest
@@ -1,11 +1,12 @@
 example.com {
-    respond <<EOF
+	respond <<EOF
     <html>
       <head><title>Foo</title>
       <body>Foo</body>
     </html>
     EOF 200
 }
+
 ----------
 {
 	"apps": {
diff --git a/caddytest/integration/caddyfile_adapt/map_and_vars_with_raw_types.caddyfiletest b/caddytest/integration/caddyfile_adapt/map_and_vars_with_raw_types.caddyfiletest
@@ -1,23 +1,23 @@
 example.com
 
-map {host}             {my_placeholder}  {magic_number} {
+map {host} {my_placeholder} {magic_number} {
 	# Should output boolean "true" and an integer
-	example.com        true              3
+	example.com true 3
 
 	# Should output a string and null
-	foo.example.com    "string value"
+	foo.example.com "string value"
 
 	# Should output two strings (quoted int)
-	(.*)\.example.com  "${1} subdomain"  "5"
+	(.*)\.example.com "${1} subdomain" "5"
 
 	# Should output null and a string (quoted int)
-	~.*\.net$          -                 `7`
+	~.*\.net$ - `7`
 
 	# Should output a float and the string "false"
-	~.*\.xyz$          123.456           "false"
+	~.*\.xyz$ 123.456 "false"
 
 	# Should output two strings, second being escaped quote
-	default            "unknown domain"  \"""
+	default "unknown domain" \"""
 }
 
 vars foo bar
@@ -27,6 +27,7 @@ vars {
 	ghi 2.3
 	jkl "mn op"
 }
+
 ----------
 {
 	"apps": {

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`root_cn "Internal Root Cert"`
`6`	`6`	`intermediate_cn "Internal Intermediate Cert"`
`7`	`7`	`}`
`8`		`- }`
	`8`	`+ }`
`9`	`9`	`}`
`10`		`-`
`11`	`10`	`acme.example.com {`
`12`	`11`	`acme_server {`
`13`	`12`	`ca internal`
`14`	`13`	`sign_with_root`
`15`	`14`	`}`
`16`	`15`	`}`
	`16`	`+`
`17`	`17`	`----------`
`18`	`18`	`{`
`19`	`19`	`"apps": {`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`example.com {`
`2`		`- respond <<EOF`
	`2`	`+ respond <<EOF`
`3`	`3`	`<html>`
`4`	`4`	`<head><title>Foo</title>`
`5`	`5`	`<body>Foo</body>`
`6`	`6`	`</html>`
`7`	`7`	`EOF 200`
`8`	`8`	`}`
	`9`	`+`
`9`	`10`	`----------`
`10`	`11`	`{`
`11`	`12`	`"apps": {`