Merge pull request #214 from mauriciopoppe/remove-mkdirall

Remove mkdir call while creating the registration probe file

pkg/util/util_test.go

@@ -28,7 +28,6 @@ import (
 )
 
 var socketFileName = "reg.sock"
-var kubeletRegistrationPath = "/var/lib/kubelet/plugins/csi-dummy/registration"
 
 // TestSocketFileDoesNotExist - Test1: file does not exist. So clean up should be successful.
 func TestSocketFileDoesNotExist(t *testing.T) {
@@ -184,7 +183,9 @@ func TestTouchFile(t *testing.T) {
 	}
 	defer os.RemoveAll(testDir)
 
-	filePath := filepath.Join(testDir, kubeletRegistrationPath)
+	// In real life, testDir would be the kubeletRegistration socket dirname
+	// e.g. /var/lib/kubelet/plugins/<driver>/
+	filePath := filepath.Join(testDir, "registration")
 	fileExists, err := DoesFileExist(filePath)
 	if err != nil {
 		t.Fatalf("Failed to execute file exist: %+v", err)

pkg/util/util_unix.go

@@ -22,7 +22,6 @@ package util
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"golang.org/x/sys/unix"
 )
@@ -88,11 +87,6 @@ func TouchFile(filePath string) error {
 		return err
 	}
 	if !exists {
-		err := os.MkdirAll(filepath.Dir(filePath), 0755)
-		if err != nil {
-			return err
-		}
-
 		file, err := os.Create(filePath)
 		if err != nil {
 			return err

pkg/util/util_windows.go

@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
 )
 
 func Umask(mask int) (int, error) {
@@ -86,11 +85,6 @@ func TouchFile(filePath string) error {
 		return err
 	}
 	if !exists {
-		err := os.MkdirAll(filepath.Dir(filePath), 0755)
-		if err != nil {
-			return err
-		}
-
 		file, err := os.Create(filePath)
 		if err != nil {
 			return err