From 4f89f08a70d815839e95bbc1338fa0958fcd1747 Mon Sep 17 00:00:00 2001
From: Panu Horsmalahti <phorsmalahti@mirantis.com>
Date: Thu, 3 Feb 2022 11:11:08 +0200
Subject: [PATCH] Don't block other extensions from loading if one activation
 fails.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
---
 .../extension-loader/extension-loader.ts      | 37 +++++++++++++------
 src/extensions/lens-extension.ts              |  2 +-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts
index e954a1f460..799864ff76 100644
--- a/src/extensions/extension-loader/extension-loader.ts
+++ b/src/extensions/extension-loader/extension-loader.ts
@@ -324,11 +324,13 @@ export class ExtensionLoader {
             return {
               extId,
               instance,
+              installedExtension: extension,
               isBundled: extension.isBundled,
               activated: instance.activate(),
+              activationError: null,
             };
           } catch (err) {
-            logger.error(`${logModule}: activation extension error`, { ext: extension, err });
+            logger.error(`${logModule}: error loading extension`, { ext: extension, err });
           }
         } else if (!extension.isEnabled && alreadyInit) {
           this.removeInstance(extId);
@@ -339,21 +341,32 @@ export class ExtensionLoader {
       // Remove null values
       .filter(extension => Boolean(extension));
 
-    // We first need to wait until each extension's `onActivate` is resolved,
+    // We first need to wait until each extension's `onActivate` is resolved or rejected,
     // as this might register new catalog categories. Afterwards we can safely .enable the extension.
-    await Promise.all(extensions.map(extension => extension.activated));
+    await Promise.all(
+      extensions.map(extension =>
+        // If extension activation fails, log error
+        extension.activated.catch((error) => {
+          extension.activationError = error;
+          logger.error(`${logModule}: activation extension error`, { ext: extension.installedExtension, error });
+          this.instances.delete(extension.extId);
+        }),
+      ),
+    );
 
     // Return ExtensionLoading[]
-    return extensions.map(extension => {
-      const loaded = extension.instance.enable(register).catch((err) => {
-        logger.error(`${logModule}: failed to enable`, { ext: extension, err });
-      });
+    return extensions
+      .filter(extension =>!extension.activationError)
+      .map(extension => {
+        const loaded = extension.instance.enable(register).catch((err) => {
+          logger.error(`${logModule}: failed to enable`, { ext: extension, err });
+        });
 
-      return {
-        isBundled: extension.isBundled,
-        loaded,
-      };
-    });
+        return {
+          isBundled: extension.isBundled,
+          loaded,
+        };
+      });
   }
 
   protected autoInitExtensions(register: (ext: LensExtension) => Promise<Disposer[]>) {
diff --git a/src/extensions/lens-extension.ts b/src/extensions/lens-extension.ts
index c892464ab8..361bb3a803 100644
--- a/src/extensions/lens-extension.ts
+++ b/src/extensions/lens-extension.ts
@@ -114,7 +114,7 @@ export class LensExtension {
 
   @action
   activate() {
-    return this.onActivate();
+    return Promise.resolve(this.onActivate());
   }
 
   protected onActivate(): Promise<void> | void {