@mp-lb/arcnet 0.6.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -11,7 +11,9 @@ pnpm exec arcnet check
11
11
 
12
12
  A package-only project gets no deploy workflow or cloud configuration. Vercel sites can use static output or a Next.js framework build; Terraform services use the bundled `mp-lb` environment and Zap Arc. Both can be selected in one project file. ArcNet passes Zap Arc a temporary manifest, leaving the project's `zap.yaml` unchanged. Existing multi-file installations remain supported until explicitly migrated.
13
13
 
14
- The project file can contain `services` (Zap Arc service blocks), `vercel` (site roots and project identities), non-secret `variables`, and a `secrets` source/consumer map. For a Vercel site, `root: apps/<site>` selects its package. ArcNet infers a static build for Vite, VitePress, or prerendered React Router packages and uses Vercel's framework build for Next.js. Explicit `build`, `output`, and `outputConfig` override static detection. Set `vercel.dnsZone` and a site's `domain` to attach a custom domain and reconcile its Cloudflare CNAME on production deploy; the deploy consumer must provide `CLOUDFLARE_API_TOKEN`. Existing unrelated DNS records cause a clear error rather than being replaced. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard Cloud Run domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
14
+ The project file can contain `services` (Zap Arc service blocks), `vercel` (site roots and project identities), Forum paths for non-secret `variables`, and a `secrets` source/consumer map. For a Vercel site, `root: apps/<site>` selects its package. ArcNet infers a static build for Vite, VitePress, or prerendered React Router packages and uses Vercel's framework build for Next.js. Explicit `build`, `output`, and `outputConfig` override static detection. Set `vercel.dnsZone` and a site's `domain` to attach a custom domain and reconcile its Cloudflare CNAME on production deploy; the deploy consumer must provide `CLOUDFLARE_API_TOKEN`. Existing unrelated DNS records cause a clear error rather than being replaced. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard Cloud Run domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
15
+
16
+ For non-secret production values, list ordered Forum files under `variables: { store, paths }`, normally `/admin/standard-variables.json` followed by `/projects/<project>/variables.json`. Project values override shared values. Run `arcnet variables sync` and commit the readable `.arcnet/variables/*.json` snapshots. CI reads those snapshots, so it needs no Forum access token. `arcnet env` merges them with encrypted secrets before applying consumer mappings; secrets win on duplicate names. Existing inline `variables:` maps remain supported while migrating.
15
17
 
16
18
  When `aws-s3` is selected, the conventional `s3` service gets a private `arcnet.<project>.backend` bucket by default. Other S3 services use `arcnet.<project>.<service>`; set `params.bucket` to override either name. ArcNet derives browser CORS origins from the HTTPS domains of selected services and Vercel sites. This permits browser requests made with backend-issued presigned URLs while the bucket remains private.
17
19
 
@@ -1,4 +1,8 @@
1
1
  import { z } from "zod";
2
+ export declare const forumVariablesSchema: z.ZodObject<{
3
+ store: z.ZodString;
4
+ paths: z.ZodArray<z.ZodString>;
5
+ }, z.core.$strict>;
2
6
  declare const arcnetConfigSchema: z.ZodObject<{
3
7
  version: z.ZodLiteral<1>;
4
8
  project: z.ZodString;
@@ -43,7 +47,10 @@ declare const arcnetConfigSchema: z.ZodObject<{
43
47
  }, z.core.$strict>>;
44
48
  dnsZone: z.ZodOptional<z.ZodString>;
45
49
  }, z.core.$strict>>;
