Allows uploads with both cron triggers and smart placement enabled (#…

…4219)

Revert "Prevents uploads with both cron triggers and smart placement enabled (#3390)"

This reverts commit b5b46b4.

Co-authored-by: Max Peterson <mpeterson@cloudflare.com>

.changeset/three-carpets-smile.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Allows uploads with both cron triggers and smart placement enabled

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

@@ -963,7 +963,7 @@ describe("normalizeAndValidateConfig()", () => {
 				first_party_worker: true,
 				logpush: true,
 				placement: {
-					mode: "off",
+					mode: "smart",
 				},
 			};
 
@@ -4791,60 +4791,6 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
-		describe("[placement]", () => {
-			it("should error if both placement and triggers are configured", () => {
-				const { diagnostics } = normalizeAndValidateConfig(
-					{
-						triggers: {
-							crons: [1111],
-						},
-						placement: { mode: "smart" },
-					} as unknown as RawConfig,
-					undefined,
-					{ env: undefined }
-				);
-
-				expect(diagnostics.hasWarnings()).toBe(false);
-				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-			"Processing wrangler configuration:
-			  - You cannot configure both [triggers] and [placement] in your wrangler.toml. Placement is not supported with cron triggers."
-		`);
-			});
-			it("should not error if triggers are configured and placement is set off", () => {
-				const { diagnostics } = normalizeAndValidateConfig(
-					{
-						triggers: {
-							crons: [1111],
-						},
-						placement: { mode: "off" },
-					} as unknown as RawConfig,
-					undefined,
-					{ env: undefined }
-				);
-
-				expect(diagnostics.hasWarnings()).toBe(false);
-				expect(diagnostics.hasErrors()).toBe(false);
-			});
-			it("should not error if placement is configured and triggers is empty array", () => {
-				const expectedConfig: RawEnvironment = {
-					triggers: { crons: [] },
-					placement: {
-						mode: "smart",
-					},
-				};
-				const { config, diagnostics } = normalizeAndValidateConfig(
-					expectedConfig,
-					undefined,
-					{ env: undefined }
-				);
-
-				expect(config).toEqual(expect.objectContaining({ ...expectedConfig }));
-
-				expect(diagnostics.hasWarnings()).toBe(false);
-				expect(diagnostics.hasErrors()).toBe(false);
-			});
-		});
-
 		describe("(deprecated)", () => {
 			it("should remove and warn about deprecated properties", () => {
 				const environment: RawEnvironment = {

packages/wrangler/src/config/validation-helpers.ts

@@ -533,27 +533,6 @@ export const validateAdditionalProperties = (
 	return true;
 };
 
-/**
- * Add a diagnostic error for any configurations that include both cron triggers and smart placement
- */
-export const validateSmartPlacementConfig = (
-	diagnostics: Diagnostics,
-	placement: { mode: "off" | "smart" } | undefined,
-	triggers:
-		| {
-				crons: string[];
-		  }
-		| undefined
-): boolean => {
-	if (placement?.mode === "smart" && !!triggers?.crons?.length) {
-		diagnostics.errors.push(
-			`You cannot configure both [triggers] and [placement] in your wrangler.toml. Placement is not supported with cron triggers.`
-		);
-		return false;
-	}
-	return true;
-};
-
 /**
  * Get the names of the bindings collection in `value`.
  *

packages/wrangler/src/config/validation.ts

@@ -26,7 +26,6 @@ import {
 	appendEnvName,
 	getBindingNames,
 	isValidName,
-	validateSmartPlacementConfig,
 } from "./validation-helpers";
 import type { Config, DevConfig, RawConfig, RawDevConfig } from "./config";
 import type {
@@ -238,8 +237,6 @@ export function normalizeAndValidateConfig(
 		[...Object.keys(config), "env"]
 	);
 
-	validateSmartPlacementConfig(diagnostics, config.placement, config.triggers);
-
 	experimental(diagnostics, rawConfig, "assets");
 
 	return { config, diagnostics };