Merge pull request #191 from mauriciopoppe/working-dir-flag

Filesystem server accepts an array of working dirs only, log on startup

Author: k8s-ci-robot

cmd/csi-proxy/main.go

@@ -61,25 +61,27 @@ func main() {
 		}
 	}
 
+	klog.Info("Starting CSI-Proxy Server ...")
+	klog.Infof("Version: %s", version)
 	apiGroups, err := apiGroups()
 	if err != nil {
 		panic(err)
 	}
 	s := server.NewServer(apiGroups...)
 
-	klog.Info("Starting CSI-Proxy Server ...")
-	klog.Infof("Version: %s", version)
 	if err := s.Start(nil); err != nil {
 		panic(err)
 	}
 }
 
 // apiGroups returns the list of enabled API groups.
 func apiGroups() ([]srvtypes.APIGroup, error) {
-	fssrv, err := filesystemsrv.NewServer(*kubeletPath, workingDirs, filesystemapi.New())
+	workingDirs = append(workingDirs, *kubeletPath)
+	fssrv, err := filesystemsrv.NewServer(workingDirs, filesystemapi.New())
 	if err != nil {
 		return []srvtypes.APIGroup{}, err
 	}
+	klog.Info("Working directories: %v", fssrv.GetWorkingDirs())
 
 	volumesrv, err := volumesrv.NewServer(volumeapi.New())
 	if err != nil {

pkg/server/filesystem/server.go

@@ -14,7 +14,6 @@ import (
 )
 
 type Server struct {
-	kubeletPath string
 	workingDirs []string
 	hostAPI     filesystem.API
 }
@@ -25,14 +24,17 @@ var _ internal.ServerInterface = &Server{}
 var invalidPathCharsRegexWindows = regexp.MustCompile(`["/\:\?\*|]`)
 var absPathRegexWindows = regexp.MustCompile(`^[a-zA-Z]:\\`)
 
-func NewServer(kubeletPath string, workingDirs []string, hostAPI filesystem.API) (*Server, error) {
+func NewServer(workingDirs []string, hostAPI filesystem.API) (*Server, error) {
 	return &Server{
-		kubeletPath: kubeletPath,
 		workingDirs: workingDirs,
 		hostAPI:     hostAPI,
 	}, nil
 }
 
+func (s *Server) GetWorkingDirs() []string {
+	return s.workingDirs
+}
+
 func containsInvalidCharactersWindows(path string) bool {
 	if isAbsWindows(path) {
 		path = path[3:]
@@ -94,17 +96,14 @@ func (s *Server) validatePathWindows(path string) error {
 	}
 
 	valid := false
-	if strings.HasPrefix(strings.ToLower(path), strings.ToLower(s.kubeletPath)) {
-		valid = true
-	}
 	for _, workingDir := range s.workingDirs {
 		if strings.HasPrefix(strings.ToLower(path), strings.ToLower(workingDir)) {
 			valid = true
 		}
 	}
 
 	if !valid {
-		return fmt.Errorf("path: %s is not within context path: %s or %v", path, s.kubeletPath, s.workingDirs)
+		return fmt.Errorf("path: %s is not within the working directories: %v", path, s.workingDirs)
 	}
 
 	return nil

pkg/server/filesystem/server_test.go

@@ -117,7 +117,7 @@ func TestMkdirWindows(t *testing.T) {
 			expectError: true,
 		},
 	}
-	srv, err := NewServer(`C:\var\lib\kubelet`, []string{}, &fakeFileSystemAPI{})
+	srv, err := NewServer([]string{`C:\var\lib\kubelet`}, &fakeFileSystemAPI{})
 	if err != nil {
 		t.Fatalf("FileSystem Server could not be initialized for testing: %v", err)
 	}
@@ -221,7 +221,7 @@ func TestRmdirWindows(t *testing.T) {
 			expectError: true,
 		},
 	}
-	srv, err := NewServer(`C:\var\lib\kubelet`, []string{}, &fakeFileSystemAPI{})
+	srv, err := NewServer([]string{`C:\var\lib\kubelet`}, &fakeFileSystemAPI{})
 	if err != nil {
 		t.Fatalf("FileSystem Server could not be initialized for testing: %v", err)
 	}

pkg/server/smb/server_test.go

@@ -83,7 +83,7 @@ func TestNewSmbGlobalMapping(t *testing.T) {
 			expectError: false,
 		},
 	}
-	fsSrv, err := fsserver.NewServer(`C:\var\lib\kubelet`, []string{}, &fakeFileSystemAPI{})
+	fsSrv, err := fsserver.NewServer([]string{`C:\var\lib\kubelet`}, &fakeFileSystemAPI{})
 	if err != nil {
 		t.Fatalf("FileSystem Server could not be initialized for testing: %v", err)
 	}