@appthrust/kest 0.3.0 → 0.3.1

package/ts/retry.ts

@@ -77,7 +77,6 @@ export async function retryUntil<T>(
     }
 
     retries += 1;
-    recorder?.record("RetryAttempt", { attempt: retries });
 
     try {
       const value = await fn();
@@ -89,11 +88,6 @@ export async function retryUntil<T>(
       return value;
     } catch (err) {
       lastError = err;
-      const error = err as Error;
-      recorder?.record("RetryFailure", {
-        attempt: retries,
-        error: { name: error.name, message: error.message },
-      });
     }
   }
 

package/ts/scenario/index.ts

@@ -7,6 +7,7 @@ import { applyStatus } from "../actions/apply-status";
 import { assert } from "../actions/assert";
 import { assertAbsence } from "../actions/assert-absence";
 import { assertList } from "../actions/assert-list";
+import { create } from "../actions/create";
 import { deleteResource } from "../actions/delete";
 import { exec } from "../actions/exec";
 import { get } from "../actions/get";
@@ -33,9 +34,9 @@ export interface InternalScenario extends Scenario {
 
 export function createScenario(deps: CreateScenarioOptions): InternalScenario {
   const { recorder, reporter, reverting } = deps;
-  recorder.record("ScenarioStarted", { name: deps.name });
   return {
     apply: createMutateFn(deps, apply),
+    create: createMutateFn(deps, create),
     applyStatus: createOneWayMutateFn(deps, applyStatus),
     delete: createOneWayMutateFn(deps, deleteResource),
     label: createOneWayMutateFn(deps, label),
@@ -83,17 +84,25 @@ const createMutateFn =
     options?: undefined | ActionOptions
   ): Promise<Output> => {
     const { recorder, kubectl, reverting } = deps;
-    const { type, name, mutate } = action;
-    recorder.record("ActionStart", { action: name, phase: type });
+    const { mutate, describe } = action;
+    function recordActionStart() {
+      recorder.record("ActionStart", {
+        description: describe(input),
+      });
+    }
+    function recordActionEnd(error: undefined | Error) {
+      recorder.record("ActionEnd", { ok: error === undefined, error });
+    }
+    recordActionStart();
     const fn = mutate({ kubectl });
-    let mutateErr: unknown;
+    let mutateErr: undefined | Error;
     try {
       const { revert, output } = await retryUntil(() => fn(input), {
         ...options,
         recorder,
       });
       reverting.add(async () => {
-        recorder.record("ActionStart", { action: name, phase: "revert" });
+        recordActionStart(); // to record revert action start
         let revertErr: unknown;
         try {
           await revert();
@@ -101,25 +110,15 @@ const createMutateFn =
           revertErr = err;
           throw err;
         } finally {
-          recorder.record("ActionEnd", {
-            action: name,
-            phase: "revert",
-            ok: revertErr === undefined,
-            error: revertErr as Error,
-          });
+          recordActionEnd(revertErr as Error); // to record revert action end
         }
       });
       return output;
     } catch (error) {
-      mutateErr = error;
+      mutateErr = error as Error;
       throw error;
     } finally {
-      recorder.record("ActionEnd", {
-        action: name,
-        phase: type,
-        ok: mutateErr === undefined,
-        error: mutateErr as Error,
-      });
+      recordActionEnd(mutateErr as Error);
     }
   };
 
@@ -137,8 +136,8 @@ const createOneWayMutateFn =
     options?: undefined | ActionOptions
   ): Promise<Output> => {
     const { recorder, kubectl } = deps;
-    const { name, mutate } = action;
-    recorder.record("ActionStart", { action: name, phase: "mutate" });
+    const { mutate, describe } = action;
+    recorder.record("ActionStart", { description: describe(input) });
     const fn = mutate({ kubectl });
     let mutateErr: unknown;
     try {
@@ -148,8 +147,6 @@ const createOneWayMutateFn =
       throw error;
     } finally {
       recorder.record("ActionEnd", {
-        action: name,
-        phase: "mutate",
         ok: mutateErr === undefined,
         error: mutateErr as Error,
       });
@@ -170,19 +167,20 @@ const createQueryFn =
     options?: undefined | ActionOptions
   ): Promise<Output> => {
     const { recorder, kubectl } = deps;
-    const { type, name, query } = action;
-    recorder.record("ActionStart", { action: name, phase: type });
+    const { query, describe } = action;
+    recorder.record("ActionStart", { description: describe(input) });
     const fn = query({ kubectl });
+    let queryErr: unknown;
     try {
       return await retryUntil(() => fn(input), { ...options, recorder });
     } catch (error) {
+      queryErr = error;
+      throw error;
+    } finally {
       recorder.record("ActionEnd", {
-        action: name,
-        phase: type,
-        ok: false,
-        error: error as Error,
+        ok: queryErr === undefined,
+        error: queryErr as Error,
       });
-      throw error;
     }
   };
 
@@ -202,6 +200,7 @@ const createNewNamespaceFn =
     return {
       name: namespaceName,
       apply: createMutateFn(namespacedDeps, apply),
+      create: createMutateFn(namespacedDeps, create),
       applyStatus: createOneWayMutateFn(namespacedDeps, applyStatus),
       delete: createOneWayMutateFn(namespacedDeps, deleteResource),
       label: createOneWayMutateFn(namespacedDeps, label),
@@ -224,6 +223,7 @@ const createUseClusterFn =
     const clusterDeps = { ...scenarioDeps, kubectl: clusterKubectl };
     return {
       apply: createMutateFn(clusterDeps, apply),
+      create: createMutateFn(clusterDeps, create),
       applyStatus: createOneWayMutateFn(clusterDeps, applyStatus),
       delete: createOneWayMutateFn(clusterDeps, deleteResource),
       label: createOneWayMutateFn(clusterDeps, label),

package/ts/test.ts

@@ -59,7 +59,7 @@ function makeScenarioTest(runner: BunTestRunner): TestFunction {
         reverting,
         reporter,
       });
-
+      recorder.record("ScenarioStart", { name: label });
       let testErr: undefined | Error;
       try {
         await fn(scenario);
@@ -67,6 +67,7 @@ function makeScenarioTest(runner: BunTestRunner): TestFunction {
         testErr = error as Error;
       }
       await scenario.cleanup();
+      recorder.record("ScenarioEnd", {});
       await report(recorder, scenario, testErr);
       if (testErr) {
         throw testErr;