Fix debugging logs not including headers for CF API requests and responses (#10425)

---------

Co-authored-by: Carmen Popoviciu <[email protected]>

Author: dario-piotrowicz

.changeset/real-rabbits-enjoy.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+Fix debugging logs not including headers for CF API requests and responses
+
+Fix the fact that `wrangler`, when run with the `WRANGLER_LOG=DEBUG` and `WRANGLER_LOG_SANITIZE=false` environment variables, displays `{}` instead of the actual headers for requests and responses for CF API fetches

packages/wrangler/src/__tests__/helpers/assert-request.ts

@@ -29,13 +29,16 @@ export function makeApiRequestAsserter(
 				/HEADERS: (?<headers>(.|\n)*?)\nINIT: (?<init>(.|\n)*?)\n(BODY: (?<bodyMatch>(.|\n)*?)\n)?-- END CF API REQUEST/
 			);
 		const {
-			headers: _headers,
+			headers: headersStr,
 			init: _init,
 			bodyMatch,
 		} = requestDetails?.groups ?? {};
 
 		if (body) {
 			expect(bodyMatch).toMatch(body);
 		}
+
+		const headers = JSON.parse(headersStr);
+		expect(headers).toEqual({ "user-agent": "wrangler/x.x.x" });
 	};
 }

packages/wrangler/src/cfetch/internal.ts

@@ -40,9 +40,7 @@ export async function performApiFetch(
 		`-- START CF API REQUEST: ${method} ${getCloudflareApiBaseUrl(complianceConfig)}${resource}`
 	);
 	logger.debugWithSanitization("QUERY STRING:", queryString);
-	const logHeaders = cloneHeaders(headers);
-	logHeaders.delete("Authorization");
-	logger.debugWithSanitization("HEADERS:", JSON.stringify(logHeaders, null, 2));
+	logHeaders(headers);
 
 	logger.debugWithSanitization("INIT:", JSON.stringify({ ...init }, null, 2));
 	if (init.body instanceof FormData) {
@@ -65,6 +63,15 @@ export async function performApiFetch(
 	);
 }
 
+function logHeaders(headers: Headers) {
+	headers = cloneHeaders(headers);
+	headers.delete("Authorization");
+	logger.debugWithSanitization(
+		"HEADERS:",
+		JSON.stringify(Object.fromEntries(headers), null, 2)
+	);
+}
+
 /**
  * Make a fetch request to the Cloudflare API.
  *
@@ -97,9 +104,7 @@ export async function fetchInternal<ResponseType>(
 		response.statusText,
 		response.status
 	);
-	const logHeaders = cloneHeaders(response.headers);
-	logHeaders.delete("Authorization");
-	logger.debugWithSanitization("HEADERS:", JSON.stringify(logHeaders, null, 2));
+	logHeaders(response.headers);
 	logger.debugWithSanitization("RESPONSE:", jsonText);
 	logger.debug("-- END CF API RESPONSE");