fix: resolve issues causing failures

Signed-off-by: Nathan Klick <[email protected]>

Author: nathanklick

src/core/lease.ts

@@ -161,6 +161,11 @@ export class Lease {
         try {
             return await this.client.readNamespacedLease(this.LeaseName, this.Namespace)
         } catch (e: any) {
+            if (!(e instanceof SoloError)) {
+                throw new LeaseAcquisitionError(`failed to read the lease named '${this.LeaseName}' in the ` +
+                    `'${this.Namespace}' namespace, caused by: ${e.message}`, e)
+            }
+
             if (e.meta.statusCode !== 404) {
                 throw new LeaseAcquisitionError('failed to read existing leases, unexpected server response of' +
                     `'${e.meta.statusCode}' received`, e)

src/core/lease_manager.ts

@@ -22,6 +22,7 @@ import type { SoloLogger } from './logging.ts'
 import { type LeaseRenewalService } from './lease_renewal.js'
 import { Lease } from './lease.js'
 import { LeaseHolder } from './lease_holder.js'
+import { LeaseAcquisitionError } from './lease_errors.js'
 
 export class LeaseManager {
   constructor (
@@ -37,7 +38,7 @@ export class LeaseManager {
   }
 
   public async create (): Promise<Lease> {
-    return new Lease(this.k8, this.renewalService, LeaseHolder.default(), await this.currentNamespace(), await this.currentNamespace())
+    return new Lease(this.k8, this.renewalService, LeaseHolder.default(), await this.currentNamespace())
   }
 
   public get RenewalService (): LeaseRenewalService {
@@ -57,7 +58,7 @@ export class LeaseManager {
       await this.k8.createNamespace(namespace)
 
       if (!await this.k8.hasNamespace(namespace)) {
-        throw new SoloError(`failed to create the '${namespace}' namespace`)
+        throw new LeaseAcquisitionError(`failed to create the '${namespace}' namespace`)
       }
     }
 

src/core/listr_lease.ts

@@ -22,6 +22,7 @@ import { LeaseAcquisitionError } from './lease_errors.js'
 
 export class ListrLease {
     public static readonly DEFAULT_LEASE_ACQUIRE_ATTEMPTS = 10
+    public static readonly ACQUIRE_LEASE_TASK_TITLE = 'Acquire lease'
 
     private constructor () {
         throw new Error('This class cannot be instantiated')
@@ -30,7 +31,7 @@ export class ListrLease {
     public static newAcquireLeaseTask (lease: Lease, task: ListrTaskWrapper<any, any, any>) {
         return task.newListr([
             {
-                title: 'Acquire lease',
+                title: ListrLease.ACQUIRE_LEASE_TASK_TITLE,
                 task: async (_, task) => {
                     await ListrLease.acquireWithRetry(lease, task)
                 }
@@ -49,17 +50,17 @@ export class ListrLease {
 
         let attempt: number
         let innerError: Error | null = null
-        for (attempt = 1; attempt <= maxAttempts; attempt++) {
+        for (attempt = 0; attempt < maxAttempts; attempt++) {
             try {
                 await lease.acquire()
                 task.title = `${title} - ${chalk.green('lease acquired successfully')}` +
-                    `, attempt: ${chalk.cyan(attempt.toString())}/${chalk.cyan(maxAttempts.toString())}`
+                    `, attempt: ${chalk.cyan((attempt + 1).toString())}/${chalk.cyan(maxAttempts.toString())}`
                 return
             } catch (e: LeaseAcquisitionError | any) {
                 task.title = `${title} - ${chalk.gray(`lease exists, attempting again in ${lease.DurationSeconds} seconds`)}` +
-                    `, attempt: ${chalk.cyan(attempt.toString())}/${chalk.cyan(maxAttempts.toString())}`
+                    `, attempt: ${chalk.cyan((attempt + 1).toString())}/${chalk.cyan(maxAttempts.toString())}`
 
-                if (attempt === maxAttempts) {
+                if (attempt === maxAttempts - 1) {
                     innerError = e
                 }
             }