Fix shim unit tests

Author: timokoessler

instrumentation-wasm/src/js_transformer/transformer.rs

@@ -77,6 +77,7 @@ pub fn transform_code_str(
         .with_options(CodegenOptions {
             comments: true,
             minify: false,
+            // Todo add source map using source_map_path
             ..CodegenOptions::default()
         })
         .build(&program);

library/agent/hooks/instrumentation/builtinShim.test.ts

@@ -1,32 +1,32 @@
 import * as t from "tap";
 import { generateBuildinShim } from "./builtinShim";
+import { setBuiltinsToInstrument } from "./instructions";
+import { BuiltinModule } from "../BuiltinModule";
+import { createTestAgent } from "../../../helpers/createTestAgent";
 
-t.test("generate fs/promises shim", async (t) => {
-  // Todo update
-  const shim = generateBuildinShim("fs/promises", "fs/promises", [
-    {
-      name: "readFile",
-      inspectArgs: true,
-      modifyArgs: false,
-      modifyReturnValue: false,
-    },
-  ]);
+t.test("Wrap fs/promises", (t) => {
+  const agent = createTestAgent();
+
+  const fsPromises = new BuiltinModule("fs/promises");
+
+  fsPromises.onRequire((exports, pkgInfo) => {
+    exports.test = 42;
+    exports.__aikido_is_awesome = true;
+  });
+
+  setBuiltinsToInstrument([fsPromises]);
+
+  const shim = generateBuildinShim("fs/promises", "fs/promises", true);
   if (!shim) {
     t.fail("shim is undefined");
     return;
   }
 
   t.match(
     shim.replace(/\s+/g, " "),
-    `const orig = process.getBuiltinModule("fs/promises"); 
-const { __instrumentInspectArgs } = require('@aikidosec/firewall/instrument/internals');
-
-orig.readFile = function() {
-    __instrumentInspectArgs("fs/promises.readFile", arguments);                
-    return orig.readFile(...arguments);                                              
-};
-
-exports = orig;
+    `const orig = process.getBuiltinModule("fs/promises");
+    const { __wrapBuiltinExports } = require('@aikidosec/firewall/instrument/internals');
+    module.exports = __wrapBuiltinExports("fs/promises", orig);
 `.replace(/\s+/g, " ")
   );
 
@@ -36,5 +36,29 @@ exports = orig;
   );
 
   let modifiedExports = eval(modifiedShim);
-  console.log(modifiedExports);
+  t.equal(modifiedExports.test, 42);
+  t.equal(modifiedExports.__aikido_is_awesome, true);
+  t.ok(typeof modifiedExports.readFile === "function");
+  t.ok(typeof modifiedExports.writeFile === "function");
+
+  const shimESM = generateBuildinShim("fs/promises", "fs/promises", false);
+  if (!shimESM) {
+    t.fail("shim is undefined");
+    return;
+  }
+
+  t.match(
+    shimESM.replace(/\s+/g, " "),
+    `const orig = process.getBuiltinModule("fs/promises");
+    const { __wrapBuiltinExports } = require('@aikidosec/firewall/instrument/internals');
+
+    const wrapped = __wrapBuiltinExports("fs/promises", orig);
+
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = wrapped.default;
+    exports.access = wrapped.access;
+`.replace(/\s+/g, " ")
+  );
+
+  t.end();
 });