From d0d62892c8ca386cd693fc21141d061ff030e87d Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Thu, 16 Feb 2017 12:27:11 +0100
Subject: [PATCH] resources: file: Allow creation of empty directories

---
 resources/file.go  | 51 ++++++++++++++++++++++++++++++++++++++++++----
 test/shell/t2.sh   |  1 +
 test/shell/t2.yaml |  3 +++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/resources/file.go b/resources/file.go
index 0f985338..094e4052 100644
--- a/resources/file.go
+++ b/resources/file.go
@@ -443,6 +443,49 @@ func (obj *FileRes) fileCheckApply(apply bool, src io.ReadSeeker, dst string, sh
 	return sha256sum, false, dstFile.Sync()
 }
 
+// dirCheckApply is the CheckApply operation for an empty directory
+func (obj *FileRes) dirCheckApply(apply bool) (bool, error) {
+	// Check if the path exists and is a directory
+	st, err := os.Stat(obj.path)
+	if err != nil && !os.IsNotExist(err) {
+		return false, errwrap.Wrapf(err, "Error checking file resource existence")
+	}
+
+	if err == nil && st.IsDir() {
+		return true, nil // Already a directory, nothing to do
+	}
+	if err == nil && !st.IsDir() && !obj.Force {
+		return false, fmt.Errorf("Can't force file into dir: %s", obj.path)
+	}
+
+	if !apply {
+		return false, nil
+	}
+
+	// The path exists and is not a directory
+	// Delete the file if force is given
+	if err == nil && !st.IsDir() {
+		log.Printf("dirCheckApply: Removing (force): %s", obj.path)
+		if err := os.Remove(obj.path); err != nil {
+			return false, err
+		}
+	}
+
+	// Create the empty directory
+	var mode os.FileMode
+	if obj.Mode != "" {
+		mode, err = obj.mode()
+		if err != nil {
+			return false, err
+		}
+	} else {
+		mode = os.ModePerm
+	}
+
+	err = os.Mkdir(obj.path, mode)
+	return false, err
+}
+
 // syncCheckApply is the CheckApply operation for a source and destination dir.
 // It is recursive and can create directories directly, and files via the usual
 // fileCheckApply method. It returns checkOK and error as is normally expected.
@@ -629,16 +672,16 @@ func (obj *FileRes) contentCheckApply(apply bool) (checkOK bool, _ error) {
 		return false, err             // either nil or not
 	}
 
+	if obj.isDir && obj.Source == "" {
+		return obj.dirCheckApply(apply)
+	}
+
 	// content is not defined, leave it alone...
 	if obj.Content == nil {
 		return true, nil
 	}
 
 	if obj.Source == "" { // do the obj.Content checks first...
-		if obj.isDir { // TODO: should we create an empty dir this way?
-			log.Fatal("XXX: Not implemented!") // XXX
-		}
-
 		bufferSrc := bytes.NewReader([]byte(*obj.Content))
 		sha256sum, checkOK, err := obj.fileCheckApply(apply, bufferSrc, obj.path, obj.sha256sum)
 		if sha256sum != "" { // empty values mean errored or didn't hash
diff --git a/test/shell/t2.sh b/test/shell/t2.sh
index 2205fd40..d436db73 100755
--- a/test/shell/t2.sh
+++ b/test/shell/t2.sh
@@ -16,5 +16,6 @@ test -e /tmp/mgmt/f1
 test -e /tmp/mgmt/f2
 test -e /tmp/mgmt/f3
 test ! -e /tmp/mgmt/f4
+test -d /tmp/mgmt/dir1
 
 exit $e
diff --git a/test/shell/t2.yaml b/test/shell/t2.yaml
index f69394ee..09bfcca8 100644
--- a/test/shell/t2.yaml
+++ b/test/shell/t2.yaml
@@ -24,6 +24,9 @@ resources:
     content: |
       i am f4 and i should not be here
     state: absent
+  - name: dir1
+    path: "/tmp/mgmt/dir1/"
+    state: exists
 edges:
 - name: e1
   from: