From cee4441cb1d485b38d728168a315cda5641d84fb Mon Sep 17 00:00:00 2001
From: WeidiDeng <weidi_deng@icloud.com>
Date: Tue, 23 May 2023 05:36:55 +0800
Subject: caddyfile: Do not replace import tokens if they are part of a snippet
 (#5539)

* fix variadic placeholder in imported file which also imports

* fix tests.

* skip replacing args when imported token may be part of a snippet
---
 caddyconfig/httpcaddyfile/testdata/import_variadic.txt    |  9 +++++++++
 .../httpcaddyfile/testdata/import_variadic_snippet.txt    |  9 +++++++++
 .../testdata/import_variadic_with_import.txt              | 15 +++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 caddyconfig/httpcaddyfile/testdata/import_variadic.txt
 create mode 100644 caddyconfig/httpcaddyfile/testdata/import_variadic_snippet.txt
 create mode 100644 caddyconfig/httpcaddyfile/testdata/import_variadic_with_import.txt

(limited to 'caddyconfig/httpcaddyfile/testdata')

diff --git a/caddyconfig/httpcaddyfile/testdata/import_variadic.txt b/caddyconfig/httpcaddyfile/testdata/import_variadic.txt
new file mode 100644
index 0000000..f1e50e0
--- /dev/null
+++ b/caddyconfig/httpcaddyfile/testdata/import_variadic.txt
@@ -0,0 +1,9 @@
+(t2) {
+    respond 200 {
+        body {args[:]}
+    }
+}
+
+:8082 {
+    import t2 false
+}
\ No newline at end of file
diff --git a/caddyconfig/httpcaddyfile/testdata/import_variadic_snippet.txt b/caddyconfig/httpcaddyfile/testdata/import_variadic_snippet.txt
new file mode 100644
index 0000000..a02fcf9
--- /dev/null
+++ b/caddyconfig/httpcaddyfile/testdata/import_variadic_snippet.txt
@@ -0,0 +1,9 @@
+(t1) {
+    respond 200 {
+        body {args[:]}
+    }
+}
+
+:8081 {
+    import t1 false
+}
\ No newline at end of file
diff --git a/caddyconfig/httpcaddyfile/testdata/import_variadic_with_import.txt b/caddyconfig/httpcaddyfile/testdata/import_variadic_with_import.txt
new file mode 100644
index 0000000..ab1b32d
--- /dev/null
+++ b/caddyconfig/httpcaddyfile/testdata/import_variadic_with_import.txt
@@ -0,0 +1,15 @@
+(t1) {
+    respond 200 {
+        body {args[:]}
+    }
+}
+
+:8081 {
+    import t1 false
+}
+
+import import_variadic.txt
+
+:8083 {
+    import t2 true
+}
\ No newline at end of file
-- 
cgit v1.2.3