Address review comments

Also drops one line of excess logging.

Signed-off-by: Mark Yen <[email protected]>

Author: mook-as

pkg/rancher-desktop/integrations/pathManager.ts

@@ -8,8 +8,8 @@ export interface PathManager {
   /** The PathManagementStrategy that corresponds to the implementation. */
   readonly strategy: PathManagementStrategy
   /**
-   * Makes real any changes to the system. Should be idempotent, and should not
-   * throw any exceptions.
+   * Applies changes to the system. Should be idempotent, and should not throw
+   * any exceptions.
    */
   enforce(): Promise<void>
   /**

pkg/rancher-desktop/integrations/pathManagerImpl.ts

@@ -61,7 +61,7 @@ export class RcFilePathManager implements PathManager {
     try {
       await manageLinesInFile(filePath, lines, desiredPresent);
       mainEvents.emit('diagnostics-event', 'path-management', { fileName, error: undefined });
-    } catch (error) {
+    } catch (error: any) {
       mainEvents.emit('diagnostics-event', 'path-management', { fileName, error });
       throw error;
     }

pkg/rancher-desktop/main/diagnostics/diagnostics.ts

@@ -47,12 +47,12 @@ export class DiagnosticsManager {
     this.checkers = diagnostics ? Promise.resolve(diagnostics) : (async() => {
       const imports = (await Promise.all([
         import('./connectedToInternet'),
-        import('./pathManagement'),
         import('./dockerCliSymlinks'),
         import('./kubeConfigSymlink'),
         import('./kubeContext'),
         import('./limaDarwin'),
         import('./mockForScreenshots'),
+        import('./pathManagement'),
         import('./rdBinInShell'),
         import('./testCheckers'),
         import('./wslFromStore'),

pkg/rancher-desktop/main/diagnostics/pathManagement.ts

@@ -2,11 +2,13 @@ import { DiagnosticsCategory, DiagnosticsChecker, DiagnosticsCheckerResult, Diag
 
 import { ErrorHasExtendedAttributes, ErrorNotRegularFile, ErrorWritingFile } from '@pkg/integrations/manageLinesInFile';
 import mainEvents from '@pkg/main/mainEvents';
-import Logging from '@pkg/utils/logging';
 
-const console = Logging.diagnostics;
 const cachedResults: Record<string, DiagnosticsCheckerResult> = {};
 
+/**
+ * Check for any errors raised from handling path management (i.e. handling of
+ * ~/.bashrc and related files) and report them to the user.
+ */
 const CheckPathManagement: DiagnosticsChecker = {
   id:       'PATH_MANAGEMENT',
   category: DiagnosticsCategory.Utilities,
@@ -24,7 +26,6 @@ const CheckPathManagement: DiagnosticsChecker = {
 };
 
 mainEvents.on('diagnostics-event', (id, state) => {
-  console.log('diagnostics-event', id, state);
   if (id !== 'path-management') {
     return;
   }

pkg/rancher-desktop/main/mainEvents.ts

@@ -105,7 +105,7 @@ interface MainEventNames {
    * @param id The diagnostic identifier.
    * @param state The new state for the diagnostic.
    */
-  'diagnostics-event'(id: string, state: any): void;
+  'diagnostics-event'<K extends keyof DiagnosticsEventPayload>(id: K, state: DiagnosticsEventPayload[K]): void;
 
   /**
    * Emitted when an extension is uninstalled via the extension manager.
@@ -144,6 +144,14 @@ interface MainEventNames {
   'dialog-info'(args: Record<string, string>): void;
 }
 
+/**
+ * DiagnosticsEventPayload defines the data that will be passed on a
+ * 'diagnostics-event' event.
+ */
+type DiagnosticsEventPayload = {
+  'path-management': { fileName: string; error: Error | undefined };
+};
+
 /**
  * Helper type definition to check if the given event name is a handler (i.e.
  * has a return value) instead of an event (i.e. returns void).