envshed 0.14.0 → 0.17.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/dist/bin/envshed-linux-x64 +4 -0
- package/dist/bundle.cjs +48909 -0
- package/dist/commands/forward-signals.test.d.ts +2 -0
- package/dist/commands/forward-signals.test.d.ts.map +1 -0
- package/dist/commands/forward-signals.test.js +94 -0
- package/dist/commands/forward-signals.test.js.map +1 -0
- package/dist/commands/import.d.ts.map +1 -1
- package/dist/commands/import.js +200 -54
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +4 -0
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/run.d.ts +21 -0
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +68 -5
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/secret.d.ts.map +1 -1
- package/dist/commands/secret.js +73 -0
- package/dist/commands/secret.js.map +1 -1
- package/dist/commands/share.d.ts +3 -0
- package/dist/commands/share.d.ts.map +1 -0
- package/dist/commands/share.js +367 -0
- package/dist/commands/share.js.map +1 -0
- package/dist/commands/share.test.d.ts +2 -0
- package/dist/commands/share.test.d.ts.map +1 -0
- package/dist/commands/share.test.js +532 -0
- package/dist/commands/share.test.js.map +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +50 -6
- package/dist/config.js.map +1 -1
- package/dist/config.test.d.ts +2 -0
- package/dist/config.test.d.ts.map +1 -0
- package/dist/config.test.js +114 -0
- package/dist/config.test.js.map +1 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/importers/doppler.d.ts +46 -0
- package/dist/lib/importers/doppler.d.ts.map +1 -0
- package/dist/lib/importers/doppler.js +156 -0
- package/dist/lib/importers/doppler.js.map +1 -0
- package/dist/lib/importers/doppler.test.d.ts +2 -0
- package/dist/lib/importers/doppler.test.d.ts.map +1 -0
- package/dist/lib/importers/doppler.test.js +162 -0
- package/dist/lib/importers/doppler.test.js.map +1 -0
- package/dist/locales/en.json +110 -5
- package/dist/locales/es.json +110 -5
- package/dist/locales/pt-BR.json +143 -50
- package/dist/utils.d.ts +15 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +46 -0
- package/dist/utils.js.map +1 -1
- package/package.json +11 -13
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"forward-signals.test.d.ts","sourceRoot":"","sources":["../../src/commands/forward-signals.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { describe, it, expect, vi } from "vitest";
|
|
2
|
+
import { EventEmitter } from "events";
|
|
3
|
+
import { forwardSignalsToChild, FORWARDED_SIGNALS } from "./run.js";
|
|
4
|
+
function makeChild() {
|
|
5
|
+
const child = new EventEmitter();
|
|
6
|
+
child.exitCode = null;
|
|
7
|
+
child.signalCode = null;
|
|
8
|
+
child.kill = vi.fn((signal) => {
|
|
9
|
+
child.signalCode = signal ?? "SIGTERM";
|
|
10
|
+
return true;
|
|
11
|
+
});
|
|
12
|
+
return child;
|
|
13
|
+
}
|
|
14
|
+
/** A stand-in for `process` so the test never signals the test runner itself. */
|
|
15
|
+
function makeProc() {
|
|
16
|
+
const emitter = new EventEmitter();
|
|
17
|
+
return {
|
|
18
|
+
pid: 4242,
|
|
19
|
+
on: vi.fn((event, handler) => {
|
|
20
|
+
emitter.on(event, handler);
|
|
21
|
+
return undefined;
|
|
22
|
+
}),
|
|
23
|
+
removeListener: vi.fn((event, handler) => {
|
|
24
|
+
emitter.removeListener(event, handler);
|
|
25
|
+
return undefined;
|
|
26
|
+
}),
|
|
27
|
+
exit: vi.fn(),
|
|
28
|
+
kill: vi.fn(),
|
|
29
|
+
emitter,
|
|
30
|
+
listenerCount: (event) => emitter.listenerCount(event),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
describe("forwardSignalsToChild", () => {
|
|
34
|
+
it.each(FORWARDED_SIGNALS)("forwards %s to the child", (signal) => {
|
|
35
|
+
const child = makeChild();
|
|
36
|
+
const proc = makeProc();
|
|
37
|
+
forwardSignalsToChild(child, proc);
|
|
38
|
+
proc.emitter.emit(signal);
|
|
39
|
+
expect(child.kill).toHaveBeenCalledWith(signal);
|
|
40
|
+
});
|
|
41
|
+
it("does not exit before the child has finished shutting down", () => {
|
|
42
|
+
const child = makeChild();
|
|
43
|
+
const proc = makeProc();
|
|
44
|
+
forwardSignalsToChild(child, proc);
|
|
45
|
+
proc.emitter.emit("SIGTERM");
|
|
46
|
+
// The whole point: the wrapper waits for the child's own graceful shutdown.
|
|
47
|
+
expect(proc.exit).not.toHaveBeenCalled();
|
|
48
|
+
child.exitCode = 0;
|
|
49
|
+
child.emit("exit", 0, null);
|
|
50
|
+
expect(proc.exit).toHaveBeenCalledWith(0);
|
|
51
|
+
});
|
|
52
|
+
it("propagates the child's exit code", () => {
|
|
53
|
+
const child = makeChild();
|
|
54
|
+
const proc = makeProc();
|
|
55
|
+
forwardSignalsToChild(child, proc);
|
|
56
|
+
child.emit("exit", 3, null);
|
|
57
|
+
expect(proc.exit).toHaveBeenCalledWith(3);
|
|
58
|
+
});
|
|
59
|
+
it("re-raises the signal when the child dies from one", () => {
|
|
60
|
+
const child = makeChild();
|
|
61
|
+
const proc = makeProc();
|
|
62
|
+
forwardSignalsToChild(child, proc);
|
|
63
|
+
child.emit("exit", null, "SIGKILL");
|
|
64
|
+
// Re-raised rather than translated to an exit code, so a supervisor sees
|
|
65
|
+
// the real cause of death.
|
|
66
|
+
expect(proc.kill).toHaveBeenCalledWith(4242, "SIGKILL");
|
|
67
|
+
});
|
|
68
|
+
it("removes its handlers once the child is gone", () => {
|
|
69
|
+
const child = makeChild();
|
|
70
|
+
const proc = makeProc();
|
|
71
|
+
forwardSignalsToChild(child, proc);
|
|
72
|
+
expect(proc.listenerCount("SIGTERM")).toBe(1);
|
|
73
|
+
child.emit("exit", 0, null);
|
|
74
|
+
expect(proc.listenerCount("SIGTERM")).toBe(0);
|
|
75
|
+
});
|
|
76
|
+
it("ignores signals arriving after the child already exited", () => {
|
|
77
|
+
const child = makeChild();
|
|
78
|
+
const proc = makeProc();
|
|
79
|
+
forwardSignalsToChild(child, proc);
|
|
80
|
+
child.exitCode = 0;
|
|
81
|
+
proc.emitter.emit("SIGTERM");
|
|
82
|
+
expect(child.kill).not.toHaveBeenCalled();
|
|
83
|
+
});
|
|
84
|
+
it("survives a child that dies between the check and the kill", () => {
|
|
85
|
+
const child = makeChild();
|
|
86
|
+
const proc = makeProc();
|
|
87
|
+
child.kill = vi.fn(() => {
|
|
88
|
+
throw Object.assign(new Error("ESRCH"), { code: "ESRCH" });
|
|
89
|
+
});
|
|
90
|
+
forwardSignalsToChild(child, proc);
|
|
91
|
+
expect(() => proc.emitter.emit("SIGTERM")).not.toThrow();
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
//# sourceMappingURL=forward-signals.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"forward-signals.test.js","sourceRoot":"","sources":["../../src/commands/forward-signals.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmNpC,eAAO,MAAM,aAAa,SAiItB,CAAC"}
|
package/dist/commands/import.js
CHANGED
|
@@ -4,20 +4,207 @@ import path from "path";
|
|
|
4
4
|
import chalk from "chalk";
|
|
5
5
|
import ora from "ora";
|
|
6
6
|
import inquirer from "inquirer";
|
|
7
|
-
import { apiGet, apiPut } from "../api.js";
|
|
7
|
+
import { apiGet, apiPost, apiPut } from "../api.js";
|
|
8
8
|
import { resolveOpts, logContext, hasProjectConfig, getOriginalCwd } from "../config.js";
|
|
9
9
|
import { t } from "../i18n.js";
|
|
10
10
|
import { checkForBreakingChanges } from "../utils.js";
|
|
11
11
|
import { detectFormat, parseImportFile } from "../lib/importers/index.js";
|
|
12
|
+
import { DopplerClient, parseConfigMap, planMigration, } from "../lib/importers/doppler.js";
|
|
13
|
+
async function pushSecretsToEnv(org, project, env, incoming, force) {
|
|
14
|
+
const total = Object.keys(incoming).length;
|
|
15
|
+
if (total === 0)
|
|
16
|
+
return { new: 0, modified: 0, unchanged: 0 };
|
|
17
|
+
let existing = {};
|
|
18
|
+
if (!force) {
|
|
19
|
+
try {
|
|
20
|
+
const res = await apiGet(`/secrets/${org}/${project}/${env}`);
|
|
21
|
+
const data = (await res.json());
|
|
22
|
+
existing = data.secrets;
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
throw new Error(err.message);
|
|
26
|
+
}
|
|
27
|
+
if (Object.keys(existing).length > 0) {
|
|
28
|
+
const { modified } = checkForBreakingChanges(existing, incoming);
|
|
29
|
+
if (modified.length > 0) {
|
|
30
|
+
console.log(chalk.yellow(`\n${t("import.changesDetected")} (${org}/${project}/${env})\n`));
|
|
31
|
+
for (const key of modified) {
|
|
32
|
+
console.log(chalk.cyan(` ~ ${key}`) + chalk.dim(` ${t("import.willBeModified")}`));
|
|
33
|
+
}
|
|
34
|
+
console.log();
|
|
35
|
+
const { shouldContinue } = await inquirer.prompt([
|
|
36
|
+
{ type: "confirm", name: "shouldContinue", message: t("import.confirmImport"), default: false },
|
|
37
|
+
]);
|
|
38
|
+
if (!shouldContinue)
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
await apiPut(`/secrets/${org}/${project}/${env}`, { secrets: incoming });
|
|
44
|
+
const modifiedCount = Object.keys(incoming).filter((k) => existing[k] !== undefined && existing[k] !== incoming[k]).length;
|
|
45
|
+
const newCount = Object.keys(incoming).filter((k) => !(k in existing)).length;
|
|
46
|
+
const unchangedCount = total - newCount - modifiedCount;
|
|
47
|
+
return { new: newCount, modified: modifiedCount, unchanged: unchangedCount };
|
|
48
|
+
}
|
|
49
|
+
async function ensureEnvshedProject(orgSlug, projectSlug, projectName) {
|
|
50
|
+
const res = await apiGet(`/projects/${orgSlug}`);
|
|
51
|
+
const data = (await res.json());
|
|
52
|
+
if (data.projects.some((p) => p.slug === projectSlug))
|
|
53
|
+
return false;
|
|
54
|
+
await apiPost(`/projects/${orgSlug}`, { name: projectName });
|
|
55
|
+
return true;
|
|
56
|
+
}
|
|
57
|
+
async function ensureEnvshedEnv(orgSlug, projectSlug, envSlug, envName) {
|
|
58
|
+
const res = await apiGet(`/environments/${orgSlug}/${projectSlug}`);
|
|
59
|
+
const data = (await res.json());
|
|
60
|
+
if (data.environments.some((e) => e.slug === envSlug))
|
|
61
|
+
return false;
|
|
62
|
+
await apiPost(`/environments/${orgSlug}/${projectSlug}`, { name: envName });
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
async function runDopplerImport(opts) {
|
|
66
|
+
if (!opts.org) {
|
|
67
|
+
console.error(chalk.red(t("common.missingOrg")));
|
|
68
|
+
process.exit(1);
|
|
69
|
+
}
|
|
70
|
+
if (opts.dopplerConfig && !opts.dopplerProject) {
|
|
71
|
+
console.error(chalk.red(t("import.dopplerConfigNeedsProject")));
|
|
72
|
+
process.exit(1);
|
|
73
|
+
}
|
|
74
|
+
const client = new DopplerClient({ token: opts.token, baseUrl: opts.dopplerApiUrl });
|
|
75
|
+
const spinner = ora(t("import.dopplerPlanning")).start();
|
|
76
|
+
let targets;
|
|
77
|
+
let secrets;
|
|
78
|
+
try {
|
|
79
|
+
const plan = await planMigration(client, {
|
|
80
|
+
projectOverride: opts.project,
|
|
81
|
+
envOverride: opts.env,
|
|
82
|
+
configMap: parseConfigMap(opts.configMap),
|
|
83
|
+
dopplerProjectFilter: opts.dopplerProject,
|
|
84
|
+
dopplerConfigFilter: opts.dopplerConfig,
|
|
85
|
+
});
|
|
86
|
+
targets = plan.targets;
|
|
87
|
+
secrets = plan.secrets;
|
|
88
|
+
}
|
|
89
|
+
catch (err) {
|
|
90
|
+
spinner.fail(t("import.dopplerFetchFailed", { message: err.message }));
|
|
91
|
+
process.exit(1);
|
|
92
|
+
}
|
|
93
|
+
if (targets.length === 0) {
|
|
94
|
+
spinner.warn(t("import.dopplerNoConfigs"));
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
spinner.succeed(t("import.dopplerPlanned", {
|
|
98
|
+
projects: new Set(targets.map((t) => t.envshedProject)).size,
|
|
99
|
+
envs: targets.length,
|
|
100
|
+
secrets: targets.reduce((sum, t) => sum + t.secretCount, 0),
|
|
101
|
+
}));
|
|
102
|
+
console.log();
|
|
103
|
+
for (const target of targets) {
|
|
104
|
+
console.log(` ${chalk.dim(target.dopplerProject + "/" + target.dopplerConfig)} ${chalk.dim("→")} ${chalk.cyan(`${opts.org}/${target.envshedProject}/${target.envshedEnv}`)} ${chalk.dim(`(${target.secretCount})`)}`);
|
|
105
|
+
}
|
|
106
|
+
console.log();
|
|
107
|
+
if (opts.dryRun) {
|
|
108
|
+
console.log(chalk.dim(t("import.dopplerDryRun")));
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
const createdProjects = new Set();
|
|
112
|
+
const createdEnvs = new Set();
|
|
113
|
+
let totalNew = 0;
|
|
114
|
+
let totalModified = 0;
|
|
115
|
+
let totalUnchanged = 0;
|
|
116
|
+
let targetsImported = 0;
|
|
117
|
+
for (const target of targets) {
|
|
118
|
+
const projectKey = `${opts.org}/${target.envshedProject}`;
|
|
119
|
+
const envKey = `${projectKey}/${target.envshedEnv}`;
|
|
120
|
+
const pushSpinner = ora(t("import.dopplerPushing", { target: `${opts.org}/${target.envshedProject}/${target.envshedEnv}` })).start();
|
|
121
|
+
try {
|
|
122
|
+
if (!createdProjects.has(projectKey)) {
|
|
123
|
+
const created = await ensureEnvshedProject(opts.org, target.envshedProject, target.dopplerProject);
|
|
124
|
+
createdProjects.add(projectKey);
|
|
125
|
+
if (created)
|
|
126
|
+
pushSpinner.text = t("import.dopplerCreatedProject", { project: target.envshedProject });
|
|
127
|
+
}
|
|
128
|
+
if (!createdEnvs.has(envKey)) {
|
|
129
|
+
const created = await ensureEnvshedEnv(opts.org, target.envshedProject, target.envshedEnv, target.dopplerConfig);
|
|
130
|
+
createdEnvs.add(envKey);
|
|
131
|
+
if (created)
|
|
132
|
+
pushSpinner.text = t("import.dopplerCreatedEnv", { env: target.envshedEnv });
|
|
133
|
+
}
|
|
134
|
+
const incoming = secrets.get(`${target.envshedProject}/${target.envshedEnv}`) ?? {};
|
|
135
|
+
const counts = await pushSecretsToEnv(opts.org, target.envshedProject, target.envshedEnv, incoming, !!opts.force);
|
|
136
|
+
if (counts === null) {
|
|
137
|
+
pushSpinner.warn(t("import.aborted") + ` (${target.envshedProject}/${target.envshedEnv})`);
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
totalNew += counts.new;
|
|
141
|
+
totalModified += counts.modified;
|
|
142
|
+
totalUnchanged += counts.unchanged;
|
|
143
|
+
targetsImported += 1;
|
|
144
|
+
pushSpinner.succeed(t("import.dopplerPushed", {
|
|
145
|
+
target: `${opts.org}/${target.envshedProject}/${target.envshedEnv}`,
|
|
146
|
+
count: target.secretCount,
|
|
147
|
+
}));
|
|
148
|
+
}
|
|
149
|
+
catch (err) {
|
|
150
|
+
pushSpinner.fail(t("import.dopplerTargetFailed", { target: `${target.envshedProject}/${target.envshedEnv}`, message: err.message }));
|
|
151
|
+
process.exit(1);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
console.log();
|
|
155
|
+
console.log(chalk.green(t("import.dopplerDone", {
|
|
156
|
+
envs: targetsImported,
|
|
157
|
+
new: totalNew,
|
|
158
|
+
modified: totalModified,
|
|
159
|
+
unchanged: totalUnchanged,
|
|
160
|
+
})));
|
|
161
|
+
}
|
|
12
162
|
export const importCommand = new Command("import")
|
|
13
163
|
.description(t("import.description"))
|
|
14
|
-
.argument("
|
|
164
|
+
.argument("[file]", t("import.fileArg"))
|
|
165
|
+
.option("--from <source>", t("import.fromOption"))
|
|
166
|
+
.option("--token <token>", t("import.tokenOption"))
|
|
167
|
+
.option("--doppler-project <name>", t("import.dopplerProjectOption"))
|
|
168
|
+
.option("--doppler-config <name>", t("import.dopplerConfigOption"))
|
|
169
|
+
.option("--doppler-api-url <url>", t("import.dopplerApiUrlOption"))
|
|
170
|
+
.option("--config-map <mapping>", t("import.configMapOption"))
|
|
171
|
+
.option("--dry-run", t("import.dryRunOption"))
|
|
15
172
|
.option("-o, --org <slug>", t("common.orgOption"))
|
|
16
173
|
.option("-p, --project <slug>", t("common.projectOption"))
|
|
17
174
|
.option("-e, --env <slug>", t("common.envOption"))
|
|
18
175
|
.option("--format <format>", t("import.formatOption"))
|
|
19
176
|
.option("--force", t("import.forceOption"))
|
|
20
177
|
.action(async (file, opts) => {
|
|
178
|
+
if (opts.from) {
|
|
179
|
+
const source = String(opts.from).toLowerCase();
|
|
180
|
+
if (source !== "doppler") {
|
|
181
|
+
console.error(chalk.red(t("import.unsupportedSource", { source: opts.from })));
|
|
182
|
+
process.exit(1);
|
|
183
|
+
}
|
|
184
|
+
const token = opts.token ?? process.env.DOPPLER_TOKEN;
|
|
185
|
+
if (!token) {
|
|
186
|
+
console.error(chalk.red(t("import.tokenRequired")));
|
|
187
|
+
process.exit(1);
|
|
188
|
+
}
|
|
189
|
+
const { org, project, env } = resolveOpts(opts);
|
|
190
|
+
await runDopplerImport({
|
|
191
|
+
token,
|
|
192
|
+
org: opts.org ?? org,
|
|
193
|
+
project: opts.project ?? project,
|
|
194
|
+
env: opts.env ?? env,
|
|
195
|
+
dopplerProject: opts.dopplerProject,
|
|
196
|
+
dopplerConfig: opts.dopplerConfig,
|
|
197
|
+
configMap: opts.configMap,
|
|
198
|
+
dryRun: opts.dryRun,
|
|
199
|
+
force: opts.force,
|
|
200
|
+
dopplerApiUrl: opts.dopplerApiUrl,
|
|
201
|
+
});
|
|
202
|
+
return;
|
|
203
|
+
}
|
|
204
|
+
if (!file) {
|
|
205
|
+
console.error(chalk.red(t("import.fileRequired")));
|
|
206
|
+
process.exit(1);
|
|
207
|
+
}
|
|
21
208
|
const { org, project, env } = resolveOpts(opts);
|
|
22
209
|
if (!org || !project || !env) {
|
|
23
210
|
if (!hasProjectConfig() && (!opts.org || !opts.project || !opts.env)) {
|
|
@@ -34,13 +221,11 @@ export const importCommand = new Command("import")
|
|
|
34
221
|
}
|
|
35
222
|
const resolvedFile = path.resolve(getOriginalCwd(), file);
|
|
36
223
|
const spinner = ora(t("import.reading", { file })).start();
|
|
37
|
-
// 1. Read file
|
|
38
224
|
if (!fs.existsSync(resolvedFile)) {
|
|
39
225
|
spinner.fail(t("import.fileNotFound", { file }));
|
|
40
226
|
process.exit(1);
|
|
41
227
|
}
|
|
42
228
|
const content = fs.readFileSync(resolvedFile, "utf-8");
|
|
43
|
-
// 2. Detect or validate format
|
|
44
229
|
let format;
|
|
45
230
|
if (opts.format) {
|
|
46
231
|
const valid = ["env", "json", "yaml", "csv"];
|
|
@@ -59,7 +244,6 @@ export const importCommand = new Command("import")
|
|
|
59
244
|
process.exit(1);
|
|
60
245
|
}
|
|
61
246
|
}
|
|
62
|
-
// 3. Parse file
|
|
63
247
|
let incoming;
|
|
64
248
|
try {
|
|
65
249
|
incoming = parseImportFile(format, content);
|
|
@@ -73,65 +257,27 @@ export const importCommand = new Command("import")
|
|
|
73
257
|
spinner.warn(t("import.noSecrets", { file }));
|
|
74
258
|
return;
|
|
75
259
|
}
|
|
76
|
-
|
|
77
|
-
let existingSecrets = {};
|
|
78
|
-
if (!opts.force) {
|
|
79
|
-
spinner.text = t("import.checking");
|
|
80
|
-
try {
|
|
81
|
-
const res = await apiGet(`/secrets/${org}/${project}/${env}`);
|
|
82
|
-
const data = (await res.json());
|
|
83
|
-
existingSecrets = data.secrets;
|
|
84
|
-
}
|
|
85
|
-
catch (err) {
|
|
86
|
-
spinner.fail(t("import.importFailed", { message: err.message }));
|
|
87
|
-
process.exit(1);
|
|
88
|
-
}
|
|
89
|
-
if (Object.keys(existingSecrets).length > 0) {
|
|
90
|
-
const { modified } = checkForBreakingChanges(existingSecrets, incoming);
|
|
91
|
-
// Note: "deleted" from checkForBreakingChanges = keys in existing not in incoming.
|
|
92
|
-
// For import, we do NOT delete remote keys — we only add/update the incoming keys.
|
|
93
|
-
// So only "modified" keys (value changes) require confirmation.
|
|
94
|
-
if (modified.length > 0) {
|
|
95
|
-
spinner.stop();
|
|
96
|
-
console.log(chalk.yellow("\n" + t("import.changesDetected") + "\n"));
|
|
97
|
-
for (const key of modified) {
|
|
98
|
-
console.log(chalk.cyan(` ~ ${key}`) + chalk.dim(` ${t("import.willBeModified")}`));
|
|
99
|
-
}
|
|
100
|
-
console.log();
|
|
101
|
-
const { shouldContinue } = await inquirer.prompt([
|
|
102
|
-
{
|
|
103
|
-
type: "confirm",
|
|
104
|
-
name: "shouldContinue",
|
|
105
|
-
message: t("import.confirmImport"),
|
|
106
|
-
default: false,
|
|
107
|
-
},
|
|
108
|
-
]);
|
|
109
|
-
if (!shouldContinue) {
|
|
110
|
-
console.log(chalk.dim(t("import.aborted")));
|
|
111
|
-
process.exit(0);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
// 5. Push
|
|
260
|
+
spinner.stop();
|
|
117
261
|
const pushSpinner = ora(t("import.importing")).start();
|
|
262
|
+
let counts;
|
|
118
263
|
try {
|
|
119
|
-
await
|
|
264
|
+
counts = await pushSecretsToEnv(org, project, env, incoming, !!opts.force);
|
|
120
265
|
}
|
|
121
266
|
catch (err) {
|
|
122
267
|
pushSpinner.fail(t("import.importFailed", { message: err.message }));
|
|
123
268
|
process.exit(1);
|
|
124
269
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
270
|
+
if (counts === null) {
|
|
271
|
+
pushSpinner.stop();
|
|
272
|
+
console.log(chalk.dim(t("import.aborted")));
|
|
273
|
+
process.exit(0);
|
|
274
|
+
}
|
|
129
275
|
pushSpinner.succeed(t("import.imported", {
|
|
130
276
|
total: totalKeys,
|
|
131
277
|
target: `${org}/${project}/${env}`,
|
|
132
|
-
new:
|
|
133
|
-
modified:
|
|
134
|
-
unchanged:
|
|
278
|
+
new: counts.new,
|
|
279
|
+
modified: counts.modified,
|
|
280
|
+
unchanged: counts.unchanged,
|
|
135
281
|
}));
|
|
136
282
|
});
|
|
137
283
|
//# sourceMappingURL=import.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAqB,MAAM,2BAA2B,CAAC;AAE7F,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;KACpC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;KACvC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC;KACjD,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;KACzD,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC;KACjD,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,qBAAqB,CAAC,CAAC;KACrD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC;KAC1C,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAAI,EAAE,EAAE;IACnC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACrE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAElC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAE3D,eAAe;IACf,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAEvD,+BAA+B;IAC/B,IAAI,MAAoB,CAAC;IACzB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,KAAK,GAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,IAAI,CAAC,MAAsB,CAAC;IACvC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,IAAI,QAAgC,CAAC;IACrC,IAAI,CAAC;QACH,QAAQ,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC/C,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9C,OAAO;IACT,CAAC;IAED,qCAAqC;IACrC,IAAI,eAAe,GAA2B,EAAE,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,YAAY,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAwC,CAAC;YACvE,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC5E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,uBAAuB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YACxE,mFAAmF;YACnF,mFAAmF;YACnF,gEAAgE;YAEhE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;gBACrE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtF,CAAC;gBACD,OAAO,CAAC,GAAG,EAAE,CAAC;gBAEd,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBAC/C;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,gBAAgB;wBACtB,OAAO,EAAE,CAAC,CAAC,sBAAsB,CAAC;wBAClC,OAAO,EAAE,KAAK;qBACf;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;oBAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU;IACV,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACvD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,YAAY,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,mBAAmB;IACnB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAChD,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC5E,CAAC,MAAM,CAAC;IACT,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC;IACnF,MAAM,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAC;IAE5D,WAAW,CAAC,OAAO,CACjB,CAAC,CAAC,iBAAiB,EAAE;QACnB,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,GAAG,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE;QAClC,GAAG,EAAE,QAAQ;QACb,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,cAAc;KAC1B,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,iBA4FA;AAED,eAAO,MAAM,WAAW,SAoGpB,CAAC"}
|
package/dist/commands/pull.js
CHANGED
|
@@ -39,6 +39,7 @@ export async function pullSingle(opts) {
|
|
|
39
39
|
const data = (await res.json());
|
|
40
40
|
const secrets = data.secrets;
|
|
41
41
|
const placeholders = data.placeholders ?? [];
|
|
42
|
+
const disabled = data.disabled ?? [];
|
|
42
43
|
const remoteVersion = data.version;
|
|
43
44
|
const isJson = format === "json";
|
|
44
45
|
// Check if environment changed since last pull
|
|
@@ -95,6 +96,9 @@ export async function pullSingle(opts) {
|
|
|
95
96
|
saveVersionCache(cacheKey, remoteVersion);
|
|
96
97
|
}
|
|
97
98
|
warnPlaceholders(placeholders, org, project, env);
|
|
99
|
+
if (disabled.length > 0) {
|
|
100
|
+
console.log(chalk.dim(` ${t("pull.disabledSkipped", { count: disabled.length })}`));
|
|
101
|
+
}
|
|
98
102
|
}
|
|
99
103
|
catch (err) {
|
|
100
104
|
spinner.fail(t("pull.pullFailed", { message: err.message }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/run.d.ts
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
1
|
import { Command } from "commander";
|
|
2
|
+
import { type ChildProcess } from "child_process";
|
|
3
|
+
/** Signals that mean "shut down"; anything else is left to the default action. */
|
|
4
|
+
export declare const FORWARDED_SIGNALS: NodeJS.Signals[];
|
|
5
|
+
/**
|
|
6
|
+
* Make `envshed run` transparent to process supervisors.
|
|
7
|
+
*
|
|
8
|
+
* `envshed run -- <cmd>` is commonly the container command, which makes this
|
|
9
|
+
* CLI PID 1. PID 1 is special: the kernel discards signals whose disposition is
|
|
10
|
+
* the default, so a CLI with no explicit handler simply ignores `docker stop`.
|
|
11
|
+
* The wrapped process then never learns it should shut down, the runtime waits
|
|
12
|
+
* out the full grace period, and the whole container is SIGKILLed.
|
|
13
|
+
*
|
|
14
|
+
* That cost MarbleOX a production incident on 2026-08-13: every deploy dropped
|
|
15
|
+
* in-flight HTTP requests and undrained background jobs, because the API's
|
|
16
|
+
* graceful-shutdown hooks had never once run.
|
|
17
|
+
*
|
|
18
|
+
* So: forward the signal, then wait. The child decides when it is done, and we
|
|
19
|
+
* reproduce its exit status exactly, including death by signal, so whatever is
|
|
20
|
+
* supervising us sees the truth.
|
|
21
|
+
*/
|
|
22
|
+
export declare function forwardSignalsToChild(child: ChildProcess, proc?: Pick<NodeJS.Process, "on" | "removeListener" | "exit" | "kill" | "pid">): void;
|
|
2
23
|
export declare const runCommand: Command;
|
|
3
24
|
//# sourceMappingURL=run.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAyBzD,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,OAAO,EAAoC,CAAC;AAEnF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,IAAI,GAAE,IAAI,CACR,MAAM,CAAC,OAAO,EACd,IAAI,GAAG,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CACxC,GACV,IAAI,CA0CN;AAED,eAAO,MAAM,UAAU,SA6LnB,CAAC"}
|