Merging upstream version 1.44.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

29 files changed, 343 insertions, 0 deletions

diff --git a/fluent-bit/tests/internal/data/pack/README.md b/fluent-bit/tests/internal/data/pack/README.md
new file mode 100644
index 000000000..49b00c1bb
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/README.md
@@ -0,0 +1,3 @@
+Data samples on this directory are generated by Python scripts taken as source the .txt files.
+
+Note that utf-8 files with Unicode characters > 0xffff generate an invalid JSON representation 'FOR THE TEST' purposes. 
diff --git a/fluent-bit/tests/internal/data/pack/bug342.json b/fluent-bit/tests/internal/data/pack/bug342.json
new file mode 100644
index 000000000..1f9e5544a
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/bug342.json
@@ -0,0 +1,240 @@
+{"num": 1}
+{"num": 2}
+{"num": 3}
+{"num": 4}
+{"num": 5}
+{"num": 6}
+{"num": 7}
+{"num": 8}
+{"num": 9}
+{"num": 10}
+{"num": 11}
+{"num": 12}
+{"num": 13}
+{"num": 14}
+{"num": 15}
+{"num": 16}
+{"num": 17}
+{"num": 18}
+{"num": 19}
+{"num": 20}
+{"num": 21}
+{"num": 22}
+{"num": 23}
+{"num": 24}
+{"num": 25}
+{"num": 26}
+{"num": 27}
+{"num": 28}
+{"num": 29}
+{"num": 30}
+{"num": 31}
+{"num": 32}
+{"num": 33}
+{"num": 34}
+{"num": 35}
+{"num": 36}
+{"num": 37}
+{"num": 38}
+{"num": 39}
+{"num": 40}
+{"num": 41}
+{"num": 42}
+{"num": 43}
+{"num": 44}
+{"num": 45}
+{"num": 46}
+{"num": 47}
+{"num": 48}
+{"num": 49}
+{"num": 50}
+{"num": 51}
+{"num": 52}
+{"num": 53}
+{"num": 54}
+{"num": 55}
+{"num": 56}
+{"num": 57}
+{"num": 58}
+{"num": 59}
+{"num": 60}
+{"num": 61}
+{"num": 62}
+{"num": 63}
+{"num": 64}
+{"num": 65}
+{"num": 66}
+{"num": 67}
+{"num": 68}
+{"num": 69}
+{"num": 70}
+{"num": 71}
+{"num": 72}
+{"num": 73}
+{"num": 74}
+{"num": 75}
+{"num": 76}
+{"num": 77}
+{"num": 78}
+{"num": 79}
+{"num": 80}
+{"num": 81}
+{"num": 82}
+{"num": 83}
+{"num": 84}
+{"num": 85}
+{"num": 86}
+{"num": 87}
+{"num": 88}
+{"num": 89}
+{"num": 90}
+{"num": 91}
+{"num": 92}
+{"num": 93}
+{"num": 94}
+{"num": 95}
+{"num": 96}
+{"num": 97}
+{"num": 98}
+{"num": 99}
+{"num": 100}
+{"num": 101}
+{"num": 102}
+{"num": 103}
+{"num": 104}
+{"num": 105}
+{"num": 106}
+{"num": 107}
+{"num": 108}
+{"num": 109}
+{"num": 110}
+{"num": 111}
+{"num": 112}
+{"num": 113}
+{"num": 114}
+{"num": 115}
+{"num": 116}
+{"num": 117}
+{"num": 118}
+{"num": 119}
+{"num": 120}
+{"num": 121}
+{"num": 122}
+{"num": 123}
+{"num": 124}
+{"num": 125}
+{"num": 126}
+{"num": 127}
+{"num": 128}
+{"num": 129}
+{"num": 130}
+{"num": 131}
+{"num": 132}
+{"num": 133}
+{"num": 134}
+{"num": 135}
+{"num": 136}
+{"num": 137}
+{"num": 138}
+{"num": 139}
+{"num": 140}
+{"num": 141}
+{"num": 142}
+{"num": 143}
+{"num": 144}
+{"num": 145}
+{"num": 146}
+{"num": 147}
+{"num": 148}
+{"num": 149}
+{"num": 150}
+{"num": 151}
+{"num": 152}
+{"num": 153}
+{"num": 154}
+{"num": 155}
+{"num": 156}
+{"num": 157}
+{"num": 158}
+{"num": 159}
+{"num": 160}
+{"num": 161}
+{"num": 162}
+{"num": 163}
+{"num": 164}
+{"num": 165}
+{"num": 166}
+{"num": 167}
+{"num": 168}
+{"num": 169}
+{"num": 170}
+{"num": 171}
+{"num": 172}
+{"num": 173}
+{"num": 174}
+{"num": 175}
+{"num": 176}
+{"num": 177}
+{"num": 178}
+{"num": 179}
+{"num": 180}
+{"num": 181}
+{"num": 182}
+{"num": 183}
+{"num": 184}
+{"num": 185}
+{"num": 186}
+{"num": 187}
+{"num": 188}
+{"num": 189}
+{"num": 190}
+{"num": 191}
+{"num": 192}
+{"num": 193}
+{"num": 194}
+{"num": 195}
+{"num": 196}
+{"num": 197}
+{"num": 198}
+{"num": 199}
+{"num": 200}
+{"num": 201}
+{"num": 202}
+{"num": 203}
+{"num": 204}
+{"num": 205}
+{"num": 206}
+{"num": 207}
+{"num": 208}
+{"num": 209}
+{"num": 210}
+{"num": 211}
+{"num": 212}
+{"num": 213}
+{"num": 214}
+{"num": 215}
+{"num": 216}
+{"num": 217}
+{"num": 218}
+{"num": 219}
+{"num": 220}
+{"num": 221}
+{"num": 222}
+{"num": 223}
+{"num": 224}
+{"num": 225}
+{"num": 226}
+{"num": 227}
+{"num": 228}
+{"num": 229}
+{"num": 230}
+{"num": 231}
+{"num": 232}
+{"num": 233}
+{"num": 234}
+{"num": 235}
+{"num": 236}
+{"num": 237}
+{"num": 238}
+{"num": 239}
+{"num": 240}
diff --git a/fluent-bit/tests/internal/data/pack/dup_keys_in.json b/fluent-bit/tests/internal/data/pack/dup_keys_in.json
new file mode 100644
index 000000000..bdfb9d7cb
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/dup_keys_in.json
@@ -0,0 +1 @@
+[1601487301, {"date": 872835240, "map": {"sub1": false, "sub2": "aaa", "sub3": "bbb", "sub1": null, "sub1": true}, "key1": 12345, "key2": 444, "date": 1059113640, "key1": 333}]
diff --git a/fluent-bit/tests/internal/data/pack/dup_keys_out.json b/fluent-bit/tests/internal/data/pack/dup_keys_out.json
new file mode 100644
index 000000000..5bb557eb7
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/dup_keys_out.json
@@ -0,0 +1 @@
+{"map":{"sub2":"aaa","sub3":"bbb","sub1":true},"key2":444,"date":1059113640,"key1":333}
diff --git a/fluent-bit/tests/internal/data/pack/json_single_map_001.json b/fluent-bit/tests/internal/data/pack/json_single_map_001.json
new file mode 100644
index 000000000..6833b3929
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/json_single_map_001.json
@@ -0,0 +1,5 @@
+{"key001": 123456789,
+ "key002": 0.999887766,
+ "key003": "abcdefghijk",
+ "key004": [{"a": 1, "b": 2}, {"c": 3, "d": 4}]
+}
diff --git a/fluent-bit/tests/internal/data/pack/json_single_map_002.json b/fluent-bit/tests/internal/data/pack/json_single_map_002.json
new file mode 100644
index 000000000..d5a3709ed
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/json_single_map_002.json
@@ -0,0 +1,4 @@
+{"AAA": 123456789,
+ "BBB": 0.999887766,
+ "CCC": ["aa", "bb", "cc", [1, 2, 3]]
+}
diff --git a/fluent-bit/tests/internal/data/pack/mixed.py b/fluent-bit/tests/internal/data/pack/mixed.py
new file mode 100644
index 000000000..7ad0a6149
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed.py
@@ -0,0 +1,31 @@
+# Fluent Bit / Pack mixed samples to JSON
+# =======================================
+# This script generate the JSON formatted strings for the mixed_ABC.txt samples.
+
+import os
+import json
+import msgpack
+
+def gen_json(f):
+    raw = open(f, 'r')
+    data = raw.read()
+    raw.close()
+
+    out_mp = f[:-4] + ".mp"
+    out_json = f[:-4] + ".json"
+
+    # Write messagepack
+    fmp = open(out_mp, 'w')
+    fmp.write(msgpack.packb(data))
+    fmp.close()
+
+    fjson = open(out_json, 'w')
+    fjson.write(json.dumps(data))
+    fjson.close()
+
+for fn in os.listdir('.'):
+     if not os.path.isfile(fn):
+         continue
+
+     if fn.startswith('mixed_') and fn.endswith('.txt'):
+         gen_json(fn)
diff --git a/fluent-bit/tests/internal/data/pack/mixed_001.json b/fluent-bit/tests/internal/data/pack/mixed_001.json
new file mode 100644
index 000000000..10f7faadb
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_001.json
@@ -0,0 +1 @@
+"mixed_001 => \u001b[1;34mI\u001b[0m test\n"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/mixed_001.mp b/fluent-bit/tests/internal/data/pack/mixed_001.mp
new file mode 100644
index 000000000..587dc63f2
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_001.mp
@@ -0,0 +1 @@
+¿mixed_001 => I test
diff --git a/fluent-bit/tests/internal/data/pack/mixed_001.txt b/fluent-bit/tests/internal/data/pack/mixed_001.txt
new file mode 100644
index 000000000..d217bff81
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_001.txt
@@ -0,0 +1 @@
+mixed_001 => I test
diff --git a/fluent-bit/tests/internal/data/pack/mixed_002.json b/fluent-bit/tests/internal/data/pack/mixed_002.json
new file mode 100644
index 000000000..e32314b0a
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_002.json
@@ -0,0 +1 @@
+"mixed_002 =>\n\n  áéíóú\n\n\n'\n\\t\n"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/mixed_002.mp b/fluent-bit/tests/internal/data/pack/mixed_002.mp
new file mode 100644
index 000000000..1bf975535
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_002.mp
diff --git a/fluent-bit/tests/internal/data/pack/mixed_002.txt b/fluent-bit/tests/internal/data/pack/mixed_002.txt
new file mode 100644
index 000000000..a85912bb6
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_002.txt
@@ -0,0 +1,7 @@
+mixed_002 =>
+
+  áéíóú
+
+
+'
+\t
diff --git a/fluent-bit/tests/internal/data/pack/mixed_003.json b/fluent-bit/tests/internal/data/pack/mixed_003.json
new file mode 100644
index 000000000..167c89b8a
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_003.json
@@ -0,0 +1 @@
+"á\n"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/mixed_003.mp b/fluent-bit/tests/internal/data/pack/mixed_003.mp
new file mode 100644
index 000000000..760f5e18c
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_003.mp
@@ -0,0 +1 @@
+£Ã¡
diff --git a/fluent-bit/tests/internal/data/pack/mixed_003.txt b/fluent-bit/tests/internal/data/pack/mixed_003.txt
new file mode 100644
index 000000000..072d59379
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/mixed_003.txt
@@ -0,0 +1 @@
+á
diff --git a/fluent-bit/tests/internal/data/pack/utf8_bell.json b/fluent-bit/tests/internal/data/pack/utf8_bell.json
new file mode 100644
index 000000000..ced4da0cf
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_bell.json
@@ -0,0 +1 @@
+"🔔"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_bell.mp b/fluent-bit/tests/internal/data/pack/utf8_bell.mp
new file mode 100644
index 000000000..ea4ce5c07
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_bell.mp
@@ -0,0 +1 @@
+¤ðŸ””
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_bell.txt b/fluent-bit/tests/internal/data/pack/utf8_bell.txt
new file mode 100644
index 000000000..89b9de00e
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_bell.txt
@@ -0,0 +1 @@
+🔔
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_copyright.json b/fluent-bit/tests/internal/data/pack/utf8_copyright.json
new file mode 100644
index 000000000..4d52a66f3
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_copyright.json
@@ -0,0 +1 @@
+"©"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_copyright.mp b/fluent-bit/tests/internal/data/pack/utf8_copyright.mp
new file mode 100644
index 000000000..6bd6a103e
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_copyright.mp
@@ -0,0 +1 @@
+¢Â©
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_copyright.txt b/fluent-bit/tests/internal/data/pack/utf8_copyright.txt
new file mode 100644
index 000000000..5f8778c57
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_copyright.txt
@@ -0,0 +1 @@
+©
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_gen.py b/fluent-bit/tests/internal/data/pack/utf8_gen.py
new file mode 100644
index 000000000..606e8cc2d
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_gen.py
@@ -0,0 +1,32 @@
+# Fluent Bit / Pack utf-8 samples to JSON
+# =======================================
+
+import os
+import json
+import msgpack
+
+def gen_json(f):
+
+    print f
+
+    with io.open(f, 'rb') as raw:
+        data = raw.read()
+
+    out_mp = f[:-4] + ".mp"
+    out_json = f[:-4] + ".json"
+
+    # Write messagepack
+    fmp = open(out_mp, 'w')
+    fmp.write(msgpack.packb(data))
+    fmp.close()
+
+    fjson = open(out_json, 'w')
+    fjson.write(json.dumps(data).encode('utf8'))
+    fjson.close()
+
+for fn in os.listdir('.'):
+     if not os.path.isfile(fn):
+         continue
+
+     if fn.startswith('utf8_') and fn.endswith('.txt'):
+         gen_json(fn)
diff --git a/fluent-bit/tests/internal/data/pack/utf8_hokke.json b/fluent-bit/tests/internal/data/pack/utf8_hokke.json
new file mode 100644
index 000000000..d93624bf2
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_hokke.json
@@ -0,0 +1 @@
+"𩸽"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_hokke.mp b/fluent-bit/tests/internal/data/pack/utf8_hokke.mp
new file mode 100644
index 000000000..704885a88
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_hokke.mp
@@ -0,0 +1 @@
+¤ð©¸½
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_hokke.txt b/fluent-bit/tests/internal/data/pack/utf8_hokke.txt
new file mode 100644
index 000000000..f1d17d763
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_hokke.txt
@@ -0,0 +1 @@
+𩸽
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_relaxed.json b/fluent-bit/tests/internal/data/pack/utf8_relaxed.json
new file mode 100644
index 000000000..4526bf40f
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_relaxed.json
@@ -0,0 +1 @@
+"☺"
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_relaxed.mp b/fluent-bit/tests/internal/data/pack/utf8_relaxed.mp
new file mode 100644
index 000000000..1fcce51e1
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_relaxed.mp
@@ -0,0 +1 @@
+£â˜º
\ No newline at end of file
diff --git a/fluent-bit/tests/internal/data/pack/utf8_relaxed.txt b/fluent-bit/tests/internal/data/pack/utf8_relaxed.txt
new file mode 100644
index 000000000..e2890a9c1
--- /dev/null
+++ b/fluent-bit/tests/internal/data/pack/utf8_relaxed.txt
@@ -0,0 +1 @@
+☺
\ No newline at end of file