fix: disallow setting account_id in named service environments (#814)

Much like #641, we don't want to allow setting account_id with named service environments. This is so that we use the same account_id for multiple environments, and have them group together in the dashboard.

Author: threepointone

.changeset/little-roses-invite.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+fix: disallow setting account_id in named service environments
+
+Much like https://github.com/cloudflare/wrangler2/pull/641, we don't want to allow setting account_id with named service environments. This is so that we use the same account_id for multiple environments, and have them group together in the dashboard.

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

@@ -1763,6 +1763,61 @@ describe("normalizeAndValidateConfig()", () => {
       });
     });
 
+    it("should error if named environment contains a `account_id` field, even if there is no top-level name", () => {
+      const rawConfig: RawConfig = {
+        legacy_env: false,
+        env: {
+          DEV: {
+            account_id: "some_account_id",
+          },
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        rawConfig,
+        undefined,
+        { env: "DEV" }
+      );
+
+      expect(config.account_id).toBeUndefined();
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+
+          - \\"env.DEV\\" environment configuration
+            - The \\"account_id\\" field is not allowed in named service environments.
+              Please remove the field from this environment."
+      `);
+      expect(diagnostics.hasWarnings()).toBe(false);
+    });
+
+    it("should error if top-level config and a named environment both contain a `account_id` field", () => {
+      const rawConfig: RawConfig = {
+        account_id: "ACCOUNT_ID",
+        legacy_env: false,
+        env: {
+          DEV: {
+            account_id: "ENV_ACCOUNT_ID",
+          },
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        rawConfig,
+        undefined,
+        { env: "DEV" }
+      );
+
+      expect(config.account_id).toEqual("ACCOUNT_ID");
+      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+
+          - \\"env.DEV\\" environment configuration
+            - The \\"account_id\\" field is not allowed in named service environments.
+              Please remove the field from this environment."
+      `);
+      expect(diagnostics.hasWarnings()).toBe(false);
+    });
+
     it("should warn for non-inherited fields that are missing in environments", () => {
       const vars: RawConfig["vars"] = {
         FOO: "foo",

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

@@ -82,7 +82,7 @@ export function inheritableInLegacyEnvironments<K extends keyof Environment>(
   rawEnv: RawEnvironment,
   field: K,
   validate: ValidatorFn,
-  transformFn: TransformFn<Environment[K]>,
+  transformFn: TransformFn<Environment[K]> = (v) => v,
   defaultValue: Environment[K]
 ): Environment[K] {
   return topLevelEnv === undefined || isLegacyEnv === true

packages/wrangler/src/config/validation.ts

@@ -659,12 +659,14 @@ function normalizeAndValidateEnvironment(
 
   const environment: Environment = {
     // Inherited fields
-    account_id: inheritable(
+    account_id: inheritableInLegacyEnvironments(
       diagnostics,
+      isLegacyEnv,
       topLevelEnv,
       rawEnv,
       "account_id",
       isString,
+      undefined,
       undefined
     ),
     compatibility_date: inheritable(