Add chmod tests

Author: ashald

README.md

@@ -21,13 +21,11 @@ go mod tidy
 ```
 
 ## Test
-uid/gid - default & custom
-
-mode - default & custom
-
 inspect - should export status fields
 
 # Extra
+validate options
+
 if _, err := exec.LookPath("mkfs.xfs"); err != nil {
 		logrus.Fatal("mkfs.xfs is not available, please install xfsprogs to continue")
 	}

driver/driver.go

@@ -150,11 +150,18 @@ func (d Driver) Create(req *v.CreateRequest) error {
 			Msg("will parse as octal")
 
 		modeParsed, err := strconv.ParseUint(modeStr, 8, 32)
-		if err != nil || modeParsed <= 0 || modeParsed > 07777 {
+		if err != nil {
 			return errors.Wrapf(err,
-				"Error creating volume '%s' - cannot parse mode '%s' as 4-position octal",
+				"Error creating volume '%s' - cannot parse mode '%s' as positive 4-position octal",
+				req.Name, modeStr)
+		}
+
+		if modeParsed <= 0 || modeParsed > 07777 {
+			return errors.Errorf(
+				"Error creating volume '%s' - mode value '%s' does not fall between 0 and 7777 in octal encoding",
 				req.Name, modeStr)
 		}
+
 		mode = uint32(modeParsed)
 	}
 

manager/manager.go

@@ -197,16 +197,18 @@ func (m Manager) Create(name string, sizeInBytes int64, sparse bool, fs string,
 	}
 
 	// format data file
-	_, err = exec.Command(fmt.Sprintf("mkfs.%s", fs), append(mkfsFlags, dataFilePath)...).Output()
+	errBytes, err := exec.Command("mkfs."+fs, append(mkfsFlags, dataFilePath)...).CombinedOutput()
 	if err != nil {
+		errStr := strings.TrimSpace(string(errBytes[:]))
 		_ = os.Remove(dataFilePath) // attempt to cleanup
 		return errors.Wrapf(err,
-			"Error creating volume '%s' - cannot format datafile as %s filesystem",
-			name, fs)
+			"Error creating volume '%s' - cannot format datafile as %s filesystem: %s",
+			name, fs, errStr)
 	}
 
-	// At this point we're done - last step is to adjust ownership if required.
-	if uid >= 0 || gid >= 0 {
+	// At this point we're done - last step is to adjust ownership and mode if required.
+
+	if uid >= 0 || gid >= 0 || mode > 0 {
 		lease := "driver"
 
 		mountPath, err := m.Mount(name, lease)
@@ -216,24 +218,27 @@ func (m Manager) Create(name string, sizeInBytes int64, sparse bool, fs string,
 				"Error creating volume '%s' - cannot mount volume to adjust its root owner/permissions",
 				name)
 		}
-
 		if mode > 0 {
-			err = os.Chmod(mountPath, os.FileMode(mode))
+			errBytes, err := exec.Command("chmod", fmt.Sprintf("%#o", mode), mountPath).CombinedOutput()
 			if err != nil {
+				errStr := strings.TrimSpace(string(errBytes[:]))
 				_ = m.UnMount(name, lease)
 				_ = os.Remove(dataFilePath) // attempt to cleanup
 				return errors.Wrapf(err,
-					"Error creating volume '%s' - cannot adjust volume root permissions",
-					name)
+					"Error creating volume '%s' - cannot adjust volume root permissions: %s",
+					name, errStr)
 			}
 		}
-		err = os.Chown(mountPath, uid, gid)
-		if err != nil {
-			_ = m.UnMount(name, lease)
-			_ = os.Remove(dataFilePath) // attempt to cleanup
-			return errors.Wrapf(err,
-				"Error creating volume '%s' - cannot adjust volume root owner",
-				name)
+
+		if uid >= 0 || gid >= 0 {
+			err = os.Chown(mountPath, uid, gid)
+			if err != nil {
+				_ = m.UnMount(name, lease)
+				_ = os.Remove(dataFilePath) // attempt to cleanup
+				return errors.Wrapf(err,
+					"Error creating volume '%s' - cannot adjust volume root owner",
+					name)
+			}
 		}
 
 		err = m.UnMount(name, lease)

tests/test_chmod.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+testDefaultMode() {
+    local volume mode
+    # setup
+    volume=$(docker volume create -d "${DRIVER}")
+
+    # stat produces some funny characters at the end so we want to clean them up
+    mode=$(docker run --rm -it -v "${volume}:/vol" "${IMAGE}" stat -c '%a ' /vol | tr -cd '[0-7]')
+
+    # check
+    assertEquals "Default mode should be 755" "755" "${mode}"
+
+    # cleanup
+    docker volume rm "${volume}" > /dev/null
+}
+
+
+testCustomMode() {
+    local volume mode
+    # setup
+    volume=$(docker volume create -d "${DRIVER}" -o mode=7777)
+
+    # stat produces some funny characters at the end so we want to clean them up
+    mode=$(docker run --rm -it -v "${volume}:/vol" "${IMAGE}" stat -c '%a ' /vol | tr -cd '[0-7]')
+
+    # check
+    assertEquals "Mode should be 7777" "7777" "${mode}"
+
+    # cleanup
+    docker volume rm "${volume}" > /dev/null
+}
+
+testZeroMode() {
+    local volume info error result
+    # setup
+    error=$(docker volume create -d "${DRIVER}" -o mode=0 2>&1)
+    result=$?
+
+    # checks
+    assertEquals "Volume creation should fail" "1" "${result}"
+    assertContains "${error}" "mode value '0' does not fall between 0 and 7777 in octal encoding"
+}
+
+testInvalidMode() {
+    local volume info error result
+    # setup
+    error=$(docker volume create -d "${DRIVER}" -o mode=x 2>&1)
+    result=$?
+
+    # checks
+    assertEquals "Volume creation should fail" "1" "${result}"
+    assertContains "${error}" "cannot parse mode 'x' as positive 4-position octal: strconv.ParseUint: parsing \"x\": invalid syntax"
+}
+
+
+. test.sh