Introduce internal isWorkerNotFoundError utility and avoid worker-not-found error code magic numbers in wrangler

Author: dario-piotrowicz

packages/wrangler/src/__tests__/secret.test.ts

@@ -5,6 +5,10 @@ import { http, HttpResponse } from "msw";
 import * as TOML from "smol-toml";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { VERSION_NOT_DEPLOYED_ERR_CODE } from "../secret";
+import {
+	WORKER_NOT_FOUND_ERR_CODE,
+	workerNotFoundErrorMessage,
+} from "../utils/worker-not-found-error";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { clearDialogs, mockConfirm, mockPrompt } from "./helpers/mock-dialogs";
@@ -53,8 +57,8 @@ function mockNoWorkerFound(isBulk = false) {
 					return HttpResponse.json(
 						createFetchResult(null, false, [
 							{
-								code: 10007,
-								message: "This Worker does not exist on your account.",
+								code: WORKER_NOT_FOUND_ERR_CODE,
+								message: workerNotFoundErrorMessage,
 							},
 						])
 					);
@@ -70,8 +74,8 @@ function mockNoWorkerFound(isBulk = false) {
 					return HttpResponse.json(
 						createFetchResult(null, false, [
 							{
-								code: 10007,
-								message: "This Worker does not exist on your account.",
+								code: WORKER_NOT_FOUND_ERR_CODE,
+								message: workerNotFoundErrorMessage,
 							},
 						])
 					);

packages/wrangler/src/secret/index.ts

@@ -21,6 +21,7 @@ import { fetchSecrets } from "../utils/fetch-secrets";
 import { getLegacyScriptName } from "../utils/getLegacyScriptName";
 import { readFromStdin, trimTrailingWhitespace } from "../utils/std";
 import { useServiceEnvironments } from "../utils/useServiceEnvironments";
+import { isWorkerNotFoundError } from "../utils/worker-not-found-error";
 import type { Config, WorkerMetadataBinding } from "@cloudflare/workers-utils";
 
 export const VERSION_NOT_DEPLOYED_ERR_CODE = 10215;
@@ -38,14 +39,6 @@ type InheritBindingUpload = {
 
 type SecretBindingRedacted = Omit<SecretBindingUpload, "text">;
 
-function isMissingWorkerError(e: unknown): e is { code: 10007 } {
-	return (
-		typeof e === "object" &&
-		e !== null &&
-		(e as { code: number }).code === 10007
-	);
-}
-
 async function createDraftWorker({
 	config,
 	args,
@@ -239,7 +232,7 @@ export const secretPutCommand = createCommand({
 				sendMetrics: config.send_metrics,
 			});
 		} catch (e) {
-			if (isMissingWorkerError(e)) {
+			if (isWorkerNotFoundError(e)) {
 				// create a draft worker and try again
 				const result = await createDraftWorker({
 					config,
@@ -486,7 +479,7 @@ export const secretBulkCommand = createCommand({
 			const settings = await getSettings();
 			existingBindings = settings.bindings;
 		} catch (e) {
-			if (isMissingWorkerError(e)) {
+			if (isWorkerNotFoundError(e)) {
 				// create a draft worker before patching
 				const result = await createDraftWorker({
 					config,

packages/wrangler/src/utils/worker-not-found-error.ts

@@ -0,0 +1,31 @@
+import { APIError } from "@cloudflare/workers-utils";
+
+/**
+ This is the error code from the Cloudflare API signaling that a worker could not be found on the target account
+ */
+export const WORKER_NOT_FOUND_ERR_CODE = 10007 as const;
+
+/**
+ This is the error code from the Cloudflare API signaling that a worker environment (legacy) could not be found on the target account
+ */
+export const WORKER_LEGACY_ENVIRONMENT_NOT_FOUND_ERR_CODE = 10090 as const;
+
+/**
+ This is the error message from the Cloudflare API signaling that a worker could not be found on the target account
+ */
+export const workerNotFoundErrorMessage =
+	"This Worker does not exist on your account.";
+
+/**
+ * Given an error from the Cloudflare API discerns wether it is caused by a worker that could not be found on the target account
+ *
+ * @param error The error object
+ * @returns true is the object represents is an APIError for caused by a not found worker, false otherwise
+ */
+export function isWorkerNotFoundError(error: unknown): boolean {
+	return (
+		error instanceof APIError &&
+		(error.code === WORKER_NOT_FOUND_ERR_CODE ||
+			error.code === WORKER_LEGACY_ENVIRONMENT_NOT_FOUND_ERR_CODE)
+	);
+}

packages/wrangler/src/versions/deploy.ts

@@ -7,14 +7,15 @@ import {
 	leftT,
 	spinnerWhile,
 } from "@cloudflare/cli/interactive";
-import { APIError, UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils";
 import { fetchResult } from "../cfetch";
 import { createCommand } from "../core/create-command";
 import { isNonInteractiveOrCI } from "../is-interactive";
 import * as metrics from "../metrics";
 import { writeOutput } from "../output";
 import { requireAuth } from "../user";
 import formatLabelledValues from "../utils/render-labelled-values";
+import { isWorkerNotFoundError } from "../utils/worker-not-found-error";
 import {
 	createDeployment,
 	fetchDeployableVersions,
@@ -263,10 +264,11 @@ export async function confirmLatestDeploymentOverwrite(
 			});
 		}
 	} catch (e) {
-		const isNotFound = e instanceof APIError && e.code == 10007;
-		if (!isNotFound) {
-			throw e;
+		if (isWorkerNotFoundError(e)) {
+			return;
 		}
+
+		throw e;
 	}
 	return true;
 }