From 70a53cb76aa630dc5590d818aaafd10eaeafb329 Mon Sep 17 00:00:00 2001
From: Ygal Blum <ygal.blum@gmail.com>
Date: Sun, 31 Dec 2023 11:53:53 +0200
Subject: [PATCH] Quadlet - fix trailing whitespaces handling

Remove all trailing white spaces from all lines before the line by line
processing
Add test
Exclude the unit file used for the test from whitespace check

Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
---
 .pre-commit-config.yaml                               |  2 +-
 pkg/systemd/parser/unitfile.go                        | 11 +++++++++++
 .../quadlet/line-continuation-whitespace.container    |  9 +++++++++
 test/e2e/quadlet_test.go                              |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 test/e2e/quadlet/line-continuation-whitespace.container

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0f31ebc5fe..7e75e4f6ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: end-of-file-fixer
         exclude: test/buildah-bud/buildah-tests.diff
       - id: trailing-whitespace
-        exclude: test/buildah-bud/buildah-tests.diff|test/e2e/quadlet/remap-keep-id2.container
+        exclude: test/buildah-bud/buildah-tests.diff|test/e2e/quadlet/remap-keep-id2.container|test/e2e/quadlet/line-continuation-whitespace.container
       - id: mixed-line-ending
       - id: check-byte-order-marker
       - id: check-executables-have-shebangs
diff --git a/pkg/systemd/parser/unitfile.go b/pkg/systemd/parser/unitfile.go
index 732daa2be4..dadd7d849d 100644
--- a/pkg/systemd/parser/unitfile.go
+++ b/pkg/systemd/parser/unitfile.go
@@ -378,12 +378,23 @@ func nextLine(data string, afterPos int) (string, string) {
 	return data, ""
 }
 
+func trimSpacesFromLines(data string) string {
+	lines := strings.Split(data, "\n")
+	for i, line := range lines {
+		lines[i] = strings.TrimSpace(line)
+	}
+	return strings.Join(lines, "\n")
+}
+
 // Parse an already loaded unit file (in the form of a string)
 func (f *UnitFile) Parse(data string) error {
 	p := &UnitFileParser{
 		file:   f,
 		lineNr: 1,
 	}
+
+	data = trimSpacesFromLines(data)
+
 	for len(data) > 0 {
 		origdata := data
 		nLines := 1
diff --git a/test/e2e/quadlet/line-continuation-whitespace.container b/test/e2e/quadlet/line-continuation-whitespace.container
new file mode 100644
index 0000000000..c7c5c01f23
--- /dev/null
+++ b/test/e2e/quadlet/line-continuation-whitespace.container
@@ -0,0 +1,9 @@
+## assert-podman-final-args localhost/imagename "/some/binary file" "--arg1" "arg 2"
+## assert-podman-args "--publish" "80:80"
+
+[Container]
+Image=localhost/imagename
+# Keep whitespace at the end of the following line
+Exec="/some/binary file" --arg1 \ 
+  "arg 2"
+PublishPort=80:80
diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go
index 436d7813db..6d568342d1 100644
--- a/test/e2e/quadlet_test.go
+++ b/test/e2e/quadlet_test.go
@@ -776,6 +776,7 @@ BOGUS=foo
 		Entry("install.container", "install.container", 0, ""),
 		Entry("ip.container", "ip.container", 0, ""),
 		Entry("label.container", "label.container", 0, ""),
+		Entry("line-continuation-whitespace.container", "line-continuation-whitespace.container", 0, ""),
 		Entry("logdriver.container", "logdriver.container", 0, ""),
 		Entry("mask.container", "mask.container", 0, ""),
 		Entry("mount.container", "mount.container", 0, ""),