fix: correct state during setup

Signed-off-by: lstocchi <[email protected]>
crc-org · Sep 17, 2024 · f5edaa6 · f5edaa6
1 parent 3b3e1c2
commit f5edaa6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/crc-status.ts b/src/crc-status.ts
@@ -44,7 +44,7 @@ export class CrcStatus {
       try {
         // we don't need to update status while setup is going
         if (this.isSetupGoing) {
-          this._status = createStatus('Starting', this._status.Preset);
+          this._status = createStatus('Stopped', this._status.Preset);
           return;
         }
         const oldStatus = this._status;
@@ -93,7 +93,7 @@ export class CrcStatus {
   setSetupRunning(setup: boolean): void {
     if (setup) {
       this.isSetupGoing = true;
-      this._status = createStatus('Starting', this._status.Preset);
+      this._status = createStatus('Stopped', this._status.Preset);
     } else {
       this.isSetupGoing = false;
     }

diff --git a/src/extension.ts b/src/extension.ts
@@ -269,7 +269,15 @@ async function initializeCrc(
 ): Promise<void> {
   const hasToBeSetup = await needSetup();
   if (hasToBeSetup) {
-    const hasSetupFinished = await setUpCrc(true);
+    crcStatus.setSetupRunning(true);
+    let hasSetupFinished = false;
+    try {
+      hasSetupFinished = await setUpCrc(true);
+    } catch (e) {
+      console.log(String(e));
+    } finally {
+      crcStatus.setSetupRunning(false);
+    }
     if (!hasSetupFinished) {
       throw new Error(`Failed at initializing ${productName}`);
     }
@@ -346,7 +354,7 @@ function registerOpenShiftLocalCluster(
     endpoint: {
       apiURL,
     },
-    status: () => 'stopped',
+    status: () => crcStatus.getConnectionStatus(),
   };
 
   connectionDisposable = provider.registerKubernetesProviderConnection(kubernetesProviderConnection);
@@ -432,6 +440,6 @@ async function presetChanged(
     // podman connection
     registerPodmanConnection(provider, extensionContext);
   } else if (preset === 'openshift' || preset === 'microshift') {
-    await registerOpenShiftLocalCluster(getPresetLabel(preset), provider, extensionContext, telemetryLogger);
+    registerOpenShiftLocalCluster(getPresetLabel(preset), provider, extensionContext, telemetryLogger);
   }
 }