@mp-lb/arcnet 0.2.3 → 0.2.5
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/dist/resolvePublicEnv.d.ts +2 -0
- package/dist/resolvePublicEnv.d.ts.map +1 -0
- package/dist/resolvePublicEnv.js +26 -0
- package/dist/resolvePublicEnv.js.map +1 -0
- package/dist/runTerraform.d.ts.map +1 -1
- package/dist/runTerraform.js +2 -4
- package/dist/runTerraform.js.map +1 -1
- package/package.json +2 -2
- package/src/resolvePublicEnv.ts +34 -0
- package/src/runTerraform.ts +5 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolvePublicEnv.d.ts","sourceRoot":"","sources":["../src/resolvePublicEnv.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,GAC3B,WAAW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,WAAW,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAChC,MAAM,CAAC,MAAM,EAAE,MAAM,CA8BvB,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export const resolvePublicEnv = (publicEnv, secretEnv) => {
|
|
2
|
+
const pool = { ...publicEnv, ...secretEnv };
|
|
3
|
+
const resolved = { ...pool };
|
|
4
|
+
const visiting = new Set();
|
|
5
|
+
const resolveKey = (key) => {
|
|
6
|
+
if (!Object.hasOwn(pool, key))
|
|
7
|
+
throw new Error(`Missing environment alias ${key} (value omitted).`);
|
|
8
|
+
if (Object.hasOwn(secretEnv, key) || !Object.hasOwn(publicEnv, key))
|
|
9
|
+
return pool[key];
|
|
10
|
+
if (visiting.has(key))
|
|
11
|
+
throw new Error(`Cyclic environment alias ${key} (values omitted).`);
|
|
12
|
+
visiting.add(key);
|
|
13
|
+
try {
|
|
14
|
+
const value = publicEnv[key].replace(/\$(?:\{([A-Z_][A-Z0-9_]*)\}|([A-Z_][A-Z0-9_]*))/g, (_, braced, plain) => resolveKey(braced ?? plain));
|
|
15
|
+
resolved[key] = value;
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
finally {
|
|
19
|
+
visiting.delete(key);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
for (const key of Object.keys(publicEnv))
|
|
23
|
+
resolveKey(key);
|
|
24
|
+
return resolved;
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=resolvePublicEnv.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolvePublicEnv.js","sourceRoot":"","sources":["../src/resolvePublicEnv.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAiC,EACjC,SAAiC,EACT,EAAE;IAC1B,MAAM,IAAI,GAAG,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEnC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE;QACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,mBAAmB,CAAC,CAAC;QACvE,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC;YACjE,OAAO,IAAI,CAAC,GAAG,CAAE,CAAC;QACpB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,oBAAoB,CAAC,CAAC;QAEvE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAElB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAE,CAAC,OAAO,CACnC,kDAAkD,EAClD,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAAC,CAClD,CAAC;YAEF,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;gBAAS,CAAC;YACT,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1D,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerraform.d.ts","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runTerraform.d.ts","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,YAAY,GACvB,SAAS,OAAO,GAAG,MAAM,GAAG,QAAQ,EACpC,MAAM,MAAM,EACZ,iBAAe;;;;;;CA4JhB,CAAC"}
|
package/dist/runTerraform.js
CHANGED
|
@@ -8,6 +8,7 @@ import { devNull, tmpdir } from "node:os";
|
|
|
8
8
|
import { dirname, join, resolve } from "node:path";
|
|
9
9
|
import { parse } from "yaml";
|
|
10
10
|
import { runProcess } from "./runProcess.js";
|
|
11
|
+
import { resolvePublicEnv } from "./resolvePublicEnv.js";
|
|
11
12
|
import { envPoolSchema, terraformConfigSchema } from "./schemas.js";
|
|
12
13
|
const require = createRequire(import.meta.url);
|
|
13
14
|
export const runTerraform = (command, root, machine = false) => {
|
|
@@ -47,10 +48,7 @@ export const runTerraform = (command, root, machine = false) => {
|
|
|
47
48
|
typeof pool !== "object" ||
|
|
48
49
|
Object.entries(pool).some(([k, v]) => !/^[A-Z_][A-Z0-9_]*$/.test(k) || typeof v !== "string"))
|
|
49
50
|
throw new Error("Environment pools must be JSON objects mapping environment names to strings.");
|
|
50
|
-
const envPool =
|
|
51
|
-
...envPoolSchema.parse(publicEnv),
|
|
52
|
-
...envPoolSchema.parse(secretEnv),
|
|
53
|
-
};
|
|
51
|
+
const envPool = resolvePublicEnv(envPoolSchema.parse(publicEnv), envPoolSchema.parse(secretEnv));
|
|
54
52
|
if (command === "check") {
|
|
55
53
|
return {
|
|
56
54
|
operation: command,
|
package/dist/runTerraform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runTerraform.js","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runTerraform.js","sourceRoot":"","sources":["../src/runTerraform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mp-lb/arcnet",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.5",
|
|
4
4
|
"description": "ArcNet project installation and deployment CLI.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@mp-lb/forum-secrets": "0.2.1",
|
|
38
|
-
"@mp-lb/zapper": "0.21.
|
|
38
|
+
"@mp-lb/zapper": "0.21.2",
|
|
39
39
|
"commander": "14.0.3",
|
|
40
40
|
"yaml": "2.8.1",
|
|
41
41
|
"zod": "4.4.1"
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export const resolvePublicEnv = (
|
|
2
|
+
publicEnv: Record<string, string>,
|
|
3
|
+
secretEnv: Record<string, string>,
|
|
4
|
+
): Record<string, string> => {
|
|
5
|
+
const pool = { ...publicEnv, ...secretEnv };
|
|
6
|
+
const resolved = { ...pool };
|
|
7
|
+
const visiting = new Set<string>();
|
|
8
|
+
|
|
9
|
+
const resolveKey = (key: string): string => {
|
|
10
|
+
if (!Object.hasOwn(pool, key))
|
|
11
|
+
throw new Error(`Missing environment alias ${key} (value omitted).`);
|
|
12
|
+
if (Object.hasOwn(secretEnv, key) || !Object.hasOwn(publicEnv, key))
|
|
13
|
+
return pool[key]!;
|
|
14
|
+
if (visiting.has(key))
|
|
15
|
+
throw new Error(`Cyclic environment alias ${key} (values omitted).`);
|
|
16
|
+
|
|
17
|
+
visiting.add(key);
|
|
18
|
+
|
|
19
|
+
try {
|
|
20
|
+
const value = publicEnv[key]!.replace(
|
|
21
|
+
/\$(?:\{([A-Z_][A-Z0-9_]*)\}|([A-Z_][A-Z0-9_]*))/g,
|
|
22
|
+
(_, braced, plain) => resolveKey(braced ?? plain),
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
resolved[key] = value;
|
|
26
|
+
return value;
|
|
27
|
+
} finally {
|
|
28
|
+
visiting.delete(key);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
for (const key of Object.keys(publicEnv)) resolveKey(key);
|
|
33
|
+
return resolved;
|
|
34
|
+
};
|
package/src/runTerraform.ts
CHANGED
|
@@ -17,6 +17,7 @@ import { devNull, tmpdir } from "node:os";
|
|
|
17
17
|
import { dirname, join, resolve } from "node:path";
|
|
18
18
|
import { parse } from "yaml";
|
|
19
19
|
import { runProcess } from "./runProcess.js";
|
|
20
|
+
import { resolvePublicEnv } from "./resolvePublicEnv.js";
|
|
20
21
|
import { envPoolSchema, terraformConfigSchema } from "./schemas.js";
|
|
21
22
|
const require = createRequire(import.meta.url);
|
|
22
23
|
|
|
@@ -79,10 +80,10 @@ export const runTerraform = (
|
|
|
79
80
|
"Environment pools must be JSON objects mapping environment names to strings.",
|
|
80
81
|
);
|
|
81
82
|
|
|
82
|
-
const envPool =
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
const envPool = resolvePublicEnv(
|
|
84
|
+
envPoolSchema.parse(publicEnv),
|
|
85
|
+
envPoolSchema.parse(secretEnv),
|
|
86
|
+
);
|
|
86
87
|
|
|
87
88
|
if (command === "check") {
|
|
88
89
|
return {
|