46
- variables: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
50
+ variables: z.ZodOptional<z.ZodUnion<readonly [z.ZodRecord<z.ZodString, z.ZodString>, z.ZodObject<{
51
+ store: z.ZodString;
52
+ paths: z.ZodArray<z.ZodString>;
53
+ }, z.core.$strict>]>>;
47
54
  secrets: z.ZodOptional<z.ZodObject<{
48
55
  sources: z.ZodArray<z.ZodObject<{
49
56
  key: z.ZodString;
@@ -1 +1 @@
1
- {"version":3,"file":"arcnetConfig.d.ts","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA0Bb,CAAC;AAEZ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WACV,CAAC;AAEpC,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,YACR,CAAC;AAErC,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,YAW/C,CAAC"}
1
+ {"version":3,"file":"arcnetConfig.d.ts","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8BxB,eAAO,MAAM,oBAAoB;;;kBAKtB,CAAC;AAEZ,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA0Bb,CAAC;AAEZ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WACV,CAAC;AAEpC,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,YACR,CAAC;AAErC,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,KAAG,YAW/C,CAAC"}
@@ -10,7 +10,22 @@ const slug = z
10
10
  .regex(/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/)
11
11
  .max(23);
12
12
  const repository = z.string().regex(/^[\w.-]+\/[\w.-]+$/);
13
- const variables = z.record(z.string().regex(/^[A-Z_][A-Z0-9_]*$/), z.string());
13
+ const inlineVariables = z.record(z.string().regex(/^[A-Z_][A-Z0-9_]*$/), z.string());
14
+ const variablePath = z
15
+ .string()
16
+ .startsWith("/")
17
+ .endsWith(".json")
18
+ .refine((path) => !/[\r\n\0]/.test(path) &&
19
+ path
20
+ .split("/")
21
+ .slice(1)
22
+ .every((part) => part && part !== "." && part !== ".."));
23
+ export const forumVariablesSchema = z
24
+ .object({
25
+ store: z.string().regex(/^[\w-]+\/[\w-]+$/),
26
+ paths: z.array(variablePath).min(1),
27
+ })
28
+ .strict();
14
29
  const arcnetConfigSchema = z
15
30
  .object({
16
31
  version: z.literal(1),
@@ -28,7 +43,7 @@ const arcnetConfigSchema = z
28
43
  .strict()
29
44
  .optional(),
30
45
  vercel: vercelInputSchema.omit({ repository: true }).optional(),
31
- variables: variables.optional(),
46
+ variables: z.union([inlineVariables, forumVariablesSchema]).optional(),
32
47
  secrets: z
33
48
  .object({
34
49
  sources: z.array(simpleSourceSchema).min(1),
@@ -1 +1 @@
1
- {"version":3,"file":"arcnetConfig.js","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"arcnetConfig.js","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,IAAI,GAAG,CAAC;KACX,MAAM,EAAE;KACR,KAAK,CAAC,iCAAiC,CAAC;KACxC,GAAG,CAAC,EAAE,CAAC,CAAC;AAEX,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAE1D,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAC9B,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EACtC,CAAC,CAAC,MAAM,EAAE,CACX,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC;KACnB,MAAM,EAAE;KACR,UAAU,CAAC,GAAG,CAAC;KACf,QAAQ,CAAC,OAAO,CAAC;KACjB,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;IACtB,IAAI;SACD,KAAK,CAAC,GAAG,CAAC;SACV,KAAK,CAAC,CAAC,CAAC;SACR,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,CAC5D,CAAC;AAEJ,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;CACpC,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,kBAAkB,GAAG,CAAC;KACzB,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACrB,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;IACxC,UAAU;IACV,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACpC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACtD,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5D,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,wBAAwB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;KACvC,CAAC;SACD,MAAM,EAAE;SACR,QAAQ,EAAE;IACb,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC/D,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC,CAAC,QAAQ,EAAE;IACtE,OAAO,EAAE,CAAC;SACP,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,SAAS,EAAE,mBAAmB,CAAC,KAAK,CAAC,SAAS;KAC/C,CAAC;SACD,MAAM,EAAE;SACR,QAAQ,EAAE;CACd,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/C,IAAI,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAC9C,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAErC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAgB,EAAE;IAC7D,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CACrC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CACpD,CAAC;IAEF,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,cAAc;QAC1C,iBAAiB,CAAC,KAAK,CAAC;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,OAAO,EAAE,MAAM,CAAC,cAAc,IAAI,EAAE;SACrC,CAAC,CAAC;IACL,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createCli.d.ts","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,eAAO,MAAM,SAAS,eAyLrB,CAAC"}
1
+ {"version":3,"file":"createCli.d.ts","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,eAAO,MAAM,SAAS,eA0MrB,CAAC"}
package/dist/createCli.js CHANGED
@@ -14,6 +14,7 @@ import { createSecretsCommands } from "./secrets/createSecretsCommands.js";
14
14
  import { withDeploymentSecrets } from "./secrets/withDeploymentSecrets.js";
15
15
  import { hasArcnetConfig, readArcnetConfig } from "./arcnetConfig.js";
16
16
  import { arcnetMode } from "./compileArcnet.js";
17
+ import { syncVariables } from "./variables.js";
17
18
  export const createCli = () => {
18
19
  const cli = new Command("arcnet")
19
20
  .description("Install and deploy ArcNet projects.")
@@ -30,6 +31,15 @@ export const createCli = () => {
30
31
  process.stdout.write(renderResult(result, cli.opts()) + "\n");
31
32
  };
32
33
  createSecretsCommands(cli, output);
34
+ cli
35
+ .command("variables")
36
+ .description("Manage non-secret Forum variable snapshots.")
37
+ .command("sync")
38
+ .description("Refresh committed variable snapshots from Forum.")
39
+ .action(() => {
40
+ const root = realpathSync(cli.opts().root);
41
+ output(syncVariables(root, readArcnetConfig(root)));
42
+ });
33
43
  cli
34
44
  .command("environment")
35
45
  .description("Manage ArcNet environment prerequisites.")
@@ -1 +1 @@
1
- {"version":3,"file":"createCli.js","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createCli.js","sourceRoot":"","sources":["../src/createCli.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runTerraform.d.ts","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,YAAY,GACvB,SAAS,OAAO,GAAG,MAAM,GAAG,QAAQ,EACpC,MAAM,MAAM,EACZ,iBAAe;;;;;;CA2NhB,CAAC"}
1
+ {"version":3,"file":"runTerraform.d.ts","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,YAAY,GACvB,SAAS,OAAO,GAAG,MAAM,GAAG,QAAQ,EACpC,MAAM,MAAM,EACZ,iBAAe;;;;;;CA2NhB,CAAC"}
@@ -11,6 +11,7 @@ import { hasArcnetConfig, readArcnetConfig } from "./arcnetConfig.js";
11
11
  import { compileTerraform } from "./compileArcnet.js";
12
12
  import { runProcess } from "./runProcess.js";
13
13
  import { resolvePublicEnv } from "./resolvePublicEnv.js";
14
+ import { readVariables } from "./variables.js";
14
15
  import { envPoolSchema, terraformConfigSchema } from "./schemas.js";
15
16
  const require = createRequire(import.meta.url);
16
17
  export const runTerraform = (command, root, machine = false) => {
@@ -52,7 +53,7 @@ export const runTerraform = (command, root, machine = false) => {
52
53
  throw new Error("Container Dockerfile is missing.");
53
54
  if (deployment.project?.ci?.params?.repository !== config.repository)
54
55
  throw new Error("Deployment manifest repository differs from project config.");
55
- const publicEnv = modern?.variables ??
56
+ const publicEnv = (modern ? readVariables(root, modern) : undefined) ??
56
57
  (existsSync(join(here, "env.production.json"))
57
58
  ? JSON.parse(read("env.production.json"))
58
59
  : {});
@@ -1 +1 @@
1
- {"version":3,"file":"runTerraform.js","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACpE,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,OAAoC,EACpC,IAAY,EACZ,OAAO,GAAG,KAAK,EACf,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE/D,MAAM,MAAM,GAAG,MAAM;QACnB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,MAAM,EAAE,OAAO,IAAI,MAAO,CAAC,IAAI;QACrC,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,MAAO,CAAC,UAAU;QACpD,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,MAAO,CAAC,QAAQ;QAC9C,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAO,CAAC,QAAQ;QACxE,wBAAwB,EAAE,MAAM;YAC9B,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,wBAAwB;YAC7C,CAAC,CAAC,MAAO,CAAC,wBAAwB;QACpC,cAAc,EAAE,MAAM;YACpB,CAAC,CAAC,QAAS,CAAC,QAAQ,CAAC,cAAc;YACnC,CAAC,CAAC,MAAO,CAAC,cAAc;KAC3B,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM;QACtB,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;IAEJ,MAAM,OAAO,GACX,QAAQ,EAAE,OAAO,IAAI,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE9E,MAAM,UAAU,GACd,QAAQ,EAAE,UAAU,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE9D,IAAI,GAAG,CAAC,OAAO,KAAK,MAAM,CAAC,IAAI;QAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;IACzD,IACE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEnD,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;IACJ,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAClD,KAAK,MAAM,OAAO,IAAI,MAAM;QAC1B,IACE,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;YACxD,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;YAEpE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACxD,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,KAAK,MAAM,CAAC,UAAU;QAClE,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IAEJ,MAAM,SAAS,GACb,MAAM,EAAE,SAAS;QACjB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEV,IAAI,SAAS,CAAC;IAEd,IAAI,CAAC;QACH,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;QACvC,IACE,CAAC,IAAI;YACL,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACnB,OAAO,IAAI,KAAK,QAAQ;YACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CACvB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,CACnE;YAED,MAAM,IAAI,KAAK,CACb,8EAA8E,CAC/E,CAAC;IAEN,MAAM,OAAO,GAAG,gBAAgB,CAC9B,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,EAC9B,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAC/B,CAAC;IAEF,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,OAAO;YACL,SAAS,EAAE,OAAO;YAClB,OAAO,EACL,sGAAsG;SACzG,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI;QAClD,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;IAEJ,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;QAC1C,IACE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM,CAAC,UAAU;YACnD,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,iBAAiB;YAE5C,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;QACJ,IACE,CAAC,8FAA8F,CAAC,IAAI,CAClG,MAAM,CAAC,wBAAwB,CAChC;YAED,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CACxB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EACzC,QAAQ,CACT,CAAC;IAEF,MAAM,QAAQ,GAAG,QAAQ;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE;gBACjB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;gBAChC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;gBAChC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;aACrC;SACF;QACH,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7D,KAAK,MAAM,QAAQ,IAAI,SAAS;QAC9B,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW;YACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC/B,MAAM,IAAI,KAAK,CACb,GAAG,UAAU,CAAC,IAAI,oBAAoB,QAAQ,CAAC,GAAG,6EAA6E,CAChI,CAAC;IACR,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC9C,MAAM,IAAI,KAAK,CACb,iHAAiH,CAClH,CAAC;IAEJ,MAAM,OAAO,GAAG,MAAM;SACnB,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC;SACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEvE,IAAI,OAAO,CAAC,MAAM;QAChB,MAAM,IAAI,KAAK,CACb,iCAAiC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,mDAAmD,CACvG,CAAC;IACJ,KAAK,MAAM,IAAI,IAAI;QACjB,WAAW;QACX,QAAQ;QACR,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC,QAAQ,CAAC;YACZ,CAAC,CAAC,EAAE,CAAC;KACR;QACC,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;YAClE,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,wCAAwC,CACjF,CAAC;IACN,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACpD,8EAA8E;IAC9E,kEAAkE;IAClE,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAClD,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE;YAChE,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,QAAQ;YAC1B,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE/B,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,IAAI,QAAQ,EAAE,CAAC;YACb,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/C,aAAa,CACX,YAAa,EACb,SAAS,CAAC;gBACR,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,MAAM,EAAE,UAAU;aACnB,CAAC,CACH,CAAC;QACJ,CAAC;QAED,UAAU,CACR,OAAO,CAAC,QAAQ,EAChB,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAC5B,IAAI,EACJ;YACE,GAAG,OAAO,CAAC,GAAG;YACd,oBAAoB,EAAE,WAAW;YACjC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,cAAc,EAAE,QAAQ;SACzB,EACD,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACxB,CAAC;QAEF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,OAAO,aAAa,EAAE,CAAC;IAC1E,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"runTerraform.js","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiGhB,CAAC"}
1
+ {"version":3,"file":"runVercel.d.ts","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,SAAS,GACpB,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,WAAW,MAAM,EACjB,iBAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmGhB,CAAC"}
package/dist/runVercel.js CHANGED
@@ -11,6 +11,7 @@ import { stringify } from "yaml";
11
11
  import { arcnetConfigPath, hasArcnetConfig, readArcnetConfig, } from "./arcnetConfig.js";
12
12
  import { compileVercel } from "./compileArcnet.js";
13
13
  import { resolvePublicEnv } from "./resolvePublicEnv.js";
14
+ import { readVariables } from "./variables.js";
14
15
  export const runVercel = async (command, root, argument, machine = false) => {
15
16
  const modern = hasArcnetConfig(root) ? readArcnetConfig(root) : undefined;
16
17
  const path = modern
@@ -18,6 +19,7 @@ export const runVercel = async (command, root, argument, machine = false) => {
18
19
  : join(root, ".arcnet/project.json");
19
20
  const original = readFileSync(path, "utf8");
20
21
  const config = validateConfig(modern ? compileVercel(modern, root) : JSON.parse(original), root);
22
+ const publicEnv = modern ? readVariables(root, modern) : {};
21
23
  if (command === "check" || command === "plan")
22
24
  return renderPlan(config, root);
23
25
  if (command === "create" && process.env.GITHUB_ACTIONS === "true")
@@ -76,7 +78,7 @@ export const runVercel = async (command, root, argument, machine = false) => {
76
78
  }
77
79
  await deploy(config, root, request, (cmd, args, cwd, env) => runProcess(cmd, args, cwd, env, machine), {
78
80
  ...process.env,
79
- ...(modern?.variables ? resolvePublicEnv(modern.variables, {}) : {}),
81
+ ...resolvePublicEnv(publicEnv, {}),
80
82
  }, command === "preview" ? "preview" : "production");
81
83
  return { operation: command, message: "Selected sites deployed." };
82
84
  };
@@ -1 +1 @@
1
- {"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runVercel.js","sourceRoot":"","sources":["../src/runVercel.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"createSecretsCommands.d.ts","sourceRoot":"","sources":["../../src/secrets/createSecretsCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,SA2LjC,CAAC"}
1
+ {"version":3,"file":"createSecretsCommands.d.ts","sourceRoot":"","sources":["../../src/secrets/createSecretsCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,SAkMjC,CAAC"}
@@ -8,6 +8,8 @@ import { syncSecrets } from "./syncSecrets.js";
8
8
  import { writeSecretsWorkflow } from "./writeSecretsWorkflow.js";
9
9
  import { promptPassword } from "./promptPassword.js";
10
10
  import { isAllowedSecretsCiRef } from "./isAllowedSecretsCiRef.js";
11
+ import { hasArcnetConfig, readArcnetConfig } from "../arcnetConfig.js";
12
+ import { readVariables } from "../variables.js";
11
13
  export const createSecretsCommands = (cli, output) => {
12
14
  const env = cli
13
15
  .command("env")
@@ -39,7 +41,13 @@ export const createSecretsCommands = (cli, output) => {
39
41
  const password = options.password
40
42
  ? await promptPassword(Boolean(cli.opts().noninteractive))
41
43
  : undefined;
42
- const values = await loadSecrets(config, root, process.env, options.live, password);
44
+ const secrets = await loadSecrets(config, root, process.env, options.live, password);
45
+ const values = {
46
+ ...(hasArcnetConfig(root)
47
+ ? readVariables(root, readArcnetConfig(root))
48
+ : {}),
49
+ ...secrets,
50
+ };
43
51
  const names = options.consumer
44
52
  ? [options.consumer]
45
53
  : Object.keys(config.consumers);
@@ -1 +1 @@
1
- {"version":3,"file":"createSecretsCommands.js","sourceRoot":"","sources":["../../src/secrets/createSecretsCommands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createSecretsCommands.js","sourceRoot":"","sources":["../../src/secrets/createSecretsCommands.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"withDeploymentSecrets.d.ts","sourceRoot":"","sources":["../../src/secrets/withDeploymentSecrets.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,qBAAqB,GAAU,CAAC,EAC3C,MAAM,MAAM,EACZ,MAAM,MAAM,GAAG,SAAS,EACxB,QAAQ,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC5B,qBAAmB,EACnB,wBAAsB,KACrB,OAAO,CAAC,CAAC,CA4EX,CAAC"}
1
+ {"version":3,"file":"withDeploymentSecrets.d.ts","sourceRoot":"","sources":["../../src/secrets/withDeploymentSecrets.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,qBAAqB,GAAU,CAAC,EAC3C,MAAM,MAAM,EACZ,MAAM,MAAM,GAAG,SAAS,EACxB,QAAQ,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC5B,qBAAmB,EACnB,wBAAsB,KACrB,OAAO,CAAC,CAAC,CAkFX,CAAC"}
@@ -7,6 +7,7 @@ import { selectSecrets } from "./selectSecrets.js";
7
7
  import { promptPassword } from "./promptPassword.js";
8
8
  import { hasArcnetConfig, readArcnetConfig } from "../arcnetConfig.js";
9
9
  import { compileTerraform } from "../compileArcnet.js";
10
+ import { readVariables } from "../variables.js";
10
11
  export const withDeploymentSecrets = async (root, mode, action, usePassword = false, noninteractive = false) => {
11
12
  if (!hasSecretsConfig(root))
12
13
  return action();
@@ -20,7 +21,12 @@ export const withDeploymentSecrets = async (root, mode, action, usePassword = fa
20
21
  const password = usePassword
21
22
  ? await promptPassword(noninteractive)
22
23
  : undefined;
23
- const pool = await loadSecrets(config, root, process.env, false, password);
24
+ const pool = {
25
+ ...(hasArcnetConfig(root)
26
+ ? readVariables(root, readArcnetConfig(root))
27
+ : {}),
28
+ ...(await loadSecrets(config, root, process.env, false, password)),
29
+ };
24
30
  const selected = selectSecrets(pool, config, "deploy");
25
31
  if (mode !== "vercel") {
26
32
  const manifest = hasArcnetConfig(root)
@@ -1 +1 @@
1
- {"version":3,"file":"withDeploymentSecrets.js","sourceRoot":"","sources":["../../src/secrets/withDeploymentSecrets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"withDeploymentSecrets.js","sourceRoot":"","sources":["../../src/secrets/withDeploymentSecrets.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import type { ArcnetConfig } from "./arcnetConfig.js";
2
+ export declare const variableSnapshotPath: (path: string) => string;
3
+ export declare const readVariables: (root: string, config: ArcnetConfig) => Record<string, string>;
4
+ export declare const syncVariables: (root: string, config: ArcnetConfig) => {
5
+ operation: string;
6
+ sources: {
7
+ path: string;
8
+ revision: number;
9
+ }[];
10
+ message: string;
11
+ };
12
+ //# sourceMappingURL=variables.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUtD,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,WACW,CAAC;AAE7D,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,QAAQ,YAAY,2BAsB/D,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,QAAQ,YAAY;;;;;;;CAoC/D,CAAC"}
@@ -0,0 +1,52 @@
1
+ import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
2
+ import { dirname } from "node:path";
3
+ import { z } from "zod";
4
+ import { forumVariablesSchema } from "./arcnetConfig.js";
5
+ import { safeTargetPath } from "./safeTargetPath.js";
6
+ import { readRemoteSource } from "./secrets/readRemoteSource.js";
7
+ const valuesSchema = z.record(z.string().regex(/^[A-Z_][A-Z0-9_]*$/), z.string());
8
+ export const variableSnapshotPath = (path) => `.arcnet/variables/${path.slice(1).replaceAll("/", "__")}`;
9
+ export const readVariables = (root, config) => {
10
+ const sources = forumVariablesSchema.safeParse(config.variables);
11
+ if (!sources.success)
12
+ return valuesSchema.parse(config.variables ?? {});
13
+ const values = {};
14
+ for (const path of sources.data.paths) {
15
+ const snapshot = safeTargetPath(root, variableSnapshotPath(path));
16
+ try {
17
+ Object.assign(values, valuesSchema.parse(JSON.parse(readFileSync(snapshot, "utf8"))));
18
+ }
19
+ catch {
20
+ throw new Error(`Invalid or missing variables snapshot for ${path}; run arcnet variables sync and commit the result.`);
21
+ }
22
+ }
23
+ return values;
24
+ };
25
+ export const syncVariables = (root, config) => {
26
+ const sources = forumVariablesSchema.parse(config.variables);
27
+ const files = sources.paths.map((path) => {
28
+ const remote = readRemoteSource({ name: path, store: sources.store, path, keyEnv: "ARCNET_VARIABLES" }, root);
29
+ let values;
30
+ try {
31
+ values = valuesSchema.parse(JSON.parse(remote.text));
32
+ }
33
+ catch {
34
+ throw new Error(`Forum variables file ${path} must map environment names to strings.`);
35
+ }
36
+ return { path, values, revision: remote.revision };
37
+ });
38
+ for (const file of files) {
39
+ const name = variableSnapshotPath(file.path);
40
+ const target = safeTargetPath(root, name);
41
+ const temporary = safeTargetPath(root, `${name}.tmp`);
42
+ mkdirSync(dirname(target), { recursive: true });
43
+ writeFileSync(temporary, JSON.stringify(file.values, null, 2) + "\n");
44
+ renameSync(temporary, target);
45
+ }
46
+ return {
47
+ operation: "variables.sync",
48
+ sources: files.map(({ path, revision }) => ({ path, revision })),
49
+ message: "Review and commit the variable snapshots.",
50
+ };
51
+ };
52
+ //# sourceMappingURL=variables.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"variables.js","sourceRoot":"","sources":["../src/variables.ts"],"names":[],"mappings":"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"}
@@ -91,6 +91,14 @@ Refresh encrypted snapshots from Forum and regenerate validation CI; no decrypti
91
91
  | --- | --- |
92
92
  | `--config <file>` | Secrets source configuration |
93
93
 
94
+ ## `arcnet variables`
95
+
96
+ Manage non-secret Forum variable snapshots.
97
+
98
+ ### `arcnet variables sync`
99
+
100
+ Refresh committed variable snapshots from Forum.
101
+
94
102
  ## `arcnet environment`
95
103
 
96
104
  Manage ArcNet environment prerequisites.
@@ -11,7 +11,9 @@ pnpm exec arcnet check
11
11
 
12
12
  A package-only project gets no deploy workflow or cloud configuration. Vercel sites can use static output or a Next.js framework build; Terraform services use the bundled `mp-lb` environment and Zap Arc. Both can be selected in one project file. ArcNet passes Zap Arc a temporary manifest, leaving the project's `zap.yaml` unchanged. Existing multi-file installations remain supported until explicitly migrated.
13
13
 
14
- The project file can contain `services` (Zap Arc service blocks), `vercel` (site roots and project identities), non-secret `variables`, and a `secrets` source/consumer map. For a Vercel site, `root: apps/<site>` selects its package. ArcNet infers a static build for Vite, VitePress, or prerendered React Router packages and uses Vercel's framework build for Next.js. Explicit `build`, `output`, and `outputConfig` override static detection. Set `vercel.dnsZone` and a site's `domain` to attach a custom domain and reconcile its Cloudflare CNAME on production deploy; the deploy consumer must provide `CLOUDFLARE_API_TOKEN`. Existing unrelated DNS records cause a clear error rather than being replaced. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard Cloud Run domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
14
+ The project file can contain `services` (Zap Arc service blocks), `vercel` (site roots and project identities), Forum paths for non-secret `variables`, and a `secrets` source/consumer map. For a Vercel site, `root: apps/<site>` selects its package. ArcNet infers a static build for Vite, VitePress, or prerendered React Router packages and uses Vercel's framework build for Next.js. Explicit `build`, `output`, and `outputConfig` override static detection. Set `vercel.dnsZone` and a site's `domain` to attach a custom domain and reconcile its Cloudflare CNAME on production deploy; the deploy consumer must provide `CLOUDFLARE_API_TOKEN`. Existing unrelated DNS records cause a clear error rather than being replaced. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard Cloud Run domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
15
+
16
+ For non-secret production values, list ordered Forum files under `variables: { store, paths }`, normally `/admin/standard-variables.json` followed by `/projects/<project>/variables.json`. Project values override shared values. Run `arcnet variables sync` and commit the readable `.arcnet/variables/*.json` snapshots. CI reads those snapshots, so it needs no Forum access token. `arcnet env` merges them with encrypted secrets before applying consumer mappings; secrets win on duplicate names. Existing inline `variables:` maps remain supported while migrating.
15
17
 
16
18
  When `aws-s3` is selected, the conventional `s3` service gets a private `arcnet.<project>.backend` bucket by default. Other S3 services use `arcnet.<project>.<service>`; set `params.bucket` to override either name. ArcNet derives browser CORS origins from the HTTPS domains of selected services and Vercel sites. This permits browser requests made with backend-issued presigned URLs while the bucket remains private.
17
19
 
@@ -116,6 +118,14 @@ Refresh encrypted snapshots from Forum and regenerate validation CI; no decrypti
116
118
  | --- | --- |
117
119
  | `--config <file>` | Secrets source configuration |
118
120
 
121
+ ## `arcnet variables`
122
+
123
+ Manage non-secret Forum variable snapshots.
124
+
125
+ ### `arcnet variables sync`
126
+
127
+ Refresh committed variable snapshots from Forum.
128
+
119
129
  ## `arcnet environment`
120
130
 
121
131
  Manage ArcNet environment prerequisites.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mp-lb/arcnet",
3
- "version": "0.6.0",
3
+ "version": "0.7.1",
4
4
  "description": "ArcNet project installation and deployment CLI.",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -12,7 +12,31 @@ const slug = z
12
12
  .max(23);
13
13
 
14
14
  const repository = z.string().regex(/^[\w.-]+\/[\w.-]+$/);
15
- const variables = z.record(z.string().regex(/^[A-Z_][A-Z0-9_]*$/), z.string());
15
+
16
+ const inlineVariables = z.record(
17
+ z.string().regex(/^[A-Z_][A-Z0-9_]*$/),
18
+ z.string(),
19
+ );
20
+
21
+ const variablePath = z
22
+ .string()
23
+ .startsWith("/")
24
+ .endsWith(".json")
25
+ .refine(
26
+ (path) =>
27
+ !/[\r\n\0]/.test(path) &&
28
+ path
29
+ .split("/")
30
+ .slice(1)
31
+ .every((part) => part && part !== "." && part !== ".."),
32
+ );
33
+
34
+ export const forumVariablesSchema = z
35
+ .object({
36
+ store: z.string().regex(/^[\w-]+\/[\w-]+$/),
37
+ paths: z.array(variablePath).min(1),
38
+ })
39
+ .strict();
16
40
 
17
41
  const arcnetConfigSchema = z
18
42
  .object({
@@ -31,7 +55,7 @@ const arcnetConfigSchema = z
31
55
  .strict()
32
56
  .optional(),
33
57
  vercel: vercelInputSchema.omit({ repository: true }).optional(),
34
- variables: variables.optional(),
58
+ variables: z.union([inlineVariables, forumVariablesSchema]).optional(),
35
59
  secrets: z
36
60
  .object({
37
61
  sources: z.array(simpleSourceSchema).min(1),
package/src/createCli.ts CHANGED
@@ -14,6 +14,7 @@ import { createSecretsCommands } from "./secrets/createSecretsCommands.js";
14
14
  import { withDeploymentSecrets } from "./secrets/withDeploymentSecrets.js";
15
15
  import { hasArcnetConfig, readArcnetConfig } from "./arcnetConfig.js";
16
16
  import { arcnetMode } from "./compileArcnet.js";
17
+ import { syncVariables } from "./variables.js";
17
18
 
18
19
  export const createCli = () => {
19
20
  const cli = new Command("arcnet")
@@ -38,6 +39,16 @@ export const createCli = () => {
38
39
 
39
40
  createSecretsCommands(cli, output);
40
41
 
42
+ cli
43
+ .command("variables")
44
+ .description("Manage non-secret Forum variable snapshots.")
45
+ .command("sync")
46
+ .description("Refresh committed variable snapshots from Forum.")
47
+ .action(() => {
48
+ const root = realpathSync(cli.opts().root);
49
+ output(syncVariables(root, readArcnetConfig(root)));
50
+ });
51
+
41
52
  cli
42
53
  .command("environment")
43
54
  .description("Manage ArcNet environment prerequisites.")
@@ -140,16 +151,25 @@ export const createCli = () => {
140
151
  const vercel = await runVercel("check", root, undefined, machine);
141
152
  return { mode: "mixed", terraform, vercel };
142
153
  }
154
+
143
155
  if (name === "create" || name === "inspect" || name === "preview")
144
- return runVercel(name, root, typeof site === "string" ? site : undefined, machine);
156
+ return runVercel(
157
+ name,
158
+ root,
159
+ typeof site === "string" ? site : undefined,
160
+ machine,
161
+ );
162
+
145
163
  if (name === "plan") {
146
164
  const terraform = runTerraform("plan", root, machine);
147
165
  const vercel = await runVercel("plan", root, undefined, machine);
148
166
  return { terraform, vercel };
149
167
  }
168
+
150
169
  runTerraform("deploy", root, machine);
151
170
  return runVercel("deploy", root, undefined, machine);
152
171
  }
172
+
153
173
  if (mode === "vercel")
154
174
  return runVercel(
155
175
  name,
@@ -159,9 +179,7 @@ export const createCli = () => {
159
179
  );
160
180
  if (name === "check" || name === "plan" || name === "deploy")
161
181
  return runTerraform(name, root, machine);
162
- throw new Error(
163
- `${name} is only supported for Vercel sites.`,
164
- );
182
+ throw new Error(`${name} is only supported for Vercel sites.`);
165
183
  };
166
184
 
167
185
  output(
@@ -20,6 +20,7 @@ import { hasArcnetConfig, readArcnetConfig } from "./arcnetConfig.js";
20
20
  import { compileTerraform } from "./compileArcnet.js";
21
21
  import { runProcess } from "./runProcess.js";
22
22
  import { resolvePublicEnv } from "./resolvePublicEnv.js";
23
+ import { readVariables } from "./variables.js";
23
24
  import { envPoolSchema, terraformConfigSchema } from "./schemas.js";
24
25
  const require = createRequire(import.meta.url);
25
26
 
@@ -86,7 +87,7 @@ export const runTerraform = (
86
87
  );
87
88
 
88
89
  const publicEnv: unknown =
89
- modern?.variables ??
90
+ (modern ? readVariables(root, modern) : undefined) ??
90
91
  (existsSync(join(here, "env.production.json"))
91
92
  ? JSON.parse(read("env.production.json"))
92
93
  : {});
package/src/runVercel.ts CHANGED
@@ -15,6 +15,7 @@ import {
15
15
  } from "./arcnetConfig.js";
16
16
  import { compileVercel } from "./compileArcnet.js";
17
17
  import { resolvePublicEnv } from "./resolvePublicEnv.js";
18
+ import { readVariables } from "./variables.js";
18
19
 
19
20
  export const runVercel = async (
20
21
  command: string,
@@ -35,6 +36,8 @@ export const runVercel = async (
35
36
  root,
36
37
  );
37
38
 
39
+ const publicEnv = modern ? readVariables(root, modern) : {};
40
+
38
41
  if (command === "check" || command === "plan")
39
42
  return renderPlan(config, root);
40
43
  if (command === "create" && process.env.GITHUB_ACTIONS === "true")
@@ -111,7 +114,7 @@ export const runVercel = async (
111
114
  (cmd, args, cwd, env) => runProcess(cmd, args, cwd, env, machine),
112
115
  {
113
116
  ...process.env,
114
- ...(modern?.variables ? resolvePublicEnv(modern.variables, {}) : {}),
117
+ ...resolvePublicEnv(publicEnv, {}),
115
118
  },
116
119
  command === "preview" ? "preview" : "production",
117
120
  );
@@ -9,6 +9,8 @@ import { syncSecrets } from "./syncSecrets.js";
9
9
  import { writeSecretsWorkflow } from "./writeSecretsWorkflow.js";
10
10
  import { promptPassword } from "./promptPassword.js";
11
11
  import { isAllowedSecretsCiRef } from "./isAllowedSecretsCiRef.js";
12
+ import { hasArcnetConfig, readArcnetConfig } from "../arcnetConfig.js";
13
+ import { readVariables } from "../variables.js";
12
14
 
13
15
  export const createSecretsCommands = (
14
16
  cli: Command,
@@ -81,7 +83,7 @@ export const createSecretsCommands = (
81
83
  ? await promptPassword(Boolean(cli.opts().noninteractive))
82
84
  : undefined;
83
85
 
84
- const values = await loadSecrets(
86
+ const secrets = await loadSecrets(
85
87
  config,
86
88
  root,
87
89
  process.env,
@@ -89,6 +91,13 @@ export const createSecretsCommands = (
89
91
  password,
90
92
  );
91
93
 
94
+ const values = {
95
+ ...(hasArcnetConfig(root)
96
+ ? readVariables(root, readArcnetConfig(root))
97
+ : {}),
98
+ ...secrets,
99
+ };
100
+
92
101
  const names = options.consumer
93
102
  ? [options.consumer]
94
103
  : Object.keys(config.consumers);
@@ -7,6 +7,7 @@ import { selectSecrets } from "./selectSecrets.js";
7
7
  import { promptPassword } from "./promptPassword.js";
8
8
  import { hasArcnetConfig, readArcnetConfig } from "../arcnetConfig.js";
9
9
  import { compileTerraform } from "../compileArcnet.js";
10
+ import { readVariables } from "../variables.js";
10
11
 
11
12
  export const withDeploymentSecrets = async <T>(
12
13
  root: string,
@@ -34,7 +35,13 @@ export const withDeploymentSecrets = async <T>(
34
35
  ? await promptPassword(noninteractive)
35
36
  : undefined;
36
37
 
37
- const pool = await loadSecrets(config, root, process.env, false, password);
38
+ const pool = {
39
+ ...(hasArcnetConfig(root)
40
+ ? readVariables(root, readArcnetConfig(root))
41
+ : {}),
42
+ ...(await loadSecrets(config, root, process.env, false, password)),
43
+ };
44
+
38
45
  const selected = selectSecrets(pool, config, "deploy");
39
46
 
40
47
  if (mode !== "vercel") {
@@ -0,0 +1,77 @@
1
+ import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
2
+ import { dirname } from "node:path";
3
+ import { z } from "zod";
4
+ import type { ArcnetConfig } from "./arcnetConfig.js";
5
+ import { forumVariablesSchema } from "./arcnetConfig.js";
6
+ import { safeTargetPath } from "./safeTargetPath.js";
7
+ import { readRemoteSource } from "./secrets/readRemoteSource.js";
8
+
9
+ const valuesSchema = z.record(
10
+ z.string().regex(/^[A-Z_][A-Z0-9_]*$/),
11
+ z.string(),
12
+ );
13
+
14
+ export const variableSnapshotPath = (path: string) =>
15
+ `.arcnet/variables/${path.slice(1).replaceAll("/", "__")}`;
16
+
17
+ export const readVariables = (root: string, config: ArcnetConfig) => {
18
+ const sources = forumVariablesSchema.safeParse(config.variables);
19
+ if (!sources.success) return valuesSchema.parse(config.variables ?? {});
20
+
21
+ const values: Record<string, string> = {};
22
+
23
+ for (const path of sources.data.paths) {
24
+ const snapshot = safeTargetPath(root, variableSnapshotPath(path));
25
+
26
+ try {
27
+ Object.assign(
28
+ values,
29
+ valuesSchema.parse(JSON.parse(readFileSync(snapshot, "utf8"))),
30
+ );
31
+ } catch {
32
+ throw new Error(
33
+ `Invalid or missing variables snapshot for ${path}; run arcnet variables sync and commit the result.`,
34
+ );
35
+ }
36
+ }
37
+
38
+ return values;
39
+ };
40
+
41
+ export const syncVariables = (root: string, config: ArcnetConfig) => {
42
+ const sources = forumVariablesSchema.parse(config.variables);
43
+
44
+ const files = sources.paths.map((path) => {
45
+ const remote = readRemoteSource(
46
+ { name: path, store: sources.store, path, keyEnv: "ARCNET_VARIABLES" },
47
+ root,
48
+ );
49
+
50
+ let values: Record<string, string>;
51
+
52
+ try {
53
+ values = valuesSchema.parse(JSON.parse(remote.text));
54
+ } catch {
55
+ throw new Error(
56
+ `Forum variables file ${path} must map environment names to strings.`,
57
+ );
58
+ }
59
+
60
+ return { path, values, revision: remote.revision };
61
+ });
62
+
63
+ for (const file of files) {
64
+ const name = variableSnapshotPath(file.path);
65
+ const target = safeTargetPath(root, name);
66
+ const temporary = safeTargetPath(root, `${name}.tmp`);
67
+ mkdirSync(dirname(target), { recursive: true });
68
+ writeFileSync(temporary, JSON.stringify(file.values, null, 2) + "\n");
69
+ renameSync(temporary, target);
70
+ }
71
+
72
+ return {
73
+ operation: "variables.sync",
74
+ sources: files.map(({ path, revision }) => ({ path, revision })),
75
+ message: "Review and commit the variable snapshots.",
76
+ };
77
+ };