@mp-lb/arcnet 0.4.0 → 0.5.0
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 +3 -3
- package/dist/arcnetConfig.d.ts +2 -9
- package/dist/arcnetConfig.d.ts.map +1 -1
- package/dist/arcnetConfig.js +2 -2
- package/dist/arcnetConfig.js.map +1 -1
- package/dist/secrets/config.d.ts +14 -6
- package/dist/secrets/config.d.ts.map +1 -1
- package/dist/secrets/config.js +38 -5
- package/dist/secrets/config.js.map +1 -1
- package/dist/secrets/createSecretsCommands.d.ts.map +1 -1
- package/dist/secrets/createSecretsCommands.js +3 -2
- package/dist/secrets/createSecretsCommands.js.map +1 -1
- package/dist/secrets/loadSecrets.js +2 -2
- package/dist/secrets/loadSecrets.js.map +1 -1
- package/dist/secrets/provisionSource.d.ts +12 -2
- package/dist/secrets/provisionSource.d.ts.map +1 -1
- package/dist/secrets/provisionSource.js +39 -4
- package/dist/secrets/provisionSource.js.map +1 -1
- package/dist/secrets/readRemoteSource.js +1 -1
- package/dist/secrets/readRemoteSource.js.map +1 -1
- package/dist/secrets/syncSecrets.d.ts +7 -0
- package/dist/secrets/syncSecrets.d.ts.map +1 -1
- package/dist/secrets/syncSecrets.js +25 -0
- package/dist/secrets/syncSecrets.js.map +1 -1
- package/docs/public/commands.md +6 -4
- package/docs/public/llms-full.txt +9 -7
- package/package.json +1 -1
- package/src/arcnetConfig.ts +2 -2
- package/src/secrets/config.ts +44 -7
- package/src/secrets/createSecretsCommands.ts +5 -7
- package/src/secrets/loadSecrets.ts +2 -2
- package/src/secrets/provisionSource.ts +57 -6
- package/src/secrets/readRemoteSource.ts +1 -1
- package/src/secrets/syncSecrets.ts +40 -0
package/README.md
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
ArcNet installs selected delivery capabilities into a Zap/pnpm/GitHub project. The project owns one `.arcnet/arcnet.yaml`; this package owns the standard environment preset, runners, validation and workflow templates. [Project setup](https://github.com/mp-lb/stackforge/blob/main/arcnet/SETUP.md) · [File tree](https://github.com/mp-lb/stackforge/blob/main/arcnet/README.md) · [Command reference](docs/public/commands.md)
|
|
4
4
|
|
|
5
5
|
```sh
|
|
6
|
-
pnpm dlx @mp-lb/arcnet@0.
|
|
7
|
-
pnpm dlx @mp-lb/arcnet@0.
|
|
6
|
+
pnpm dlx @mp-lb/arcnet@0.5.0 setup <project-slug> --dry-run
|
|
7
|
+
pnpm dlx @mp-lb/arcnet@0.5.0 setup <project-slug>
|
|
8
8
|
pnpm install
|
|
9
9
|
pnpm exec arcnet check
|
|
10
10
|
```
|
|
@@ -13,6 +13,6 @@ A package-only project gets no deploy workflow or cloud configuration. A static
|
|
|
13
13
|
|
|
14
14
|
The project file can contain `services` (Zap Arc service blocks), `vercel` (explicit static-site references), non-secret `variables`, and a `secrets` source/consumer map. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
|
|
15
15
|
|
|
16
|
-
`arcnet secrets add` attaches a Forum encrypted JSON source and provisions its
|
|
16
|
+
`arcnet secrets add --key KEY` attaches a Forum encrypted JSON source and provisions its GitHub decryption key. `arcnet secrets init --key KEY` creates a source. A new project's `arcnet.yaml` records only the key, Forum store/path, and consumer mappings. The committed ciphertext lives at `.arcnet/secrets/KEY.json.enc`; `arcnet secrets sync` refreshes it atomically. CI decrypts that file using the GitHub key and does not fetch from Forum. `arcnet env run --consumer publish -- <command>` gives a publish command only its selected credentials; the project release workflow must call it. Older source definitions with names and snapshot metadata remain readable.
|
|
17
17
|
|
|
18
18
|
Domain ownership delegation is available through `arcnet environment domain-owner` after a human verifies the base domain. Project domain add/remove and full environment bootstrap/teardown remain unimplemented.
|
package/dist/arcnetConfig.d.ts
CHANGED
|
@@ -39,17 +39,10 @@ declare const arcnetConfigSchema: z.ZodObject<{
|
|
|
39
39
|
variables: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
40
40
|
secrets: z.ZodOptional<z.ZodObject<{
|
|
41
41
|
sources: z.ZodArray<z.ZodObject<{
|
|
42
|
-
|
|
42
|
+
key: z.ZodString;
|
|
43
43
|
store: z.ZodString;
|
|
44
44
|
path: z.ZodString;
|
|
45
|
-
|
|
46
|
-
tokenEnv: z.ZodOptional<z.ZodString>;
|
|
47
|
-
snapshot: z.ZodOptional<z.ZodObject<{
|
|
48
|
-
file: z.ZodString;
|
|
49
|
-
fileId: z.ZodString;
|
|
50
|
-
revision: z.ZodNumber;
|
|
51
|
-
sha256: z.ZodString;
|
|
52
|
-
}, z.core.$strict>>;
|
|
45
|
+
token: z.ZodOptional<z.ZodString>;
|
|
53
46
|
}, z.core.$strict>>;
|
|
54
47
|
consumers: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>>>;
|
|
55
48
|
}, z.core.$strict>>;
|
|
@@ -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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA8BrB,CAAC;AAEJ,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
|
@@ -4,7 +4,7 @@ import { parse } from "yaml";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
6
6
|
import { vercelInputSchema } from "./schemas.js";
|
|
7
|
-
import { secretsConfigSchema } from "./secrets/config.js";
|
|
7
|
+
import { secretsConfigSchema, simpleSourceSchema } from "./secrets/config.js";
|
|
8
8
|
const slug = z
|
|
9
9
|
.string()
|
|
10
10
|
.regex(/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/)
|
|
@@ -31,7 +31,7 @@ const arcnetConfigSchema = z
|
|
|
31
31
|
variables: variables.optional(),
|
|
32
32
|
secrets: z
|
|
33
33
|
.object({
|
|
34
|
-
sources:
|
|
34
|
+
sources: z.array(simpleSourceSchema).min(1),
|
|
35
35
|
consumers: secretsConfigSchema.shape.consumers,
|
|
36
36
|
})
|
|
37
37
|
.strict()
|
package/dist/arcnetConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"arcnetConfig.js","sourceRoot":"","sources":["../src/arcnetConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/secrets/config.d.ts
CHANGED
|
@@ -8,9 +8,9 @@ export declare const sourceSchema: z.ZodObject<{
|
|
|
8
8
|
tokenEnv: z.ZodOptional<z.ZodString>;
|
|
9
9
|
snapshot: z.ZodOptional<z.ZodObject<{
|
|
10
10
|
file: z.ZodString;
|
|
11
|
-
fileId: z.ZodString
|
|
12
|
-
revision: z.ZodNumber
|
|
13
|
-
sha256: z.ZodString
|
|
11
|
+
fileId: z.ZodOptional<z.ZodString>;
|
|
12
|
+
revision: z.ZodOptional<z.ZodNumber>;
|
|
13
|
+
sha256: z.ZodOptional<z.ZodString>;
|
|
14
14
|
}, z.core.$strict>>;
|
|
15
15
|
}, z.core.$strict>;
|
|
16
16
|
export declare const secretsConfigSchema: z.ZodObject<{
|
|
@@ -24,15 +24,23 @@ export declare const secretsConfigSchema: z.ZodObject<{
|
|
|
24
24
|
tokenEnv: z.ZodOptional<z.ZodString>;
|
|
25
25
|
snapshot: z.ZodOptional<z.ZodObject<{
|
|
26
26
|
file: z.ZodString;
|
|
27
|
-
fileId: z.ZodString
|
|
28
|
-
revision: z.ZodNumber
|
|
29
|
-
sha256: z.ZodString
|
|
27
|
+
fileId: z.ZodOptional<z.ZodString>;
|
|
28
|
+
revision: z.ZodOptional<z.ZodNumber>;
|
|
29
|
+
sha256: z.ZodOptional<z.ZodString>;
|
|
30
30
|
}, z.core.$strict>>;
|
|
31
31
|
}, z.core.$strict>>;
|
|
32
32
|
consumers: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>>>;
|
|
33
33
|
}, z.core.$strict>;
|
|
34
34
|
export type SecretsConfig = z.infer<typeof secretsConfigSchema>;
|
|
35
35
|
export type SecretSource = z.infer<typeof sourceSchema>;
|
|
36
|
+
export declare const simpleSourceSchema: z.ZodObject<{
|
|
37
|
+
key: z.ZodString;
|
|
38
|
+
store: z.ZodString;
|
|
39
|
+
path: z.ZodString;
|
|
40
|
+
token: z.ZodOptional<z.ZodString>;
|
|
41
|
+
}, z.core.$strict>;
|
|
42
|
+
export declare const snapshotPathForKey: (key: string) => string;
|
|
43
|
+
export declare const sourceNameForKey: (key: string) => string;
|
|
36
44
|
export declare const resolveSecretsConfigPath: (root: string, file?: string) => string;
|
|
37
45
|
export declare const hasSecretsConfig: (root: string) => boolean;
|
|
38
46
|
export declare const readSecretsConfig: (root: string, file?: string) => SecretsConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/secrets/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,OAAO,aAAyC,CAAC;AAC9D,eAAO,MAAM,YAAY;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/secrets/config.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,OAAO,aAAyC,CAAC;AAC9D,eAAO,MAAM,YAAY;;;;;;;;;;;;kBA+Bd,CAAC;AACZ,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;kBAuC5B,CAAC;AACL,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD,eAAO,MAAM,kBAAkB;;;;;kBAOpB,CAAC;AAEZ,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,WACX,CAAC;AACpC,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,WACQ,CAAC;AAgBrD,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,WAIvC,CAAC;AAE9B,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,YAK5C,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,aAAqC,KACpC,aAyBF,CAAC"}
|
package/dist/secrets/config.js
CHANGED
|
@@ -22,9 +22,12 @@ export const sourceSchema = z
|
|
|
22
22
|
snapshot: z
|
|
23
23
|
.object({
|
|
24
24
|
file: z.string(),
|
|
25
|
-
fileId: z.string().min(1),
|
|
26
|
-
revision: z.number().int().nonnegative(),
|
|
27
|
-
sha256: z
|
|
25
|
+
fileId: z.string().min(1).optional(),
|
|
26
|
+
revision: z.number().int().nonnegative().optional(),
|
|
27
|
+
sha256: z
|
|
28
|
+
.string()
|
|
29
|
+
.regex(/^[a-f0-9]{64}$/)
|
|
30
|
+
.optional(),
|
|
28
31
|
})
|
|
29
32
|
.strict()
|
|
30
33
|
.optional(),
|
|
@@ -58,6 +61,28 @@ export const secretsConfigSchema = z
|
|
|
58
61
|
message: "Invalid output environment name.",
|
|
59
62
|
});
|
|
60
63
|
});
|
|
64
|
+
export const simpleSourceSchema = z
|
|
65
|
+
.object({
|
|
66
|
+
key: envName,
|
|
67
|
+
store: sourceSchema.shape.store,
|
|
68
|
+
path: sourceSchema.shape.path,
|
|
69
|
+
token: envName.optional(),
|
|
70
|
+
})
|
|
71
|
+
.strict();
|
|
72
|
+
export const snapshotPathForKey = (key) => `.arcnet/secrets/${key}.json.enc`;
|
|
73
|
+
export const sourceNameForKey = (key) => `source-${key.toLowerCase().replaceAll("_", "-")}`;
|
|
74
|
+
const expandSimpleSources = (sources) => z
|
|
75
|
+
.array(simpleSourceSchema)
|
|
76
|
+
.min(1)
|
|
77
|
+
.parse(sources)
|
|
78
|
+
.map((source) => ({
|
|
79
|
+
name: sourceNameForKey(source.key),
|
|
80
|
+
store: source.store,
|
|
81
|
+
path: source.path,
|
|
82
|
+
keyEnv: source.key,
|
|
83
|
+
tokenEnv: source.token,
|
|
84
|
+
snapshot: { file: snapshotPathForKey(source.key) },
|
|
85
|
+
}));
|
|
61
86
|
export const resolveSecretsConfigPath = (root, file) => file ??
|
|
62
87
|
(existsSync(join(root, ".arcnet/arcnet.yaml"))
|
|
63
88
|
? ".arcnet/arcnet.yaml"
|
|
@@ -72,13 +97,21 @@ export const readSecretsConfig = (root, file = resolveSecretsConfigPath(root)) =
|
|
|
72
97
|
try {
|
|
73
98
|
if (file === ".arcnet/arcnet.yaml") {
|
|
74
99
|
const config = parse(readFileSync(safeTargetPath(root, file), "utf8"));
|
|
100
|
+
const sources = expandSimpleSources(config.secrets?.sources);
|
|
75
101
|
return secretsConfigSchema.parse({
|
|
76
102
|
version: 1,
|
|
77
103
|
repository: config.repository,
|
|
78
|
-
|
|
104
|
+
sources,
|
|
105
|
+
consumers: config.secrets?.consumers,
|
|
79
106
|
});
|
|
80
107
|
}
|
|
81
|
-
|
|
108
|
+
const config = JSON.parse(readFileSync(safeTargetPath(root, file), "utf8"));
|
|
109
|
+
if (Array.isArray(config.sources) && config.sources[0]?.key)
|
|
110
|
+
return secretsConfigSchema.parse({
|
|
111
|
+
...config,
|
|
112
|
+
sources: expandSimpleSources(config.sources),
|
|
113
|
+
});
|
|
114
|
+
return secretsConfigSchema.parse(config);
|
|
82
115
|
}
|
|
83
116
|
catch {
|
|
84
117
|
throw new Error("Missing or invalid secrets configuration (values omitted).");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/secrets/config.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,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAC9D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC;KAC1B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC;IAC3C,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,UAAU,CAAC,GAAG,CAAC;SACf,QAAQ,CAAC,MAAM,CAAC;SAChB,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI;aACD,KAAK,CAAC,GAAG,CAAC;aACV,KAAK,CAAC,CAAC,CAAC;aACR,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,CAC5D;IACH,MAAM,EAAE,OAAO;IACf,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE;IAC5B,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/secrets/config.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;AAWpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"createSecretsCommands.d.ts","sourceRoot":"","sources":["../../src/secrets/createSecretsCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,eAAO,MAAM,qBAAqB,GAChC,KAAK,OAAO,EACZ,QAAQ,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,SAwLjC,CAAC"}
|
|
@@ -71,10 +71,11 @@ export const createSecretsCommands = (cli, output) => {
|
|
|
71
71
|
.description(mode === "add"
|
|
72
72
|
? "Attach an existing Forum file and provision its CI key."
|
|
73
73
|
: "Create a Forum secrets file, prompt for your password and provision its CI key.")
|
|
74
|
-
.
|
|
74
|
+
.option("--key <name>", "GitHub decryption secret for arcnet.yaml sources")
|
|
75
|
+
.option("--name <name>", "Legacy source name")
|
|
75
76
|
.requiredOption("--store <workspace/store>", "Forum store")
|
|
76
77
|
.requiredOption("--path <path>", "Encrypted file path in Forum")
|
|
77
|
-
.
|
|
78
|
+
.option("--key-env <name>", "Legacy GitHub repository secret")
|
|
78
79
|
.requiredOption("--repository <owner/repo>", "GitHub repository receiving the key")
|
|
79
80
|
.option("--config <file>", "Secrets source configuration");
|
|
80
81
|
if (mode === "add")
|
|
@@ -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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"}
|
|
@@ -17,7 +17,7 @@ export const loadSecrets = async (config, root, environment = process.env, live
|
|
|
17
17
|
? readFileSync(safeTargetPath(root, source.snapshot.file), "utf8")
|
|
18
18
|
: readRemoteSource(source, root, environment).text;
|
|
19
19
|
if (!live &&
|
|
20
|
-
source.snapshot &&
|
|
20
|
+
source.snapshot?.sha256 &&
|
|
21
21
|
createHash("sha256").update(text).digest("hex") !==
|
|
22
22
|
source.snapshot.sha256)
|
|
23
23
|
throw new Error("Snapshot integrity mismatch");
|
|
@@ -45,7 +45,7 @@ export const loadSecrets = async (config, root, environment = process.env, live
|
|
|
45
45
|
values = { ...values, ...decoded };
|
|
46
46
|
}
|
|
47
47
|
catch {
|
|
48
|
-
throw new Error(`Source ${source.name} failed to load or decrypt; check its key and
|
|
48
|
+
throw new Error(`Source ${source.name} failed to load or decrypt; check its key and encrypted file (values omitted).`);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
return values;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadSecrets.js","sourceRoot":"","sources":["../../src/secrets/loadSecrets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,MAAqB,EACrB,IAAY,EACZ,WAAW,GAAG,OAAO,CAAC,GAAG,EACzB,IAAI,GAAG,KAAK,EACZ,QAAiB,EACjB,EAAE;IACF,IAAI,MAAM,GAA4B,EAAE,CAAC;IAEzC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ;YACnB,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAEtE,IAAI,CAAC;YACH,MAAM,IAAI,GACR,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ;gBACtB,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAClE,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC;YAEvD,IACE,CAAC,IAAI;gBACL,MAAM,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"loadSecrets.js","sourceRoot":"","sources":["../../src/secrets/loadSecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export interface ProvisionOptions {
|
|
2
|
-
|
|
2
|
+
key?: string;
|
|
3
|
+
name?: string;
|
|
3
4
|
store: string;
|
|
4
5
|
path: string;
|
|
5
|
-
keyEnv
|
|
6
|
+
keyEnv?: string;
|
|
6
7
|
repository: string;
|
|
7
8
|
existingKey?: boolean;
|
|
8
9
|
input?: string;
|
|
@@ -12,6 +13,15 @@ export declare const provisionSource: (mode: "add" | "init", options: ProvisionO
|
|
|
12
13
|
operation: string;
|
|
13
14
|
status: string;
|
|
14
15
|
message: string;
|
|
16
|
+
} | {
|
|
17
|
+
operation: string;
|
|
18
|
+
githubSecret: string;
|
|
19
|
+
sources: {
|
|
20
|
+
key: string;
|
|
21
|
+
revision: number;
|
|
22
|
+
}[];
|
|
23
|
+
message: string;
|
|
24
|
+
status?: undefined;
|
|
15
25
|
} | {
|
|
16
26
|
operation: string;
|
|
17
27
|
githubSecret: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionSource.d.ts","sourceRoot":"","sources":["../../src/secrets/provisionSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provisionSource.d.ts","sourceRoot":"","sources":["../../src/secrets/provisionSource.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,eAAe,GAC1B,MAAM,KAAK,GAAG,MAAM,EACpB,SAAS,gBAAgB,EACzB,MAAM,MAAM,EACZ,YAAY,MAAM;;;;;;;;;;;;;;;;;;;;;;EAuPnB,CAAC"}
|
|
@@ -2,8 +2,9 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from "node:fs";
|
|
3
3
|
import { tmpdir } from "node:os";
|
|
4
4
|
import { join } from "node:path";
|
|
5
|
+
import { parseDocument } from "yaml";
|
|
5
6
|
import { safeTargetPath } from "../safeTargetPath.js";
|
|
6
|
-
import { hasSecretsConfig, readSecretsConfig, secretsConfigSchema, sourceSchema, } from "./config.js";
|
|
7
|
+
import { hasSecretsConfig, readSecretsConfig, secretsConfigSchema, sourceSchema, snapshotPathForKey, sourceNameForKey, } from "./config.js";
|
|
7
8
|
import { promptPassword } from "./promptPassword.js";
|
|
8
9
|
import { secretCommand } from "./secretCommand.js";
|
|
9
10
|
import { readRemoteSource } from "./readRemoteSource.js";
|
|
@@ -15,13 +16,22 @@ export const provisionSource = async (mode, options, root, configFile) => {
|
|
|
15
16
|
throw new Error("Provisioning uses an ArcNet configuration under .arcnet/.");
|
|
16
17
|
if (process.env.GITHUB_ACTIONS === "true")
|
|
17
18
|
throw new Error("Provision secrets from an authorized local terminal, not CI.");
|
|
19
|
+
const modern = configFile === ".arcnet/arcnet.yaml";
|
|
20
|
+
const configPath = safeTargetPath(root, configFile);
|
|
21
|
+
const simple = modern ||
|
|
22
|
+
Boolean(options.key) ||
|
|
23
|
+
(existsSync(configPath) &&
|
|
24
|
+
Boolean(JSON.parse(readFileSync(configPath, "utf8")).sources?.[0]?.key));
|
|
25
|
+
const key = simple ? options.key : options.keyEnv;
|
|
26
|
+
if (!key || (!simple && !options.name))
|
|
27
|
+
throw new Error(simple ? "Provide --key." : "Provide --name and --key-env.");
|
|
18
28
|
const source = sourceSchema.parse({
|
|
19
|
-
name: options.name,
|
|
29
|
+
name: simple ? sourceNameForKey(key) : options.name,
|
|
20
30
|
store: options.store,
|
|
21
31
|
path: options.path.startsWith("/") ? options.path : `/${options.path}`,
|
|
22
|
-
keyEnv:
|
|
32
|
+
keyEnv: key,
|
|
33
|
+
...(simple ? { snapshot: { file: snapshotPathForKey(key) } } : {}),
|
|
23
34
|
});
|
|
24
|
-
const configPath = safeTargetPath(root, configFile);
|
|
25
35
|
const config = existsSync(configPath) && hasSecretsConfig(root)
|
|
26
36
|
? readSecretsConfig(root, configFile)
|
|
27
37
|
: {
|
|
@@ -127,6 +137,31 @@ export const provisionSource = async (mode, options, root, configFile) => {
|
|
|
127
137
|
}
|
|
128
138
|
}
|
|
129
139
|
const result = syncSecrets(next, root, configFile);
|
|
140
|
+
if (simple) {
|
|
141
|
+
const simpleSources = next.sources.map((entry) => ({
|
|
142
|
+
key: entry.keyEnv,
|
|
143
|
+
store: entry.store,
|
|
144
|
+
path: entry.path,
|
|
145
|
+
...(entry.tokenEnv ? { token: entry.tokenEnv } : {}),
|
|
146
|
+
}));
|
|
147
|
+
if (!modern) {
|
|
148
|
+
writeFileSync(configPath, JSON.stringify({
|
|
149
|
+
version: 1,
|
|
150
|
+
repository: next.repository,
|
|
151
|
+
sources: simpleSources,
|
|
152
|
+
consumers: next.consumers,
|
|
153
|
+
}, null, 2) + "\n");
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
const document = parseDocument(readFileSync(configPath, "utf8"));
|
|
157
|
+
if (document.errors.length)
|
|
158
|
+
throw new Error("Invalid arcnet.yaml.");
|
|
159
|
+
document.setIn(["secrets", "sources"], simpleSources);
|
|
160
|
+
if (!document.hasIn(["secrets", "consumers"]))
|
|
161
|
+
document.setIn(["secrets", "consumers"], next.consumers);
|
|
162
|
+
writeFileSync(configPath, document.toString());
|
|
163
|
+
}
|
|
164
|
+
}
|
|
130
165
|
writeSecretsWorkflow(readSecretsConfig(root, configFile), root, configFile);
|
|
131
166
|
return {
|
|
132
167
|
...result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionSource.js","sourceRoot":"","sources":["../../src/secrets/provisionSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,UAAU,EACV,WAAW,EACX,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,
|
|
1
|
+
{"version":3,"file":"provisionSource.js","sourceRoot":"","sources":["../../src/secrets/provisionSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export const readRemoteSource = (source, root, environment = process.env) => {
|
|
|
21
21
|
if (before.id !== after.id ||
|
|
22
22
|
before.revisionNumber !== after.revisionNumber ||
|
|
23
23
|
after.path !== source.path ||
|
|
24
|
-
(source.snapshot && after.id !== source.snapshot.fileId))
|
|
24
|
+
(source.snapshot?.fileId && after.id !== source.snapshot.fileId))
|
|
25
25
|
throw new Error("Source changed");
|
|
26
26
|
return { text, fileId: after.id, revision: after.revisionNumber };
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readRemoteSource.js","sourceRoot":"","sources":["../../src/secrets/readRemoteSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAoB,EACpB,IAAY,EACZ,WAAW,GAAG,OAAO,CAAC,GAAG,EACzB,EAAE;IACF,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IAE/B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC1E,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAC7B,IAAI,CAAC,KAAK,CACR,aAAa,CACX,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,QAAQ,CAAC,EACnC,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CACF,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,CACxB,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,EACzB,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAC5B,IAAI,CAAC,KAAK,CACR,aAAa,CACX,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,QAAQ,CAAC,EACnC,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CACF,CACF,CAAC;QAEF,IACE,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;YACtB,MAAM,CAAC,cAAc,KAAK,KAAK,CAAC,cAAc;YAC9C,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI;YAC1B,CAAC,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"readRemoteSource.js","sourceRoot":"","sources":["../../src/secrets/readRemoteSource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAChC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,MAAoB,EACpB,IAAY,EACZ,WAAW,GAAG,OAAO,CAAC,GAAG,EACzB,EAAE;IACF,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IAE/B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC1E,GAAG,CAAC,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAC7B,IAAI,CAAC,KAAK,CACR,aAAa,CACX,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,QAAQ,CAAC,EACnC,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CACF,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,CACxB,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,EACzB,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAC5B,IAAI,CAAC,KAAK,CACR,aAAa,CACX,IAAI,EACJ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,QAAQ,CAAC,EACnC,IAAI,EACJ,SAAS,EACT,GAAG,CACJ,CACF,CACF,CAAC;QAEF,IACE,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;YACtB,MAAM,CAAC,cAAc,KAAK,KAAK,CAAC,cAAc;YAC9C,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI;YAC1B,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAEhE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,mCAAmC,MAAM,CAAC,IAAI,gDAAgD,CAC/F,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import type { SecretsConfig } from "./config.js";
|
|
2
2
|
export declare const syncSecrets: (config: SecretsConfig, root: string, file: string) => {
|
|
3
|
+
operation: string;
|
|
4
|
+
sources: {
|
|
5
|
+
key: string;
|
|
6
|
+
revision: number;
|
|
7
|
+
}[];
|
|
8
|
+
message: string;
|
|
9
|
+
} | {
|
|
3
10
|
operation: string;
|
|
4
11
|
sources: {
|
|
5
12
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncSecrets.d.ts","sourceRoot":"","sources":["../../src/secrets/syncSecrets.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"syncSecrets.d.ts","sourceRoot":"","sources":["../../src/secrets/syncSecrets.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAKjD,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,EACrB,MAAM,MAAM,EACZ,MAAM,MAAM;;;;;;;;;;;;;;CA4Fb,CAAC"}
|
|
@@ -5,7 +5,32 @@ import { dirname } from "node:path";
|
|
|
5
5
|
import { safeTargetPath } from "../safeTargetPath.js";
|
|
6
6
|
import { readRemoteSource } from "./readRemoteSource.js";
|
|
7
7
|
import { parseDocument } from "yaml";
|
|
8
|
+
import { snapshotPathForKey } from "./config.js";
|
|
8
9
|
export const syncSecrets = (config, root, file) => {
|
|
10
|
+
if (file === ".arcnet/arcnet.yaml" ||
|
|
11
|
+
config.sources.every((source) => source.snapshot?.file === snapshotPathForKey(source.keyEnv) &&
|
|
12
|
+
!source.snapshot.sha256)) {
|
|
13
|
+
const sources = config.sources.map((source) => {
|
|
14
|
+
const remote = readRemoteSource(source, root);
|
|
15
|
+
try {
|
|
16
|
+
parseForumEncryptedFilePayload(remote.text);
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
throw new Error(`Source ${source.keyEnv} is not a supported encrypted file.`);
|
|
20
|
+
}
|
|
21
|
+
const target = safeTargetPath(root, snapshotPathForKey(source.keyEnv));
|
|
22
|
+
mkdirSync(dirname(target), { recursive: true });
|
|
23
|
+
const temporary = safeTargetPath(root, `${snapshotPathForKey(source.keyEnv)}.tmp`);
|
|
24
|
+
writeFileSync(temporary, remote.text, { mode: 0o600 });
|
|
25
|
+
renameSync(temporary, target);
|
|
26
|
+
return { key: source.keyEnv, revision: remote.revision };
|
|
27
|
+
});
|
|
28
|
+
return {
|
|
29
|
+
operation: "secrets.sync",
|
|
30
|
+
sources,
|
|
31
|
+
message: "Review and commit the encrypted snapshots.",
|
|
32
|
+
};
|
|
33
|
+
}
|
|
9
34
|
const sources = config.sources.map((source) => {
|
|
10
35
|
const remote = readRemoteSource(source, root);
|
|
11
36
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncSecrets.js","sourceRoot":"","sources":["../../src/secrets/syncSecrets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"syncSecrets.js","sourceRoot":"","sources":["../../src/secrets/syncSecrets.ts"],"names":[],"mappings":"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"}
|
package/docs/public/commands.md
CHANGED
|
@@ -59,10 +59,11 @@ Attach an existing Forum file and provision its CI key.
|
|
|
59
59
|
|
|
60
60
|
| Option | Description |
|
|
61
61
|
| --- | --- |
|
|
62
|
-
| `--
|
|
62
|
+
| `--key <name>` | GitHub decryption secret for arcnet.yaml sources |
|
|
63
|
+
| `--name <name>` | Legacy source name |
|
|
63
64
|
| `--store <workspace/store>` | Forum store |
|
|
64
65
|
| `--path <path>` | Encrypted file path in Forum |
|
|
65
|
-
| `--key-env <name>` | GitHub repository secret
|
|
66
|
+
| `--key-env <name>` | Legacy GitHub repository secret |
|
|
66
67
|
| `--repository <owner/repo>` | GitHub repository receiving the key |
|
|
67
68
|
| `--config <file>` | Secrets source configuration |
|
|
68
69
|
| `--existing-key` | Reuse an existing GitHub secret without creating a recipient |
|
|
@@ -73,10 +74,11 @@ Create a Forum secrets file, prompt for your password and provision its CI key.
|
|
|
73
74
|
|
|
74
75
|
| Option | Description |
|
|
75
76
|
| --- | --- |
|
|
76
|
-
| `--
|
|
77
|
+
| `--key <name>` | GitHub decryption secret for arcnet.yaml sources |
|
|
78
|
+
| `--name <name>` | Legacy source name |
|
|
77
79
|
| `--store <workspace/store>` | Forum store |
|
|
78
80
|
| `--path <path>` | Encrypted file path in Forum |
|
|
79
|
-
| `--key-env <name>` | GitHub repository secret
|
|
81
|
+
| `--key-env <name>` | Legacy GitHub repository secret |
|
|
80
82
|
| `--repository <owner/repo>` | GitHub repository receiving the key |
|
|
81
83
|
| `--config <file>` | Secrets source configuration |
|
|
82
84
|
| `--input <file>` | Initial plaintext JSON file; defaults to an empty object |
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
ArcNet installs selected delivery capabilities into a Zap/pnpm/GitHub project. The project owns one `.arcnet/arcnet.yaml`; this package owns the standard environment preset, runners, validation and workflow templates. [Project setup](https://github.com/mp-lb/stackforge/blob/main/arcnet/SETUP.md) · [File tree](https://github.com/mp-lb/stackforge/blob/main/arcnet/README.md) · [Command reference](docs/public/commands.md)
|
|
4
4
|
|
|
5
5
|
```sh
|
|
6
|
-
pnpm dlx @mp-lb/arcnet@0.
|
|
7
|
-
pnpm dlx @mp-lb/arcnet@0.
|
|
6
|
+
pnpm dlx @mp-lb/arcnet@0.5.0 setup <project-slug> --dry-run
|
|
7
|
+
pnpm dlx @mp-lb/arcnet@0.5.0 setup <project-slug>
|
|
8
8
|
pnpm install
|
|
9
9
|
pnpm exec arcnet check
|
|
10
10
|
```
|
|
@@ -13,7 +13,7 @@ A package-only project gets no deploy workflow or cloud configuration. A static
|
|
|
13
13
|
|
|
14
14
|
The project file can contain `services` (Zap Arc service blocks), `vercel` (explicit static-site references), non-secret `variables`, and a `secrets` source/consumer map. Container services default to `.arcnet/<service>.Dockerfile`. The package selects standard domains when omitted; set `domain` for exceptions. The `gce-worker` module is deferred until its startup mechanism is replaced.
|
|
15
15
|
|
|
16
|
-
`arcnet secrets add` attaches a Forum encrypted JSON source and provisions its
|
|
16
|
+
`arcnet secrets add --key KEY` attaches a Forum encrypted JSON source and provisions its GitHub decryption key. `arcnet secrets init --key KEY` creates a source. A new project's `arcnet.yaml` records only the key, Forum store/path, and consumer mappings. The committed ciphertext lives at `.arcnet/secrets/KEY.json.enc`; `arcnet secrets sync` refreshes it atomically. CI decrypts that file using the GitHub key and does not fetch from Forum. `arcnet env run --consumer publish -- <command>` gives a publish command only its selected credentials; the project release workflow must call it. Older source definitions with names and snapshot metadata remain readable.
|
|
17
17
|
|
|
18
18
|
Domain ownership delegation is available through `arcnet environment domain-owner` after a human verifies the base domain. Project domain add/remove and full environment bootstrap/teardown remain unimplemented.
|
|
19
19
|
|
|
@@ -78,10 +78,11 @@ Attach an existing Forum file and provision its CI key.
|
|
|
78
78
|
|
|
79
79
|
| Option | Description |
|
|
80
80
|
| --- | --- |
|
|
81
|
-
| `--
|
|
81
|
+
| `--key <name>` | GitHub decryption secret for arcnet.yaml sources |
|
|
82
|
+
| `--name <name>` | Legacy source name |
|
|
82
83
|
| `--store <workspace/store>` | Forum store |
|
|
83
84
|
| `--path <path>` | Encrypted file path in Forum |
|
|
84
|
-
| `--key-env <name>` | GitHub repository secret
|
|
85
|
+
| `--key-env <name>` | Legacy GitHub repository secret |
|
|
85
86
|
| `--repository <owner/repo>` | GitHub repository receiving the key |
|
|
86
87
|
| `--config <file>` | Secrets source configuration |
|
|
87
88
|
| `--existing-key` | Reuse an existing GitHub secret without creating a recipient |
|
|
@@ -92,10 +93,11 @@ Create a Forum secrets file, prompt for your password and provision its CI key.
|
|
|
92
93
|
|
|
93
94
|
| Option | Description |
|
|
94
95
|
| --- | --- |
|
|
95
|
-
| `--
|
|
96
|
+
| `--key <name>` | GitHub decryption secret for arcnet.yaml sources |
|
|
97
|
+
| `--name <name>` | Legacy source name |
|
|
96
98
|
| `--store <workspace/store>` | Forum store |
|
|
97
99
|
| `--path <path>` | Encrypted file path in Forum |
|
|
98
|
-
| `--key-env <name>` | GitHub repository secret
|
|
100
|
+
| `--key-env <name>` | Legacy GitHub repository secret |
|
|
99
101
|
| `--repository <owner/repo>` | GitHub repository receiving the key |
|
|
100
102
|
| `--config <file>` | Secrets source configuration |
|
|
101
103
|
| `--input <file>` | Initial plaintext JSON file; defaults to an empty object |
|
package/package.json
CHANGED
package/src/arcnetConfig.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { parse } from "yaml";
|
|
|
4
4
|
import { z } from "zod";
|
|
5
5
|
import { deployBlockSchema } from "@mp-lb/zapper/dist/arc/schemas.js";
|
|
6
6
|
import { vercelInputSchema } from "./schemas.js";
|
|
7
|
-
import { secretsConfigSchema } from "./secrets/config.js";
|
|
7
|
+
import { secretsConfigSchema, simpleSourceSchema } from "./secrets/config.js";
|
|
8
8
|
|
|
9
9
|
const slug = z
|
|
10
10
|
.string()
|
|
@@ -34,7 +34,7 @@ const arcnetConfigSchema = z
|
|
|
34
34
|
variables: variables.optional(),
|
|
35
35
|
secrets: z
|
|
36
36
|
.object({
|
|
37
|
-
sources:
|
|
37
|
+
sources: z.array(simpleSourceSchema).min(1),
|
|
38
38
|
consumers: secretsConfigSchema.shape.consumers,
|
|
39
39
|
})
|
|
40
40
|
.strict()
|
package/src/secrets/config.ts
CHANGED
|
@@ -26,9 +26,12 @@ export const sourceSchema = z
|
|
|
26
26
|
snapshot: z
|
|
27
27
|
.object({
|
|
28
28
|
file: z.string(),
|
|
29
|
-
fileId: z.string().min(1),
|
|
30
|
-
revision: z.number().int().nonnegative(),
|
|
31
|
-
sha256: z
|
|
29
|
+
fileId: z.string().min(1).optional(),
|
|
30
|
+
revision: z.number().int().nonnegative().optional(),
|
|
31
|
+
sha256: z
|
|
32
|
+
.string()
|
|
33
|
+
.regex(/^[a-f0-9]{64}$/)
|
|
34
|
+
.optional(),
|
|
32
35
|
})
|
|
33
36
|
.strict()
|
|
34
37
|
.optional(),
|
|
@@ -77,6 +80,34 @@ export const secretsConfigSchema = z
|
|
|
77
80
|
export type SecretsConfig = z.infer<typeof secretsConfigSchema>;
|
|
78
81
|
export type SecretSource = z.infer<typeof sourceSchema>;
|
|
79
82
|
|
|
83
|
+
export const simpleSourceSchema = z
|
|
84
|
+
.object({
|
|
85
|
+
key: envName,
|
|
86
|
+
store: sourceSchema.shape.store,
|
|
87
|
+
path: sourceSchema.shape.path,
|
|
88
|
+
token: envName.optional(),
|
|
89
|
+
})
|
|
90
|
+
.strict();
|
|
91
|
+
|
|
92
|
+
export const snapshotPathForKey = (key: string) =>
|
|
93
|
+
`.arcnet/secrets/${key}.json.enc`;
|
|
94
|
+
export const sourceNameForKey = (key: string) =>
|
|
95
|
+
`source-${key.toLowerCase().replaceAll("_", "-")}`;
|
|
96
|
+
|
|
97
|
+
const expandSimpleSources = (sources: unknown) =>
|
|
98
|
+
z
|
|
99
|
+
.array(simpleSourceSchema)
|
|
100
|
+
.min(1)
|
|
101
|
+
.parse(sources)
|
|
102
|
+
.map((source) => ({
|
|
103
|
+
name: sourceNameForKey(source.key),
|
|
104
|
+
store: source.store,
|
|
105
|
+
path: source.path,
|
|
106
|
+
keyEnv: source.key,
|
|
107
|
+
tokenEnv: source.token,
|
|
108
|
+
snapshot: { file: snapshotPathForKey(source.key) },
|
|
109
|
+
}));
|
|
110
|
+
|
|
80
111
|
export const resolveSecretsConfigPath = (root: string, file?: string) =>
|
|
81
112
|
file ??
|
|
82
113
|
(existsSync(join(root, ".arcnet/arcnet.yaml"))
|
|
@@ -97,16 +128,22 @@ export const readSecretsConfig = (
|
|
|
97
128
|
try {
|
|
98
129
|
if (file === ".arcnet/arcnet.yaml") {
|
|
99
130
|
const config = parse(readFileSync(safeTargetPath(root, file), "utf8"));
|
|
131
|
+
const sources = expandSimpleSources(config.secrets?.sources);
|
|
100
132
|
return secretsConfigSchema.parse({
|
|
101
133
|
version: 1,
|
|
102
134
|
repository: config.repository,
|
|
103
|
-
|
|
135
|
+
sources,
|
|
136
|
+
consumers: config.secrets?.consumers,
|
|
104
137
|
});
|
|
105
138
|
}
|
|
106
139
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
140
|
+
const config = JSON.parse(readFileSync(safeTargetPath(root, file), "utf8"));
|
|
141
|
+
if (Array.isArray(config.sources) && config.sources[0]?.key)
|
|
142
|
+
return secretsConfigSchema.parse({
|
|
143
|
+
...config,
|
|
144
|
+
sources: expandSimpleSources(config.sources),
|
|
145
|
+
});
|
|
146
|
+
return secretsConfigSchema.parse(config);
|
|
110
147
|
} catch {
|
|
111
148
|
throw new Error(
|
|
112
149
|
"Missing or invalid secrets configuration (values omitted).",
|
|
@@ -136,16 +136,14 @@ export const createSecretsCommands = (
|
|
|
136
136
|
? "Attach an existing Forum file and provision its CI key."
|
|
137
137
|
: "Create a Forum secrets file, prompt for your password and provision its CI key.",
|
|
138
138
|
)
|
|
139
|
-
.
|
|
140
|
-
"--
|
|
141
|
-
"
|
|
139
|
+
.option(
|
|
140
|
+
"--key <name>",
|
|
141
|
+
"GitHub decryption secret for arcnet.yaml sources",
|
|
142
142
|
)
|
|
143
|
+
.option("--name <name>", "Legacy source name")
|
|
143
144
|
.requiredOption("--store <workspace/store>", "Forum store")
|
|
144
145
|
.requiredOption("--path <path>", "Encrypted file path in Forum")
|
|
145
|
-
.
|
|
146
|
-
"--key-env <name>",
|
|
147
|
-
"GitHub repository secret / environment variable for this file's key",
|
|
148
|
-
)
|
|
146
|
+
.option("--key-env <name>", "Legacy GitHub repository secret")
|
|
149
147
|
.requiredOption(
|
|
150
148
|
"--repository <owner/repo>",
|
|
151
149
|
"GitHub repository receiving the key",
|
|
@@ -30,7 +30,7 @@ export const loadSecrets = async (
|
|
|
30
30
|
|
|
31
31
|
if (
|
|
32
32
|
!live &&
|
|
33
|
-
source.snapshot &&
|
|
33
|
+
source.snapshot?.sha256 &&
|
|
34
34
|
createHash("sha256").update(text).digest("hex") !==
|
|
35
35
|
source.snapshot.sha256
|
|
36
36
|
)
|
|
@@ -68,7 +68,7 @@ export const loadSecrets = async (
|
|
|
68
68
|
values = { ...values, ...decoded };
|
|
69
69
|
} catch {
|
|
70
70
|
throw new Error(
|
|
71
|
-
`Source ${source.name} failed to load or decrypt; check its key and
|
|
71
|
+
`Source ${source.name} failed to load or decrypt; check its key and encrypted file (values omitted).`,
|
|
72
72
|
);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -8,12 +8,15 @@ import {
|
|
|
8
8
|
} from "node:fs";
|
|
9
9
|
import { tmpdir } from "node:os";
|
|
10
10
|
import { join } from "node:path";
|
|
11
|
+
import { parseDocument } from "yaml";
|
|
11
12
|
import { safeTargetPath } from "../safeTargetPath.js";
|
|
12
13
|
import {
|
|
13
14
|
hasSecretsConfig,
|
|
14
15
|
readSecretsConfig,
|
|
15
16
|
secretsConfigSchema,
|
|
16
17
|
sourceSchema,
|
|
18
|
+
snapshotPathForKey,
|
|
19
|
+
sourceNameForKey,
|
|
17
20
|
} from "./config.js";
|
|
18
21
|
import { promptPassword } from "./promptPassword.js";
|
|
19
22
|
import { secretCommand } from "./secretCommand.js";
|
|
@@ -23,10 +26,11 @@ import { writeSecretsWorkflow } from "./writeSecretsWorkflow.js";
|
|
|
23
26
|
import { assertNewSource } from "./assertNewSource.js";
|
|
24
27
|
|
|
25
28
|
export interface ProvisionOptions {
|
|
26
|
-
|
|
29
|
+
key?: string;
|
|
30
|
+
name?: string;
|
|
27
31
|
store: string;
|
|
28
32
|
path: string;
|
|
29
|
-
keyEnv
|
|
33
|
+
keyEnv?: string;
|
|
30
34
|
repository: string;
|
|
31
35
|
existingKey?: boolean;
|
|
32
36
|
input?: string;
|
|
@@ -48,15 +52,29 @@ export const provisionSource = async (
|
|
|
48
52
|
"Provision secrets from an authorized local terminal, not CI.",
|
|
49
53
|
);
|
|
50
54
|
|
|
55
|
+
const modern = configFile === ".arcnet/arcnet.yaml";
|
|
56
|
+
const configPath = safeTargetPath(root, configFile);
|
|
57
|
+
|
|
58
|
+
const simple =
|
|
59
|
+
modern ||
|
|
60
|
+
Boolean(options.key) ||
|
|
61
|
+
(existsSync(configPath) &&
|
|
62
|
+
Boolean(JSON.parse(readFileSync(configPath, "utf8")).sources?.[0]?.key));
|
|
63
|
+
|
|
64
|
+
const key = simple ? options.key : options.keyEnv;
|
|
65
|
+
if (!key || (!simple && !options.name))
|
|
66
|
+
throw new Error(
|
|
67
|
+
simple ? "Provide --key." : "Provide --name and --key-env.",
|
|
68
|
+
);
|
|
69
|
+
|
|
51
70
|
const source = sourceSchema.parse({
|
|
52
|
-
name: options.name,
|
|
71
|
+
name: simple ? sourceNameForKey(key) : options.name,
|
|
53
72
|
store: options.store,
|
|
54
73
|
path: options.path.startsWith("/") ? options.path : `/${options.path}`,
|
|
55
|
-
keyEnv:
|
|
74
|
+
keyEnv: key,
|
|
75
|
+
...(simple ? { snapshot: { file: snapshotPathForKey(key) } } : {}),
|
|
56
76
|
});
|
|
57
77
|
|
|
58
|
-
const configPath = safeTargetPath(root, configFile);
|
|
59
|
-
|
|
60
78
|
const config =
|
|
61
79
|
existsSync(configPath) && hasSecretsConfig(root)
|
|
62
80
|
? readSecretsConfig(root, configFile)
|
|
@@ -228,6 +246,39 @@ export const provisionSource = async (
|
|
|
228
246
|
}
|
|
229
247
|
|
|
230
248
|
const result = syncSecrets(next, root, configFile);
|
|
249
|
+
|
|
250
|
+
if (simple) {
|
|
251
|
+
const simpleSources = next.sources.map((entry) => ({
|
|
252
|
+
key: entry.keyEnv,
|
|
253
|
+
store: entry.store,
|
|
254
|
+
path: entry.path,
|
|
255
|
+
...(entry.tokenEnv ? { token: entry.tokenEnv } : {}),
|
|
256
|
+
}));
|
|
257
|
+
|
|
258
|
+
if (!modern) {
|
|
259
|
+
writeFileSync(
|
|
260
|
+
configPath,
|
|
261
|
+
JSON.stringify(
|
|
262
|
+
{
|
|
263
|
+
version: 1,
|
|
264
|
+
repository: next.repository,
|
|
265
|
+
sources: simpleSources,
|
|
266
|
+
consumers: next.consumers,
|
|
267
|
+
},
|
|
268
|
+
null,
|
|
269
|
+
2,
|
|
270
|
+
) + "\n",
|
|
271
|
+
);
|
|
272
|
+
} else {
|
|
273
|
+
const document = parseDocument(readFileSync(configPath, "utf8"));
|
|
274
|
+
if (document.errors.length) throw new Error("Invalid arcnet.yaml.");
|
|
275
|
+
document.setIn(["secrets", "sources"], simpleSources);
|
|
276
|
+
if (!document.hasIn(["secrets", "consumers"]))
|
|
277
|
+
document.setIn(["secrets", "consumers"], next.consumers);
|
|
278
|
+
writeFileSync(configPath, document.toString());
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
|
|
231
282
|
writeSecretsWorkflow(readSecretsConfig(root, configFile), root, configFile);
|
|
232
283
|
return {
|
|
233
284
|
...result,
|
|
@@ -61,7 +61,7 @@ export const readRemoteSource = (
|
|
|
61
61
|
before.id !== after.id ||
|
|
62
62
|
before.revisionNumber !== after.revisionNumber ||
|
|
63
63
|
after.path !== source.path ||
|
|
64
|
-
(source.snapshot && after.id !== source.snapshot.fileId)
|
|
64
|
+
(source.snapshot?.fileId && after.id !== source.snapshot.fileId)
|
|
65
65
|
)
|
|
66
66
|
throw new Error("Source changed");
|
|
67
67
|
return { text, fileId: after.id, revision: after.revisionNumber };
|
|
@@ -6,12 +6,52 @@ import { safeTargetPath } from "../safeTargetPath.js";
|
|
|
6
6
|
import type { SecretsConfig } from "./config.js";
|
|
7
7
|
import { readRemoteSource } from "./readRemoteSource.js";
|
|
8
8
|
import { parseDocument } from "yaml";
|
|
9
|
+
import { snapshotPathForKey } from "./config.js";
|
|
9
10
|
|
|
10
11
|
export const syncSecrets = (
|
|
11
12
|
config: SecretsConfig,
|
|
12
13
|
root: string,
|
|
13
14
|
file: string,
|
|
14
15
|
) => {
|
|
16
|
+
if (
|
|
17
|
+
file === ".arcnet/arcnet.yaml" ||
|
|
18
|
+
config.sources.every(
|
|
19
|
+
(source) =>
|
|
20
|
+
source.snapshot?.file === snapshotPathForKey(source.keyEnv) &&
|
|
21
|
+
!source.snapshot.sha256,
|
|
22
|
+
)
|
|
23
|
+
) {
|
|
24
|
+
const sources = config.sources.map((source) => {
|
|
25
|
+
const remote = readRemoteSource(source, root);
|
|
26
|
+
|
|
27
|
+
try {
|
|
28
|
+
parseForumEncryptedFilePayload(remote.text);
|
|
29
|
+
} catch {
|
|
30
|
+
throw new Error(
|
|
31
|
+
`Source ${source.keyEnv} is not a supported encrypted file.`,
|
|
32
|
+
);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const target = safeTargetPath(root, snapshotPathForKey(source.keyEnv));
|
|
36
|
+
mkdirSync(dirname(target), { recursive: true });
|
|
37
|
+
|
|
38
|
+
const temporary = safeTargetPath(
|
|
39
|
+
root,
|
|
40
|
+
`${snapshotPathForKey(source.keyEnv)}.tmp`,
|
|
41
|
+
);
|
|
42
|
+
|
|
43
|
+
writeFileSync(temporary, remote.text, { mode: 0o600 });
|
|
44
|
+
renameSync(temporary, target);
|
|
45
|
+
return { key: source.keyEnv, revision: remote.revision };
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
return {
|
|
49
|
+
operation: "secrets.sync",
|
|
50
|
+
sources,
|
|
51
|
+
message: "Review and commit the encrypted snapshots.",
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
15
55
|
const sources = config.sources.map((source) => {
|
|
16
56
|
const remote = readRemoteSource(source, root);
|
|
17
57
|
|