From 8498a102796faf93d78a2a9d2e05e6da71c1f53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= <mikael.cluseau@gmail.com>
Date: Sat, 20 Jan 2024 17:59:21 +0100
Subject: [PATCH] config: support dir and symlink in file def

---
 config/apply/files.go | 54 ++++++++++++++++++++++++++-----------------
 config/config.go      |  2 ++
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/config/apply/files.go b/config/apply/files.go
index 6592d04..d0d3dc7 100644
--- a/config/apply/files.go
+++ b/config/apply/files.go
@@ -44,20 +44,42 @@ func Files(cfgFiles []config.FileDef, prefix string, filters ...string) error {
 
 		log := log.With().Str("file", filePath).Str("mode", fmt.Sprintf("%04o", mode)).Logger()
 
-		content := []byte(file.Content)
-
-		err := writeFile(
-			log,
-			filePath,
-			content,
-			mode,
-			0755,
-		)
-
-		if err != nil {
+		if err := os.MkdirAll(filepath.Dir(filePath), 0755); err != nil {
+			log.Error().Err(err).Msg("failed to create parent dir")
 			failed++
 			continue
 		}
+
+		switch {
+		case file.Symlink != "":
+			log := log.With().Str("target", file.Symlink).Logger()
+			if err := os.Symlink(file.Symlink, filePath); err == nil {
+				log.Info().Msg("created symlink")
+			} else {
+				log.Error().Err(err).Msg("failed to create symlink")
+				failed++
+			}
+
+		case file.Dir:
+			if err := os.Mkdir(filePath, mode); err == nil {
+				log.Info().Msg("created dir")
+			} else if os.IsExist(err) {
+				log.Warn().Msg("dir exist, ignoring error")
+			} else {
+				log.Error().Err(err).Msg("failed to create dir")
+				failed++
+			}
+
+		default:
+			content := []byte(file.Content)
+
+			if err := os.WriteFile(filePath, content, mode); err == nil {
+				log.Info().Msgf("wrote %d bytes", len(content))
+			} else {
+				log.Error().Err(err).Msg("write failed")
+				failed++
+			}
+		}
 	}
 
 	if failed != 0 {
@@ -69,16 +91,6 @@ func Files(cfgFiles []config.FileDef, prefix string, filters ...string) error {
 }
 
 func writeFile(log zerolog.Logger, path string, content []byte, fileMode, dirMode os.FileMode) (err error) {
-	if err = os.MkdirAll(filepath.Dir(path), dirMode); err != nil {
-		log.Error().Err(err).Msg("failed to create parent dir")
-		return
-	}
-
-	log.Info().Msgf("writing %d bytes", len(content))
-	if err = os.WriteFile(path, content, fileMode); err != nil {
-		log.Error().Err(err).Msg("write failed")
-		return
-	}
 
 	return
 }
diff --git a/config/config.go b/config/config.go
index 15af8e3..e4ade79 100644
--- a/config/config.go
+++ b/config/config.go
@@ -136,6 +136,8 @@ type FileDef struct {
 	Path    string
 	Mode    os.FileMode
 	Content string
+	Symlink string
+	Dir     bool
 }
 
 type NetworkDef struct {