From 922b52512d1777ebb3564713630a9d434cc8f741 Mon Sep 17 00:00:00 2001
From: vcarvajal-sigsci <vcarvajal@fastly.com>
Date: Wed, 26 Feb 2025 19:11:10 -0800
Subject: [PATCH] Re enable gen test

---
 .../js-compute/fixtures/module-mode/src/kv-store.js       | 8 ++++----
 .../js-compute/fixtures/module-mode/tests.json            | 1 -
 integration-tests/js-compute/teardown.js                  | 4 +++-
 runtime/fastly/builtins/kv-store.cpp                      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/integration-tests/js-compute/fixtures/module-mode/src/kv-store.js b/integration-tests/js-compute/fixtures/module-mode/src/kv-store.js
index c261bb53ab..4a32765358 100644
--- a/integration-tests/js-compute/fixtures/module-mode/src/kv-store.js
+++ b/integration-tests/js-compute/fixtures/module-mode/src/kv-store.js
@@ -1391,8 +1391,8 @@ const debug = sdkVersion.endsWith('-debug');
   });
   routes.set('/kv-store-options/gen', async () => {
     let store = new KVStore(KV_STORE_NAME);
-    let key = `entry-options`;
-    await store.put(key, 'body op', {
+    let key = `entry-options-gen`;
+    await store.put(key, 'body gen', {
       gen: 2,
     });
     let entry = await store.get(key);
@@ -1403,7 +1403,7 @@ const debug = sdkVersion.endsWith('-debug');
       `entry.options instanceof ReadableStream`,
     );
     let text = await streamToString(result);
-    strictEqual(text, 'body op', `entry.body contents as string`);
+    strictEqual(text, 'body gen', `entry.body contents as string`);
   });
   routes.set('/kv-store-options/gen-invalid', async () => {
     await assertRejects(
@@ -1413,7 +1413,7 @@ const debug = sdkVersion.endsWith('-debug');
         await store.put(key, 'body Nan', { gen: '2' });
       },
       TypeError,
-      `KVStore.insert: gen must be an integer`,
+      `KVStore.put: gen must be an integer`,
     );
   });
   routes.set('/kv-store-entry/body', async () => {
diff --git a/integration-tests/js-compute/fixtures/module-mode/tests.json b/integration-tests/js-compute/fixtures/module-mode/tests.json
index 10cfdc30f5..eb4b3ff6d7 100644
--- a/integration-tests/js-compute/fixtures/module-mode/tests.json
+++ b/integration-tests/js-compute/fixtures/module-mode/tests.json
@@ -404,7 +404,6 @@
   "GET /kv-store-entry/json/invalid": { "flake": true },
   "GET /kv-store-entry/arrayBuffer/valid": { "flake": true },
   "GET /kv-store-options/gen": {
-    "skip": true,
     "flake": true
   },
   "GET /kv-store-options/gen-invalid": { "flake": true },
diff --git a/integration-tests/js-compute/teardown.js b/integration-tests/js-compute/teardown.js
index df7b99ad2f..021a62ce7c 100755
--- a/integration-tests/js-compute/teardown.js
+++ b/integration-tests/js-compute/teardown.js
@@ -56,7 +56,9 @@ async function removeConfigStores() {
       await zx`fastly resource-link delete --version latest --autoclone --id=${LINK_ID}  --token $FASTLY_API_TOKEN`;
       await zx`fastly service-version activate --version latest --token $FASTLY_API_TOKEN`;
     }
-    await zx`fastly config-store delete --store-id=${STORE_ID}  --token $FASTLY_API_TOKEN`;
+    try {
+      await zx`fastly config-store delete --store-id=${STORE_ID}  --token $FASTLY_API_TOKEN`;
+    } catch {}
   }
 
   STORE_ID = existingListId(stores, CONFIG_STORE_NAME);
diff --git a/runtime/fastly/builtins/kv-store.cpp b/runtime/fastly/builtins/kv-store.cpp
index aae08f479b..ed3a9a14f3 100644
--- a/runtime/fastly/builtins/kv-store.cpp
+++ b/runtime/fastly/builtins/kv-store.cpp
@@ -473,7 +473,7 @@ bool KVStore::put(JSContext *cx, unsigned argc, JS::Value *vp) {
         }
       }
       if (!if_gen.has_value()) {
-        api::throw_error(cx, api::Errors::TypeError, "KVStore.insert", "gen", "be an integer");
+        api::throw_error(cx, api::Errors::TypeError, "KVStore.put", "gen", "be an integer");
         return ReturnPromiseRejectedWithPendingError(cx, args);
       }
     }
@@ -564,7 +564,7 @@ bool KVStore::put(JSContext *cx, unsigned argc, JS::Value *vp) {
         }
       }
 
-      auto res = kv_store(self).insert(key_chars, body, mode, std::nullopt, metadata, ttl);
+      auto res = kv_store(self).insert(key_chars, body, mode, if_gen, metadata, ttl);
       if (auto *err = res.to_err()) {
         HANDLE_ERROR(cx, *err);
         return ReturnPromiseRejectedWithPendingError(cx, args);