From 21ed366f170722ec365b471e97a536b9427cfac0 Mon Sep 17 00:00:00 2001
From: Will Taylor <williamtaylor@cloudflare.com>
Date: Fri, 31 Jan 2025 15:07:10 -0500
Subject: [PATCH] Update error message for KV to be shorter

---
 .changeset/thin-countries-clean.md                   |  5 +++++
 packages/workers-shared/asset-worker/src/utils/kv.ts |  4 ++--
 .../workers-shared/asset-worker/tests/kv.test.ts     | 12 +++---------
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/thin-countries-clean.md

diff --git a/.changeset/thin-countries-clean.md b/.changeset/thin-countries-clean.md
new file mode 100644
index 000000000000..8aa5d848d316
--- /dev/null
+++ b/.changeset/thin-countries-clean.md
@@ -0,0 +1,5 @@
+---
+"@cloudflare/workers-shared": patch
+---
+
+Provide shorter message for KV GET errors.
diff --git a/packages/workers-shared/asset-worker/src/utils/kv.ts b/packages/workers-shared/asset-worker/src/utils/kv.ts
index 00d2d08557f2..e55af80a0a60 100644
--- a/packages/workers-shared/asset-worker/src/utils/kv.ts
+++ b/packages/workers-shared/asset-worker/src/utils/kv.ts
@@ -43,9 +43,9 @@ export async function getAssetWithMetadataFromKV(
 			return asset;
 		} catch (err) {
 			if (attempts >= retries) {
-				let message = `Requested asset ${assetKey} could not be fetched from KV namespace.`;
+				let message = `KV GET ${assetKey} failed.`;
 				if (err instanceof Error) {
-					message = `Requested asset ${assetKey} could not be fetched from KV namespace: ${err.message}`;
+					message = `KV GET ${assetKey} failed: ${err.message}`;
 				}
 				throw new Error(message);
 			}
diff --git a/packages/workers-shared/asset-worker/tests/kv.test.ts b/packages/workers-shared/asset-worker/tests/kv.test.ts
index ac9151dcfc85..82db826c9b99 100644
--- a/packages/workers-shared/asset-worker/tests/kv.test.ts
+++ b/packages/workers-shared/asset-worker/tests/kv.test.ts
@@ -45,9 +45,7 @@ describe("[Asset Worker] Fetching assets from KV", () => {
 
 			await expect(() =>
 				getAssetWithMetadataFromKV(mockKVNamespace, "abcd")
-			).rejects.toThrowError(
-				"Requested asset abcd could not be fetched from KV namespace."
-			);
+			).rejects.toThrowError("KV GET abcd failed.");
 		});
 
 		it("should retry once by default if something went wrong while fetching the asset", async () => {
@@ -55,9 +53,7 @@ describe("[Asset Worker] Fetching assets from KV", () => {
 
 			await expect(() =>
 				getAssetWithMetadataFromKV(mockKVNamespace, "abcd")
-			).rejects.toThrowError(
-				"Requested asset abcd could not be fetched from KV namespace."
-			);
+			).rejects.toThrowError("KV GET abcd failed.");
 			expect(spy).toHaveBeenCalledTimes(2);
 		});
 
@@ -66,9 +62,7 @@ describe("[Asset Worker] Fetching assets from KV", () => {
 
 			await expect(() =>
 				getAssetWithMetadataFromKV(mockKVNamespace, "abcd", undefined, 2)
-			).rejects.toThrowError(
-				"Requested asset abcd could not be fetched from KV namespace."
-			);
+			).rejects.toThrowError("KV GET abcd failed.");
 			expect(spy).toHaveBeenCalledTimes(3);
 		});