Fix/workers observability logs (#7314)

* fix observability.logs.enabled optional logic * run lint fix * add changeset * Update .changeset/lemon-buckets-know.md Co-authored-by: Edmund Hung <me@edmund.dev> --------- Co-authored-by: Edmund Hung <me@edmund.dev>
cloudflare · Nov 21, 2024 · a30c805 · a30c805
1 parent 563439b
commit a30c805
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/.changeset/lemon-buckets-know.md b/.changeset/lemon-buckets-know.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Fix observability.logs.enabled validation
diff --git a/packages/wrangler/src/__tests__/configuration.test.ts b/packages/wrangler/src/__tests__/configuration.test.ts
@@ -5537,6 +5537,29 @@ describe("normalizeAndValidateConfig()", () => {
 
 				expect(diagnostics.hasErrors()).toBe(false);
 			});
+
+			it("should not error on mixed observability config", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						observability: {
+							enabled: true,
+							logs: {
+								invocation_logs: false,
+							},
+						},
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+					"Processing wrangler configuration:
+					"
+				`);
+
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
 			it("should error on a sampling rate out of range", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{

diff --git a/packages/wrangler/src/config/validation.ts b/packages/wrangler/src/config/validation.ts
@@ -3384,7 +3384,7 @@ const validateObservability: ValidatorFn = (diagnostics, field, value) => {
 	 */
 	if (typeof val.logs === "object") {
 		isValid =
-			validateRequiredProperty(
+			validateOptionalProperty(
 				diagnostics,
 				field,
 				"logs.enabled",