@mp-lb/arcnet 0.7.21 → 0.7.23
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 +28 -1
- package/dist/arcnetConfig.d.ts +6 -0
- package/dist/arcnetConfig.d.ts.map +1 -1
- package/dist/arcnetConfig.js +18 -0
- package/dist/arcnetConfig.js.map +1 -1
- package/dist/compileArcnet.d.ts.map +1 -1
- package/dist/compileArcnet.js +25 -10
- package/dist/compileArcnet.js.map +1 -1
- package/dist/desktop/createDesktopCommands.d.ts.map +1 -1
- package/dist/desktop/createDesktopCommands.js +2 -1
- package/dist/desktop/createDesktopCommands.js.map +1 -1
- package/dist/desktop/verifyDesktopRelease.d.ts +2 -1
- package/dist/desktop/verifyDesktopRelease.d.ts.map +1 -1
- package/dist/desktop/verifyDesktopRelease.js +5 -2
- package/dist/desktop/verifyDesktopRelease.js.map +1 -1
- package/dist/runTerraform.d.ts.map +1 -1
- package/dist/runTerraform.js +6 -2
- package/dist/runTerraform.js.map +1 -1
- package/docs/public/commands.md +2 -1
- package/docs/public/llms-full.txt +30 -2
- package/package.json +2 -2
- package/src/arcnetConfig.ts +22 -0
- package/src/compileArcnet.ts +39 -10
- package/src/desktop/createDesktopCommands.ts +5 -3
- package/src/desktop/verifyDesktopRelease.ts +10 -2
- package/src/runTerraform.ts +12 -2
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ pnpm install
|
|
|
11
11
|
pnpm exec arcnet check
|
|
12
12
|
```
|
|
13
13
|
|
|
14
|
-
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
|
|
14
|
+
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 inspectable; deployments require migration to separate base and application state.
|
|
15
15
|
|
|
16
16
|
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.
|
|
17
17
|
|
|
@@ -53,3 +53,30 @@ The MAP Lab CI defaults do not grant billing-management access unless explicitly
|
|
|
53
53
|
React/Vite SPA sites inferred from a package root carry filesystem-first/index fallback routes into prebuilt output; explicit output routing still wins. Existing provider projects are checked for compatible root/framework settings before builds or uploads, and before Terraform apply in mixed deployments. A static prebuilt site's provider root is the repository root, independent of its source build directory.
|
|
54
54
|
|
|
55
55
|
Vercel setup writes `git.deploymentEnabled: false` in JSON configs at the repository and selected source roots, preserving other settings such as rewrites. Dry runs do not write them. An explicit conflicting Git policy stops setup for review, so a Vercel Git build cannot silently compete with the validated ArcNet pipeline. Existing programmatic Vercel config requires manual integration.
|
|
56
|
+
|
|
57
|
+
## Base infrastructure ownership
|
|
58
|
+
|
|
59
|
+
Project creation, API enablement, registries, CI identities, permission grants and
|
|
60
|
+
budgets belong to the administrator-operated [arcnet-base repository](https://github.com/mp-lb/arcnet-base).
|
|
61
|
+
Applications consume its exported `foundation` and `identity` configuration and
|
|
62
|
+
keep their service resources in an isolated application state bucket. They never
|
|
63
|
+
read the base Terraform state.
|
|
64
|
+
|
|
65
|
+
Copy the base stack's `application_config` output into `.arcnet/arcnet.yaml` after
|
|
66
|
+
provisioning or transferring the existing state. A typical foundation is:
|
|
67
|
+
|
|
68
|
+
```yaml
|
|
69
|
+
foundation:
|
|
70
|
+
repository: mp-lb/arcnet-base
|
|
71
|
+
projectId: arcnet-example
|
|
72
|
+
stateBucket: arcnet-example-terraform-state
|
|
73
|
+
statePrefix: terraform/state/example
|
|
74
|
+
```
|
|
75
|
+
|
|
76
|
+
Do not simply remove base modules from an existing application state: Terraform
|
|
77
|
+
would plan to destroy them. Follow arcnet-base's migration procedure first.
|
|
78
|
+
Legacy combined configurations can still be inspected, but deployment stops with
|
|
79
|
+
migration instructions. New setups provision the base locally before enabling
|
|
80
|
+
application CI. Changes to base modules require an administrator's reviewed plan
|
|
81
|
+
and apply in arcnet-base, independently of ArcNet package upgrades. Local ADC
|
|
82
|
+
quota settings do not change GitHub's identity or grant IAM permissions.
|
package/dist/arcnetConfig.d.ts
CHANGED
|
@@ -8,6 +8,12 @@ declare const arcnetConfigSchema: z.ZodObject<{
|
|
|
8
8
|
project: z.ZodString;
|
|
9
9
|
environment: z.ZodDefault<z.ZodString>;
|
|
10
10
|
repository: z.ZodString;
|
|
11
|
+
foundation: z.ZodOptional<z.ZodObject<{
|
|
12
|
+
repository: z.ZodDefault<z.ZodString>;
|
|
13
|
+
projectId: z.ZodString;
|
|
14
|
+
stateBucket: z.ZodString;
|
|
15
|
+
statePrefix: z.ZodString;
|
|
16
|
+
}, z.core.$strict>>;
|
|
11
17
|
services: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
12
18
|
infrastructure: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
13
19
|
identity: z.ZodOptional<z.ZodObject<{
|
|
@@ -1 +1 @@
|
|
|
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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAkDb,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"}
|
package/dist/arcnetConfig.js
CHANGED
|
@@ -32,6 +32,24 @@ const arcnetConfigSchema = z
|
|
|
32
32
|
project: slug,
|
|
33
33
|
environment: z.string().default("mp-lb"),
|
|
34
34
|
repository,
|
|
35
|
+
foundation: z
|
|
36
|
+
.object({
|
|
37
|
+
repository: repository.default("mp-lb/arcnet-base"),
|
|
38
|
+
projectId: z.string().regex(/^[a-z][a-z0-9-]{4,28}[a-z0-9]$/),
|
|
39
|
+
stateBucket: z
|
|
40
|
+
.string()
|
|
41
|
+
.min(3)
|
|
42
|
+
.refine((name) => ![
|
|
43
|
+
"arcnet-base-terraform-state",
|
|
44
|
+
"arcnet-platform-terraform-state",
|
|
45
|
+
].includes(name), "Use the application's isolated state bucket, never the base or legacy shared bucket."),
|
|
46
|
+
statePrefix: z
|
|
47
|
+
.string()
|
|
48
|
+
.min(1)
|
|
49
|
+
.refine((value) => !value.includes("..") && !/[\r\n]/.test(value)),
|
|
50
|
+
})
|
|
51
|
+
.strict()
|
|
52
|
+
.optional(),
|
|
35
53
|
services: z.record(z.string(), z.unknown()).optional(),
|
|
36
54
|
infrastructure: z.record(z.string(), z.unknown()).optional(),
|
|
37
55
|
identity: z
|
package/dist/arcnetConfig.js.map
CHANGED
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileArcnet.d.ts","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,eAAO,MAAM,UAAU,GAAI,QAAQ,YAAY,iDAO5B,CAAC;AAEpB,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,EAAE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CA2B/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"compileArcnet.d.ts","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAKtD,eAAO,MAAM,UAAU,GAAI,QAAQ,YAAY,iDAO5B,CAAC;AAEpB,eAAO,MAAM,aAAa,GAAI,QAAQ,YAAY,EAAE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;CA2B/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuGpD,CAAC"}
|
package/dist/compileArcnet.js
CHANGED
|
@@ -56,24 +56,39 @@ export const compileTerraform = (config) => {
|
|
|
56
56
|
if (service.module === "aws-s3")
|
|
57
57
|
service.params["cors-origins"] ??= [...new Set(corsOrigins)].sort();
|
|
58
58
|
const infrastructure = deployBlockSchema.shape.project.parse(config.infrastructure ?? {});
|
|
59
|
+
if (config.foundation &&
|
|
60
|
+
(Object.keys(infrastructure).some((key) => ["gcp", "ci", "registry", "budget"].includes(key)) ||
|
|
61
|
+
Object.values({ ...infrastructure, ...services }).some((value) => ["gcp-project", "github-ci", "project-base", "gcp-budget"].includes(value.module))))
|
|
62
|
+
throw new Error("Base infrastructure belongs in the foundation repository. Remove its entries from application infrastructure after transferring Terraform state.");
|
|
59
63
|
const modules = [
|
|
60
64
|
...Object.values(services),
|
|
61
65
|
...Object.values(infrastructure),
|
|
62
66
|
].map((resource) => resource.module);
|
|
63
67
|
const network = resolveEnvironment(config.environment, modules);
|
|
68
|
+
if (config.foundation) {
|
|
69
|
+
network.backend = {
|
|
70
|
+
gcs: {
|
|
71
|
+
bucket: config.foundation.stateBucket,
|
|
72
|
+
prefix: config.foundation.statePrefix,
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
network["gcp-project"] = config.foundation.projectId;
|
|
76
|
+
}
|
|
64
77
|
for (const service of Object.values(services))
|
|
65
78
|
if (service.module === "vercel-static")
|
|
66
79
|
service.module = "./node_modules/@mp-lb/arcnet/templates/vercel-static";
|
|
67
|
-
const project =
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
module: "
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
80
|
+
const project = config.foundation
|
|
81
|
+
? infrastructure
|
|
82
|
+
: {
|
|
83
|
+
gcp: { module: "gcp-project" },
|
|
84
|
+
registry: { module: "project-base", "depends-on": ["gcp"] },
|
|
85
|
+
ci: {
|
|
86
|
+
module: "github-ci",
|
|
87
|
+
"depends-on": ["gcp"],
|
|
88
|
+
params: { repository: config.repository },
|
|
89
|
+
},
|
|
90
|
+
...infrastructure,
|
|
91
|
+
};
|
|
77
92
|
const deployment = deployBlockSchema.parse({ project, services });
|
|
78
93
|
const identity = config.identity ?? {
|
|
79
94
|
workloadIdentityProvider: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compileArcnet.js","sourceRoot":"","sources":["../src/compileArcnet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDesktopCommands.d.ts","sourceRoot":"","sources":["../../src/desktop/createDesktopCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"createDesktopCommands.d.ts","sourceRoot":"","sources":["../../src/desktop/createDesktopCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,SAmClC,CAAC"}
|
|
@@ -6,8 +6,9 @@ export const createDesktopCommands = (cli, output) => {
|
|
|
6
6
|
.description("Prepare and verify desktop releases.");
|
|
7
7
|
desktop
|
|
8
8
|
.command("verify")
|
|
9
|
-
.description("Verify
|
|
9
|
+
.description("Verify desktop release assets are publicly downloadable.")
|
|
10
10
|
.requiredOption("--repository <owner/repo>", "Public releases repository")
|
|
11
|
+
.option("--tag <tag>", "Verify this release tag instead of the repository latest")
|
|
11
12
|
.option("--linux", "Require DEB, RPM, and a Linux update manifest")
|
|
12
13
|
.option("--windows", "Require a Windows installer")
|
|
13
14
|
.action(async (options) => output(await verifyDesktopRelease(options.repository, options)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDesktopCommands.js","sourceRoot":"","sources":["../../src/desktop/createDesktopCommands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,GAAY,EACZ,MAAiC,EACjC,EAAE;IACF,MAAM,OAAO,GAAG,GAAG;SAChB,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,sCAAsC,CAAC,CAAC;IAEvD,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,
|
|
1
|
+
{"version":3,"file":"createDesktopCommands.js","sourceRoot":"","sources":["../../src/desktop/createDesktopCommands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,GAAY,EACZ,MAAiC,EACjC,EAAE;IACF,MAAM,OAAO,GAAG,GAAG;SAChB,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,sCAAsC,CAAC,CAAC;IAEvD,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,0DAA0D,CAAC;SACvE,cAAc,CAAC,2BAA2B,EAAE,4BAA4B,CAAC;SACzE,MAAM,CACL,aAAa,EACb,0DAA0D,CAC3D;SACA,MAAM,CAAC,SAAS,EAAE,+CAA+C,CAAC;SAClE,MAAM,CAAC,WAAW,EAAE,6BAA6B,CAAC;SAClD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACxB,MAAM,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAChE,CAAC;IAEJ,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CACV,0EAA0E,CAC3E;SACA,cAAc,CACb,cAAc,EACd,8CAA8C,CAC/C;SACA,cAAc,CACb,cAAc,EACd,8CAA8C,CAC/C;SACA,cAAc,CAAC,iBAAiB,EAAE,mCAAmC,CAAC;SACtE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export declare const verifyDesktopRelease: (repository: string, { linux, windows }?: {
|
|
1
|
+
export declare const verifyDesktopRelease: (repository: string, { linux, windows, tag, }?: {
|
|
2
2
|
linux?: boolean | undefined;
|
|
3
3
|
windows?: boolean | undefined;
|
|
4
|
+
tag?: string | undefined;
|
|
4
5
|
}) => Promise<{
|
|
5
6
|
operation: string;
|
|
6
7
|
tag: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyDesktopRelease.d.ts","sourceRoot":"","sources":["../../src/desktop/verifyDesktopRelease.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB
|
|
1
|
+
{"version":3,"file":"verifyDesktopRelease.d.ts","sourceRoot":"","sources":["../../src/desktop/verifyDesktopRelease.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,EAClB;;;;CAIM;;;;;EAyEP,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
export const verifyDesktopRelease = async (repository, { linux = false, windows = false } = {}) => {
|
|
2
|
+
export const verifyDesktopRelease = async (repository, { linux = false, windows = false, tag = undefined, } = {}) => {
|
|
3
3
|
z.string()
|
|
4
4
|
.regex(/^[\w.-]+\/[\w.-]+$/)
|
|
5
5
|
.parse(repository);
|
|
6
|
-
const
|
|
6
|
+
const endpoint = tag ? `tags/${encodeURIComponent(tag)}` : "latest";
|
|
7
|
+
const response = await fetch(`https://api.github.com/repos/${repository}/releases/${endpoint}`, { headers: { Accept: "application/vnd.github+json" } });
|
|
7
8
|
if (!response.ok)
|
|
8
9
|
throw new Error(`Public release is unavailable: HTTP ${response.status}.`);
|
|
9
10
|
const release = z
|
|
@@ -16,6 +17,8 @@ export const verifyDesktopRelease = async (repository, { linux = false, windows
|
|
|
16
17
|
})),
|
|
17
18
|
})
|
|
18
19
|
.parse(await response.json());
|
|
20
|
+
if (tag && release.tag_name !== tag)
|
|
21
|
+
throw new Error("GitHub returned an unexpected release tag.");
|
|
19
22
|
const required = [".dmg", ".zip", "latest-mac.yml"];
|
|
20
23
|
if (linux)
|
|
21
24
|
required.push(".deb", ".rpm", "latest-linux.yml");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyDesktopRelease.js","sourceRoot":"","sources":["../../src/desktop/verifyDesktopRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,UAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"verifyDesktopRelease.js","sourceRoot":"","sources":["../../src/desktop/verifyDesktopRelease.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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;;;;;;
|
|
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;;;;;;CA+NhB,CAAC"}
|
package/dist/runTerraform.js
CHANGED
|
@@ -19,6 +19,8 @@ export const runTerraform = (command, root, machine = false) => {
|
|
|
19
19
|
const read = (name) => readFileSync(join(here, name), "utf8");
|
|
20
20
|
const modern = hasArcnetConfig(root) ? readArcnetConfig(root) : undefined;
|
|
21
21
|
const compiled = modern ? compileTerraform(modern) : undefined;
|
|
22
|
+
if (command === "deploy" && !modern?.foundation)
|
|
23
|
+
throw new Error("This project still combines base and application Terraform. Migrate its base resources to mp-lb/arcnet-base and add the exported foundation configuration before deploying. Do not grant administrator roles to application CI.");
|
|
22
24
|
const legacy = modern
|
|
23
25
|
? undefined
|
|
24
26
|
: terraformConfigSchema.parse(JSON.parse(read("project.json")));
|
|
@@ -50,7 +52,8 @@ export const runTerraform = (command, root, machine = false) => {
|
|
|
50
52
|
if (["cloud-run-web", "gce-worker"].includes(service.module) &&
|
|
51
53
|
(!service.dockerfile || !existsSync(join(root, service.dockerfile))))
|
|
52
54
|
throw new Error("Container Dockerfile is missing.");
|
|
53
|
-
if (
|
|
55
|
+
if (!modern?.foundation &&
|
|
56
|
+
deployment.project?.ci?.params?.repository !== config.repository)
|
|
54
57
|
throw new Error("Deployment manifest repository differs from project config.");
|
|
55
58
|
const publicEnv = (modern ? readVariables(root, modern) : undefined) ??
|
|
56
59
|
(existsSync(join(here, "env.production.json"))
|
|
@@ -81,7 +84,7 @@ export const runTerraform = (command, root, machine = false) => {
|
|
|
81
84
|
process.env.GITHUB_REF !== "refs/heads/main")
|
|
82
85
|
throw new Error("CI deployment is restricted to the configured repository main branch.");
|
|
83
86
|
if (!/^projects\/\d+\/locations\/global\/workloadIdentityPools\/github\/providers\/github-actions$/.test(config.workloadIdentityProvider))
|
|
84
|
-
throw new Error("Set workloadIdentityProvider
|
|
87
|
+
throw new Error("Set workloadIdentityProvider from the administrator-managed base stack's application_config output.");
|
|
85
88
|
}
|
|
86
89
|
const modulesDir = resolve(dirname(require.resolve("@mp-lb/zapper")), "../arc");
|
|
87
90
|
const manifest = compiled
|
|
@@ -144,6 +147,7 @@ export const runTerraform = (command, root, machine = false) => {
|
|
|
144
147
|
ZAP_ARC_NETWORK_FILE: networkFile,
|
|
145
148
|
...(manifestFile ? { ZAP_ARC_MANIFEST_FILE: manifestFile } : {}),
|
|
146
149
|
ZAP_ARC_CONFIG: operator,
|
|
150
|
+
ZAP_ARC_MIGRATION_COMMAND: modern?.foundation?.repository ?? "mp-lb/arcnet-base",
|
|
147
151
|
}, machine, JSON.stringify(envPool));
|
|
148
152
|
return { operation: command, message: `Zap Arc ${command} completed.` };
|
|
149
153
|
}
|
package/dist/runTerraform.js.map
CHANGED
|
@@ -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,MAAM,gBAAgB,CAAC;AAC/C,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,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,
|
|
1
|
+
{"version":3,"file":"runTerraform.js","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"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"}
|
package/docs/public/commands.md
CHANGED
|
@@ -97,11 +97,12 @@ Prepare and verify desktop releases.
|
|
|
97
97
|
|
|
98
98
|
### `arcnet desktop verify`
|
|
99
99
|
|
|
100
|
-
Verify
|
|
100
|
+
Verify desktop release assets are publicly downloadable.
|
|
101
101
|
|
|
102
102
|
| Option | Description |
|
|
103
103
|
| --- | --- |
|
|
104
104
|
| `--repository <owner/repo>` | Public releases repository |
|
|
105
|
+
| `--tag <tag>` | Verify this release tag instead of the repository latest |
|
|
105
106
|
| `--linux` | Require DEB, RPM, and a Linux update manifest |
|
|
106
107
|
| `--windows` | Require a Windows installer |
|
|
107
108
|
|
|
@@ -11,7 +11,7 @@ pnpm install
|
|
|
11
11
|
pnpm exec arcnet check
|
|
12
12
|
```
|
|
13
13
|
|
|
14
|
-
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
|
|
14
|
+
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 inspectable; deployments require migration to separate base and application state.
|
|
15
15
|
|
|
16
16
|
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.
|
|
17
17
|
|
|
@@ -54,6 +54,33 @@ React/Vite SPA sites inferred from a package root carry filesystem-first/index f
|
|
|
54
54
|
|
|
55
55
|
Vercel setup writes `git.deploymentEnabled: false` in JSON configs at the repository and selected source roots, preserving other settings such as rewrites. Dry runs do not write them. An explicit conflicting Git policy stops setup for review, so a Vercel Git build cannot silently compete with the validated ArcNet pipeline. Existing programmatic Vercel config requires manual integration.
|
|
56
56
|
|
|
57
|
+
## Base infrastructure ownership
|
|
58
|
+
|
|
59
|
+
Project creation, API enablement, registries, CI identities, permission grants and
|
|
60
|
+
budgets belong to the administrator-operated [arcnet-base repository](https://github.com/mp-lb/arcnet-base).
|
|
61
|
+
Applications consume its exported `foundation` and `identity` configuration and
|
|
62
|
+
keep their service resources in an isolated application state bucket. They never
|
|
63
|
+
read the base Terraform state.
|
|
64
|
+
|
|
65
|
+
Copy the base stack's `application_config` output into `.arcnet/arcnet.yaml` after
|
|
66
|
+
provisioning or transferring the existing state. A typical foundation is:
|
|
67
|
+
|
|
68
|
+
```yaml
|
|
69
|
+
foundation:
|
|
70
|
+
repository: mp-lb/arcnet-base
|
|
71
|
+
projectId: arcnet-example
|
|
72
|
+
stateBucket: arcnet-example-terraform-state
|
|
73
|
+
statePrefix: terraform/state/example
|
|
74
|
+
```
|
|
75
|
+
|
|
76
|
+
Do not simply remove base modules from an existing application state: Terraform
|
|
77
|
+
would plan to destroy them. Follow arcnet-base's migration procedure first.
|
|
78
|
+
Legacy combined configurations can still be inspected, but deployment stops with
|
|
79
|
+
migration instructions. New setups provision the base locally before enabling
|
|
80
|
+
application CI. Changes to base modules require an administrator's reviewed plan
|
|
81
|
+
and apply in arcnet-base, independently of ArcNet package upgrades. Local ADC
|
|
82
|
+
quota settings do not change GitHub's identity or grant IAM permissions.
|
|
83
|
+
|
|
57
84
|
# ArcNet command reference
|
|
58
85
|
|
|
59
86
|
Generated from the CLI command tree.
|
|
@@ -153,11 +180,12 @@ Prepare and verify desktop releases.
|
|
|
153
180
|
|
|
154
181
|
### `arcnet desktop verify`
|
|
155
182
|
|
|
156
|
-
Verify
|
|
183
|
+
Verify desktop release assets are publicly downloadable.
|
|
157
184
|
|
|
158
185
|
| Option | Description |
|
|
159
186
|
| --- | --- |
|
|
160
187
|
| `--repository <owner/repo>` | Public releases repository |
|
|
188
|
+
| `--tag <tag>` | Verify this release tag instead of the repository latest |
|
|
161
189
|
| `--linux` | Require DEB, RPM, and a Linux update manifest |
|
|
162
190
|
| `--windows` | Require a Windows installer |
|
|
163
191
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mp-lb/arcnet",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.23",
|
|
4
4
|
"description": "ArcNet project installation and deployment CLI.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@mp-lb/forum-secrets": "0.2.1",
|
|
39
|
-
"@mp-lb/zapper": "0.21.
|
|
39
|
+
"@mp-lb/zapper": "0.21.14",
|
|
40
40
|
"commander": "14.0.3",
|
|
41
41
|
"yaml": "2.8.1",
|
|
42
42
|
"zod": "4.4.1"
|
package/src/arcnetConfig.ts
CHANGED
|
@@ -44,6 +44,28 @@ const arcnetConfigSchema = z
|
|
|
44
44
|
project: slug,
|
|
45
45
|
environment: z.string().default("mp-lb"),
|
|
46
46
|
repository,
|
|
47
|
+
foundation: z
|
|
48
|
+
.object({
|
|
49
|
+
repository: repository.default("mp-lb/arcnet-base"),
|
|
50
|
+
projectId: z.string().regex(/^[a-z][a-z0-9-]{4,28}[a-z0-9]$/),
|
|
51
|
+
stateBucket: z
|
|
52
|
+
.string()
|
|
53
|
+
.min(3)
|
|
54
|
+
.refine(
|
|
55
|
+
(name) =>
|
|
56
|
+
![
|
|
57
|
+
"arcnet-base-terraform-state",
|
|
58
|
+
"arcnet-platform-terraform-state",
|
|
59
|
+
].includes(name),
|
|
60
|
+
"Use the application's isolated state bucket, never the base or legacy shared bucket.",
|
|
61
|
+
),
|
|
62
|
+
statePrefix: z
|
|
63
|
+
.string()
|
|
64
|
+
.min(1)
|
|
65
|
+
.refine((value) => !value.includes("..") && !/[\r\n]/.test(value)),
|
|
66
|
+
})
|
|
67
|
+
.strict()
|
|
68
|
+
.optional(),
|
|
47
69
|
services: z.record(z.string(), z.unknown()).optional(),
|
|
48
70
|
infrastructure: z.record(z.string(), z.unknown()).optional(),
|
|
49
71
|
identity: z
|
package/src/compileArcnet.ts
CHANGED
|
@@ -83,26 +83,55 @@ export const compileTerraform = (config: ArcnetConfig) => {
|
|
|
83
83
|
config.infrastructure ?? {},
|
|
84
84
|
);
|
|
85
85
|
|
|
86
|
+
if (
|
|
87
|
+
config.foundation &&
|
|
88
|
+
(Object.keys(infrastructure).some((key) =>
|
|
89
|
+
["gcp", "ci", "registry", "budget"].includes(key),
|
|
90
|
+
) ||
|
|
91
|
+
Object.values({ ...infrastructure, ...services }).some((value) =>
|
|
92
|
+
["gcp-project", "github-ci", "project-base", "gcp-budget"].includes(
|
|
93
|
+
value.module,
|
|
94
|
+
),
|
|
95
|
+
))
|
|
96
|
+
)
|
|
97
|
+
throw new Error(
|
|
98
|
+
"Base infrastructure belongs in the foundation repository. Remove its entries from application infrastructure after transferring Terraform state.",
|
|
99
|
+
);
|
|
100
|
+
|
|
86
101
|
const modules = [
|
|
87
102
|
...Object.values(services),
|
|
88
103
|
...Object.values(infrastructure),
|
|
89
104
|
].map((resource) => resource.module);
|
|
90
105
|
|
|
91
106
|
const network = resolveEnvironment(config.environment, modules);
|
|
107
|
+
|
|
108
|
+
if (config.foundation) {
|
|
109
|
+
network.backend = {
|
|
110
|
+
gcs: {
|
|
111
|
+
bucket: config.foundation.stateBucket,
|
|
112
|
+
prefix: config.foundation.statePrefix,
|
|
113
|
+
},
|
|
114
|
+
};
|
|
115
|
+
|
|
116
|
+
network["gcp-project"] = config.foundation.projectId;
|
|
117
|
+
}
|
|
118
|
+
|
|
92
119
|
for (const service of Object.values(services))
|
|
93
120
|
if (service.module === "vercel-static")
|
|
94
121
|
service.module = "./node_modules/@mp-lb/arcnet/templates/vercel-static";
|
|
95
122
|
|
|
96
|
-
const project =
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
123
|
+
const project = config.foundation
|
|
124
|
+
? infrastructure
|
|
125
|
+
: {
|
|
126
|
+
gcp: { module: "gcp-project" },
|
|
127
|
+
registry: { module: "project-base", "depends-on": ["gcp"] },
|
|
128
|
+
ci: {
|
|
129
|
+
module: "github-ci",
|
|
130
|
+
"depends-on": ["gcp"],
|
|
131
|
+
params: { repository: config.repository },
|
|
132
|
+
},
|
|
133
|
+
...infrastructure,
|
|
134
|
+
};
|
|
106
135
|
|
|
107
136
|
const deployment = deployBlockSchema.parse({ project, services });
|
|
108
137
|
|
|
@@ -13,10 +13,12 @@ export const createDesktopCommands = (
|
|
|
13
13
|
|
|
14
14
|
desktop
|
|
15
15
|
.command("verify")
|
|
16
|
-
.description(
|
|
17
|
-
"Verify the latest desktop release assets are publicly downloadable.",
|
|
18
|
-
)
|
|
16
|
+
.description("Verify desktop release assets are publicly downloadable.")
|
|
19
17
|
.requiredOption("--repository <owner/repo>", "Public releases repository")
|
|
18
|
+
.option(
|
|
19
|
+
"--tag <tag>",
|
|
20
|
+
"Verify this release tag instead of the repository latest",
|
|
21
|
+
)
|
|
20
22
|
.option("--linux", "Require DEB, RPM, and a Linux update manifest")
|
|
21
23
|
.option("--windows", "Require a Windows installer")
|
|
22
24
|
.action(async (options) =>
|
|
@@ -2,14 +2,19 @@ import { z } from "zod";
|
|
|
2
2
|
|
|
3
3
|
export const verifyDesktopRelease = async (
|
|
4
4
|
repository: string,
|
|
5
|
-
{
|
|
5
|
+
{
|
|
6
|
+
linux = false,
|
|
7
|
+
windows = false,
|
|
8
|
+
tag = undefined as string | undefined,
|
|
9
|
+
} = {},
|
|
6
10
|
) => {
|
|
7
11
|
z.string()
|
|
8
12
|
.regex(/^[\w.-]+\/[\w.-]+$/)
|
|
9
13
|
.parse(repository);
|
|
10
14
|
|
|
15
|
+
const endpoint = tag ? `tags/${encodeURIComponent(tag)}` : "latest";
|
|
11
16
|
const response = await fetch(
|
|
12
|
-
`https://api.github.com/repos/${repository}/releases
|
|
17
|
+
`https://api.github.com/repos/${repository}/releases/${endpoint}`,
|
|
13
18
|
{ headers: { Accept: "application/vnd.github+json" } },
|
|
14
19
|
);
|
|
15
20
|
|
|
@@ -29,6 +34,9 @@ export const verifyDesktopRelease = async (
|
|
|
29
34
|
})
|
|
30
35
|
.parse(await response.json());
|
|
31
36
|
|
|
37
|
+
if (tag && release.tag_name !== tag)
|
|
38
|
+
throw new Error("GitHub returned an unexpected release tag.");
|
|
39
|
+
|
|
32
40
|
const required = [".dmg", ".zip", "latest-mac.yml"];
|
|
33
41
|
if (linux) required.push(".deb", ".rpm", "latest-linux.yml");
|
|
34
42
|
if (windows) required.push(".exe");
|
package/src/runTerraform.ts
CHANGED
|
@@ -34,6 +34,11 @@ export const runTerraform = (
|
|
|
34
34
|
const modern = hasArcnetConfig(root) ? readArcnetConfig(root) : undefined;
|
|
35
35
|
const compiled = modern ? compileTerraform(modern) : undefined;
|
|
36
36
|
|
|
37
|
+
if (command === "deploy" && !modern?.foundation)
|
|
38
|
+
throw new Error(
|
|
39
|
+
"This project still combines base and application Terraform. Migrate its base resources to mp-lb/arcnet-base and add the exported foundation configuration before deploying. Do not grant administrator roles to application CI.",
|
|
40
|
+
);
|
|
41
|
+
|
|
37
42
|
const legacy = modern
|
|
38
43
|
? undefined
|
|
39
44
|
: terraformConfigSchema.parse(JSON.parse(read("project.json")));
|
|
@@ -80,7 +85,10 @@ export const runTerraform = (
|
|
|
80
85
|
(!service.dockerfile || !existsSync(join(root, service.dockerfile)))
|
|
81
86
|
)
|
|
82
87
|
throw new Error("Container Dockerfile is missing.");
|
|
83
|
-
if (
|
|
88
|
+
if (
|
|
89
|
+
!modern?.foundation &&
|
|
90
|
+
deployment.project?.ci?.params?.repository !== config.repository
|
|
91
|
+
)
|
|
84
92
|
throw new Error(
|
|
85
93
|
"Deployment manifest repository differs from project config.",
|
|
86
94
|
);
|
|
@@ -139,7 +147,7 @@ export const runTerraform = (
|
|
|
139
147
|
)
|
|
140
148
|
)
|
|
141
149
|
throw new Error(
|
|
142
|
-
"Set workloadIdentityProvider
|
|
150
|
+
"Set workloadIdentityProvider from the administrator-managed base stack's application_config output.",
|
|
143
151
|
);
|
|
144
152
|
}
|
|
145
153
|
|
|
@@ -231,6 +239,8 @@ export const runTerraform = (
|
|
|
231
239
|
ZAP_ARC_NETWORK_FILE: networkFile,
|
|
232
240
|
...(manifestFile ? { ZAP_ARC_MANIFEST_FILE: manifestFile } : {}),
|
|
233
241
|
ZAP_ARC_CONFIG: operator,
|
|
242
|
+
ZAP_ARC_MIGRATION_COMMAND:
|
|
243
|
+
modern?.foundation?.repository ?? "mp-lb/arcnet-base",
|
|
234
244
|
},
|
|
235
245
|
machine,
|
|
236
246
|
JSON.stringify(envPool),
|