Merge pull request #2260 from headlamp-k8s/replace-plugin-rename

app: Do not use rename to move plugin folders
headlamp-k8s · Sep 3, 2024 · 01fe61b · 01fe61b
2 parents 30df8e7 + a7dbbca
commit 01fe61b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/app/electron/plugin-management.ts b/app/electron/plugin-management.ts
@@ -52,6 +52,22 @@ interface PluginData {
   artifacthubVersion: string;
 }
 
+/**
+ * Move directories from currentPath to newPath by copying.
+ * @param currentPath from this path
+ * @param newPath to this path
+ */
+function moveDirs(currentPath: string, newPath: string) {
+  try {
+    fs.cpSync(currentPath, newPath, { recursive: true, force: true });
+    fs.rmSync(currentPath, { recursive: true });
+    console.log(`Moved directory from ${currentPath} to ${newPath}`);
+  } catch (err) {
+    console.error(`Error moving directory from ${currentPath} to ${newPath}:`, err);
+    throw err;
+  }
+}
+
 export class PluginManager {
   /**
    * Installs a plugin from the specified URL.
@@ -84,7 +100,7 @@ export class PluginManager {
         fs.mkdirSync(destinationFolder, { recursive: true });
       }
       // move the plugin to the destination folder
-      fs.renameSync(tempFolder, path.join(destinationFolder, path.basename(name)));
+      moveDirs(tempFolder, path.join(destinationFolder, path.basename(name)));
       if (progressCallback) {
         progressCallback({ type: 'success', message: 'Plugin Installed' });
       }
@@ -162,7 +178,7 @@ export class PluginManager {
       fs.mkdirSync(pluginDir, { recursive: true });
 
       // move the plugin to the destination folder
-      fs.renameSync(tempFolder, pluginDir);
+      moveDirs(tempFolder, pluginDir);
       if (progressCallback) {
         progressCallback({ type: 'success', message: 'Plugin Updated' });
       }

diff --git a/plugins/headlamp-plugin/plugin-management/plugin-management.js b/plugins/headlamp-plugin/plugin-management/plugin-management.js
@@ -25,6 +25,22 @@ const envPaths = require('env-paths');
 //   // });
 // }
 
+/**
+ * Move directories from currentPath to newPath by copying.
+ * @param currentPath from this path
+ * @param newPath to this path
+ */
+function moveDirs(currentPath, newPath) {
+  try {
+    fs.cpSync(currentPath, newPath, { recursive: true, force: true });
+    fs.rmSync(currentPath, { recursive: true });
+    console.log(`Moved directory from ${currentPath} to ${newPath}`);
+  } catch (err) {
+    console.error(`Error moving directory from ${currentPath} to ${newPath}:`, err);
+    throw err;
+  }
+}
+
 class PluginManager {
   /**
    * Installs a plugin from the specified URL.
@@ -57,7 +73,7 @@ class PluginManager {
         fs.mkdirSync(destinationFolder, { recursive: true });
       }
       // move the plugin to the destination folder
-      fs.renameSync(tempFolder, path.join(destinationFolder, path.basename(name)));
+      moveDirs(tempFolder, path.join(destinationFolder, path.basename(name)));
       if (progressCallback) {
         progressCallback({ type: 'success', message: 'Plugin Installed' });
       }
@@ -129,7 +145,7 @@ class PluginManager {
       fs.mkdirSync(pluginDir, { recursive: true });
 
       // move the plugin to the destination folder
-      fs.renameSync(tempFolder, pluginDir);
+      moveDirs(tempFolder, pluginDir);
       if (progressCallback) {
         progressCallback({ type: 'success', message: 'Plugin Updated' });
       }