Remove dummy auth & add trace header (#10678)

* Remove dummy auth & add trace header

* add lockfile

* Create pink-bees-brake.md

* Remove dummy auth from SDK setup

* address comments

Author: penalosa

.changeset/pink-beees-brake.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Remove dummy auth from SDK setup

.changeset/pink-bees-brake.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Add `WRANGLER_TRACE_ID` environment variable to support internal testing

packages/wrangler/package.json

@@ -111,7 +111,7 @@
 		"chalk": "^5.2.0",
 		"chokidar": "^4.0.1",
 		"cli-table3": "^0.6.3",
-		"cloudflare": "^4.5.0",
+		"cloudflare": "^5.1.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
 		"concurrently": "^8.2.2",

packages/wrangler/src/cfetch/internal.ts

@@ -2,7 +2,10 @@ import assert from "node:assert";
 import Cloudflare from "cloudflare";
 import { fetch, FormData, Headers, Request, Response } from "undici";
 import { version as wranglerVersion } from "../../package.json";
-import { getCloudflareApiBaseUrl } from "../environment-variables/misc-variables";
+import {
+	getCloudflareApiBaseUrl,
+	getTraceHeader,
+} from "../environment-variables/misc-variables";
 import { UserError } from "../errors";
 import { logger } from "../logger";
 import { APIError, parseJSON } from "../parse";
@@ -73,10 +76,6 @@ export function createCloudflareClient(complianceConfig: ComplianceConfig) {
 			await logResponse(response);
 			return response;
 		},
-		// We inject authentication using Wrangler's existing auth setup and a custom fetcher (see above for the custom fetch)
-		// However, `cloudflare` doesn't like not being given an API token, so we provide a dummy one
-		// Otherwise, errors like "Could not resolve authentication method." are thrown.
-		apiToken: "dummy",
 		baseURL: getCloudflareApiBaseUrl(complianceConfig),
 	});
 }
@@ -104,6 +103,7 @@ export async function performApiFetch(
 	const headers = cloneHeaders(new Headers(init.headers));
 	addAuthorizationHeader(headers, apiToken);
 	addUserAgent(headers);
+	maybeAddTraceHeader(headers);
 
 	const queryString = queryParams ? `?${queryParams.toString()}` : "";
 	logger.debug(
@@ -243,6 +243,13 @@ export function addUserAgent(headers: Headers): void {
 	headers.set("User-Agent", `wrangler/${wranglerVersion}`);
 }
 
+export function maybeAddTraceHeader(headers: Headers): void {
+	const traceHeader = getTraceHeader();
+	if (traceHeader) {
+		headers.set("Cf-Trace-Id", traceHeader);
+	}
+}
+
 /**
  * The implementation for fetching a kv value from the cloudflare API.
  * We special-case this one call, because it's the only API call that

packages/wrangler/src/environment-variables/factory.ts

@@ -36,6 +36,8 @@ type VariableNames =
 	| "CLOUDFLARE_LOAD_DEV_VARS_FROM_DOT_ENV"
 	/** Include process.env in development variables (default: false). */
 	| "CLOUDFLARE_INCLUDE_PROCESS_ENV"
+	/** Include a trace header in all API requests that Wrangler makes (for internal use only) */
+	| "WRANGLER_TRACE_ID"
 
 	// ## Logging & Output
 

packages/wrangler/src/environment-variables/misc-variables.ts

@@ -290,3 +290,7 @@ export const getCloudflareIncludeProcessEnvFromEnv =
 		variableName: "CLOUDFLARE_INCLUDE_PROCESS_ENV",
 		defaultValue: false,
 	});
+
+export const getTraceHeader = getEnvironmentVariableFactory({
+	variableName: "WRANGLER_TRACE_ID",
+});