cleanup of hashed directories (#229)

* cleanup of hashed directories

Signed-off-by: Ashima-Ashima1 <[email protected]>

* publish test version

Signed-off-by: Ashima-Ashima1 <[email protected]>

* publish test version

Signed-off-by: Ashima-Ashima1 <[email protected]>

* publish test version

Signed-off-by: Ashima-Ashima1 <[email protected]>

* publish test version

Signed-off-by: Ashima-Ashima1 <[email protected]>

* revert chnages

Signed-off-by: Ashima-Ashima1 <[email protected]>

---------

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-07-01T12:50:32Z",
+  "generated_at": "2025-07-03T08:26:08Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

pkg/mounter/mounter-rclone.go

@@ -350,22 +350,21 @@ func removeRcloneConfigFile(configPath, target string) {
 		_, err := os.Stat(configPathWithVolID)
 		if err != nil {
 			if os.IsNotExist(err) {
-				klog.Infof("removeRcloneConfigFile: Password file directory does not exist: %s", configPathWithVolID)
+				klog.Infof("removeRcloneConfigFile: Config file directory does not exist: %s", configPathWithVolID)
 				return
 			}
 			klog.Errorf("removeRcloneConfigFile: Attempt %d - Failed to stat path %s: %v", retry, configPathWithVolID, err)
 			time.Sleep(constants.Interval)
 			continue
 		}
-		configFile := path.Join(configPathWithVolID, configFileName)
-		err = os.Remove(configFile)
+		err = RemoveAll(configPathWithVolID)
 		if err != nil {
-			klog.Errorf("removeRcloneConfigFile: Attempt %d - Failed to remove password file %s: %v", retry, configFile, err)
+			klog.Errorf("removeRcloneConfigFile: Attempt %d - Failed to remove config file path %s: %v", retry, configPathWithVolID, err)
 			time.Sleep(constants.Interval)
 			continue
 		}
-		klog.Infof("removeRcloneConfigFile: Successfully removed config file: %s", configFile)
+		klog.Infof("removeRcloneConfigFile: Successfully removed config file path: %s", configPathWithVolID)
 		return
 	}
-	klog.Errorf("removeRcloneConfigFile: Failed to remove config file after %d attempts", maxRetries)
+	klog.Errorf("removeRcloneConfigFile: Failed to remove config file path after %d attempts", maxRetries)
 }

pkg/mounter/mounter-s3fs.go

@@ -350,14 +350,13 @@ func removeS3FSCredFile(credDir, target string) {
 			time.Sleep(constants.Interval)
 			continue
 		}
-		passwdFile := path.Join(metaPath, passFile)
-		err = Remove(passwdFile)
+		err = RemoveAll(metaPath)
 		if err != nil {
-			klog.Errorf("removeS3FSCredFile: Attempt %d - Failed to remove password file %s: %v", retry, passwdFile, err)
+			klog.Errorf("removeS3FSCredFile: Attempt %d - Failed to remove password file path %s: %v", retry, metaPath, err)
 			time.Sleep(constants.Interval)
 			continue
 		}
-		klog.Infof("removeS3FSCredFile: Successfully removed password file: %s", passwdFile)
+		klog.Infof("removeS3FSCredFile: Successfully removed password file path: %s", metaPath)
 		return
 	}
 	klog.Errorf("removeS3FSCredFile: Failed to remove password file after %d attempts", maxRetries)

pkg/mounter/mounter-s3fs_test.go

@@ -275,7 +275,7 @@ func TestRemoveS3FSCredFile_Negative(t *testing.T) {
 	Stat = func(path string) (os.FileInfo, error) {
 		return nil, nil
 	}
-	Remove = func(path string) error {
+	RemoveAll = func(path string) error {
 		called++
 		return errors.New("remove failed")
 	}

pkg/mounter/mounter.go

@@ -27,6 +27,7 @@ var (
 	Chmod      = os.Chmod
 	Stat       = os.Stat
 	Remove     = os.Remove
+	RemoveAll  = os.RemoveAll
 )
 
 type Mounter interface {