@void/deploy-cloudflare 1.2.0 → 1.3.0

package/dist/index.d.mts

@@ -87,6 +87,7 @@ type CloudflareOperation = ({
     percentage: number;
   }>;
   message?: string;
+  bypassDeploymentChecks?: boolean;
 } & WorkerTarget) | ({
   type: "versions.upload" | "worker.deploy";
   message?: string;
@@ -345,6 +346,12 @@ type CloudflareVersionActivation = {
   versionId?: string;
   previousVersionId?: string | null;
   rollback?: "not-needed" | "succeeded" | "failed" | "unavailable" | "unsafe";
+  /**
+   * Cloudflare refused to restore the previous version because a secret
+   * changed with this deploy, so Void forced it. The previous version runs
+   * with its earlier secret values.
+   */
+  restoredOlderSecrets?: true;
   /** Version that owned production after a concurrent operation superseded this command. */
   activeVersionId?: string | null;
   /** Whether Void restored the active version's immutable trigger snapshot. */
@@ -474,6 +481,7 @@ export declare function deployCloudflareVersionTraffic(options: {
   workerName: string;
   percentages: Array<string>;
   message: string;
+  bypassDeploymentChecks?: boolean;
 }): Promise<CloudflareCommandResult>;
 /** Normalize an account workers.dev subdomain supplied by config or the environment. */
 export declare function normalizeWorkersDevSubdomain(value: string | undefined): string | undefined;

package/dist/index.mjs

@@ -799,6 +799,7 @@ function cloudflareCommandDiagnostic(result) {
 //#endregion
 //#region src/version.ts
 const DURABLE_MIGRATION_VERSION_ERROR = 10211;
+const CLOUDFLARE_SECRET_CHANGED_ERROR = 10220;
 /** Encode migration state into Cloudflare's version annotation for safe rollback diagnostics. */
 function encodeCloudflareVersionMessage(migrations, triggerConfig, contentHash) {
 	const metadata = triggerConfig ? {
@@ -1526,14 +1527,14 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		reason: ready === "access-denied" ? "readiness-access-denied" : "readiness-failed",
 		versionId,
 		previousVersionId: previous.versionId,
-		rollback: stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "readiness failed", [stagedVersionPercentages(previous.versionId, versionId)]) : "not-needed"
+		...stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "readiness failed", [stagedVersionPercentages(previous.versionId, versionId)]) : { rollback: "not-needed" }
 	};
 	if (!options.verifyUploader()) return {
 		ok: false,
 		reason: "uploader-changed",
 		versionId,
 		previousVersionId: previous.versionId,
-		rollback: stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "uploader verification failed", [stagedVersionPercentages(previous.versionId, versionId)]) : "not-needed"
+		...stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "uploader verification failed", [stagedVersionPercentages(previous.versionId, versionId)]) : { rollback: "not-needed" }
 	};
 	const ownerBeforeActivation = await readCurrentProductionVersion(options);
 	if (ownerBeforeActivation.kind === "failed") return {
@@ -1570,10 +1571,10 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 		status: activate.status,
 		versionId,
 		previousVersionId: previous.versionId,
-		rollback: stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "version activation failed", [stagedVersionPercentages(previous.versionId, versionId), [{
+		...stagedVersionOverride ? await restorePreviousVersion(options, previous.versionId, "version activation failed", [stagedVersionPercentages(previous.versionId, versionId), [{
 			versionId,
 			percentage: 100
-		}]]) : "not-needed"
+		}]]) : { rollback: "not-needed" }
 	};
 	if (!options.verifyUploader()) return {
 		ok: false,
@@ -1666,14 +1667,14 @@ async function activateCloudflareVersionWithSecretsFile(options) {
 				triggerRepair: triggerRepairOutcome(repair)
 			};
 		}
-		const rollback = await restorePreviousVersionAndTriggers(options, previous.versionId, "trigger activation failed", desiredTriggerConfig, versionId, versionedPreviousTriggerConfigWithTraffic);
+		const restore = await restorePreviousVersionAndTriggers(options, previous.versionId, "trigger activation failed", desiredTriggerConfig, versionId, versionedPreviousTriggerConfigWithTraffic);
 		return {
 			ok: false,
 			reason: "triggers-failed",
 			status: triggers.status,
 			versionId,
 			previousVersionId: previous.versionId,
-			rollback
+			...restore
 		};
 	}
 	if (!triggers.targetOwnsTraffic) return {
@@ -1704,16 +1705,28 @@ async function restorePreviousVersionAndTriggers(options, previousVersionId, cau
 		versionId: failedVersionId,
 		percentage: 100
 	}]]);
-	if (traffic !== "succeeded" || !previousVersionId) return traffic;
-	if (!options.verifyUploader()) return "unsafe";
+	if (traffic.rollback !== "succeeded" || !previousVersionId) return traffic;
+	if (!options.verifyUploader()) return {
+		...traffic,
+		rollback: "unsafe"
+	};
 	let targetTriggerConfig = capturedTriggerConfig;
 	if (!targetTriggerConfig) {
 		const metadata = await readCloudflareVersionMetadata(options, previousVersionId);
-		if (metadata?.schema !== 2) return "unavailable";
+		if (metadata?.schema !== 2) return {
+			...traffic,
+			rollback: "unavailable"
+		};
 		targetTriggerConfig = metadata.triggerConfig;
 	}
-	if (targetTriggerConfig.preserve) return "unavailable";
-	if (!options.verifyUploader()) return "unsafe";
+	if (targetTriggerConfig.preserve) return {
+		...traffic,
+		rollback: "unavailable"
+	};
+	if (!options.verifyUploader()) return {
+		...traffic,
+		rollback: "unsafe"
+	};
 	const triggers = await stabilizeCloudflareVersionTriggers({
 		runWrangler: options.runWrangler,
 		workerName: options.workerName,
@@ -1725,7 +1738,10 @@ async function restorePreviousVersionAndTriggers(options, previousVersionId, cau
 		publishEmptyCustomDomains: options.publishEmptyCustomDomains,
 		publishEmptyCrons: options.publishEmptyCrons
 	});
-	return triggers.ok && triggers.targetOwnsTraffic ? "succeeded" : "failed";
+	return {
+		...traffic,
+		rollback: triggers.ok && triggers.targetOwnsTraffic ? "succeeded" : "failed"
+	};
 }
 async function readCloudflareVersionMetadata(options, versionId) {
 	return (await readCloudflareVersionInspection(options, versionId))?.metadata ?? null;
@@ -2236,7 +2252,8 @@ async function deployVersionPercentages(options, percentages, message) {
 		versions: versionPercentages(percentages),
 		configPath: options.configPath,
 		workerName: options.workerName,
-		message
+		message,
+		...options.bypassDeploymentChecks ? { bypassDeploymentChecks: true } : {}
 	}, { capture: false });
 }
 /** Change version traffic without synchronizing Worker settings from local config. */
@@ -2251,7 +2268,8 @@ async function deployCloudflareVersionTraffic(options) {
 			versions: versionPercentages(options.percentages),
 			configPath: path,
 			workerName: options.workerName,
-			message: options.message
+			message: options.message,
+			...options.bypassDeploymentChecks ? { bypassDeploymentChecks: true } : {}
 		}, { capture: false });
 	} finally {
 		rmSync(directory, {
@@ -2261,11 +2279,26 @@ async function deployCloudflareVersionTraffic(options) {
 	}
 }
 async function restorePreviousVersion(options, previousVersionId, cause, expectedOwnedTraffic) {
-	if (!previousVersionId) return "unavailable";
-	if (!options.verifyUploader()) return "unsafe";
-	const owner = await readCurrentProductionVersion(options);
-	if (owner.kind !== "ok" || !expectedOwnedTraffic.some((expected) => productionVersionPercentagesEqual(owner.versions, expected))) return "unsafe";
-	return isCleanCommandExit(await deployVersionPercentages(options, [`${previousVersionId}@100`], `Void automatic rollback after ${cause}.`)) ? "succeeded" : "failed";
+	if (!previousVersionId) return { rollback: "unavailable" };
+	if (!options.verifyUploader()) return { rollback: "unsafe" };
+	const ownsExpectedTraffic = async () => {
+		const owner = await readCurrentProductionVersion(options);
+		return owner.kind === "ok" && expectedOwnedTraffic.some((expected) => productionVersionPercentagesEqual(owner.versions, expected));
+	};
+	if (!await ownsExpectedTraffic()) return { rollback: "unsafe" };
+	const restore = (bypassDeploymentChecks) => deployVersionPercentages({
+		...options,
+		bypassDeploymentChecks
+	}, [`${previousVersionId}@100`], `Void automatic rollback after ${cause}.`);
+	const result = await restore(false);
+	if (result.errorCode === CLOUDFLARE_SECRET_CHANGED_ERROR) {
+		if (!await ownsExpectedTraffic()) return { rollback: "unsafe" };
+		return isCleanCommandExit(await restore(true)) ? {
+			rollback: "succeeded",
+			restoredOlderSecrets: true
+		} : { rollback: "failed" };
+	}
+	return { rollback: isCleanCommandExit(result) ? "succeeded" : "failed" };
 }
 function workersDevReadinessUrl(workerName, value) {
 	const subdomain = normalizeWorkersDevSubdomain(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/deploy-cloudflare",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Cloudflare deployment primitives for Void runtimes and deployment adapters.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@void/deploy-core": "1.2.0",
+    "@void/deploy-core": "1.3.0",
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {