envilder 0.17.0 → 0.17.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +100 -0
- package/docs/changelogs/cli.md +18 -0
- package/docs/changelogs/gha.md +12 -0
- package/docs/changelogs/sdk-dotnet.md +33 -0
- package/docs/changelogs/sdk-nodejs.md +31 -0
- package/docs/changelogs/sdk-python.md +31 -0
- package/lib/envilder/apps/cli/Startup.d.ts +5 -6
- package/lib/envilder/apps/cli/Startup.d.ts.map +1 -1
- package/lib/envilder/apps/cli/Startup.js +5 -11
- package/lib/envilder/apps/cli/Startup.js.map +1 -1
- package/lib/envilder/apps/cli/entry/Cli.d.ts.map +1 -1
- package/lib/envilder/apps/cli/entry/Cli.js +13 -2
- package/lib/envilder/apps/cli/entry/Cli.js.map +1 -1
- package/lib/envilder/apps/shared/ContainerConfiguration.d.ts +1 -2
- package/lib/envilder/apps/shared/ContainerConfiguration.d.ts.map +1 -1
- package/lib/envilder/apps/shared/ContainerConfiguration.js +2 -4
- package/lib/envilder/apps/shared/ContainerConfiguration.js.map +1 -1
- package/lib/envilder/core/application/pushEnvToSecrets/PushEnvToSecretsCommandHandler.d.ts.map +1 -1
- package/lib/envilder/core/application/pushEnvToSecrets/PushEnvToSecretsCommandHandler.js +3 -4
- package/lib/envilder/core/application/pushEnvToSecrets/PushEnvToSecretsCommandHandler.js.map +1 -1
- package/lib/envilder/core/application/pushSingle/PushSingleCommandHandler.d.ts.map +1 -1
- package/lib/envilder/core/application/pushSingle/PushSingleCommandHandler.js +21 -29
- package/lib/envilder/core/application/pushSingle/PushSingleCommandHandler.js.map +1 -1
- package/lib/envilder/core/application/secretResolution/SecretResolver.js +1 -1
- package/lib/envilder/core/application/secretResolution/SecretResolver.js.map +1 -1
- package/lib/envilder/core/domain/EnvironmentVariable.d.ts +3 -4
- package/lib/envilder/core/domain/EnvironmentVariable.d.ts.map +1 -1
- package/lib/envilder/core/domain/EnvironmentVariable.js +14 -8
- package/lib/envilder/core/domain/EnvironmentVariable.js.map +1 -1
- package/lib/envilder/core/domain/EnvironmentVariableName.d.ts +7 -0
- package/lib/envilder/core/domain/EnvironmentVariableName.d.ts.map +1 -1
- package/lib/envilder/core/domain/EnvironmentVariableName.js +35 -10
- package/lib/envilder/core/domain/EnvironmentVariableName.js.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.d.ts +1 -5
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.js +2 -3
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.js.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.d.ts +1 -6
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.js +2 -11
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.js.map +1 -1
- package/lib/envilder/core/infrastructure/variableStore/EnvFileParser.d.ts +2 -0
- package/lib/envilder/core/infrastructure/variableStore/EnvFileParser.d.ts.map +1 -0
- package/lib/envilder/core/infrastructure/variableStore/EnvFileParser.js +29 -0
- package/lib/envilder/core/infrastructure/variableStore/EnvFileParser.js.map +1 -0
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.d.ts +5 -4
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.js +22 -13
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.js.map +1 -1
- package/lib/sdks/nodejs/src/application/map-file-parser.d.ts.map +1 -1
- package/lib/sdks/nodejs/src/application/map-file-parser.js +6 -0
- package/lib/sdks/nodejs/src/application/map-file-parser.js.map +1 -1
- package/lib/sdks/nodejs/src/domain/environment-variable-name.d.ts +8 -0
- package/lib/sdks/nodejs/src/domain/environment-variable-name.d.ts.map +1 -0
- package/lib/sdks/nodejs/src/domain/environment-variable-name.js +43 -0
- package/lib/sdks/nodejs/src/domain/environment-variable-name.js.map +1 -0
- package/package.json +2 -2
|
@@ -26,6 +26,8 @@ import { EnvironmentVariable } from '../../domain/EnvironmentVariable.js';
|
|
|
26
26
|
import { EnvironmentFileError, InvalidArgumentError, } from '../../domain/errors/DomainErrors.js';
|
|
27
27
|
import { decideMapFileUpdate, } from '../../domain/MapFileUpdate.js';
|
|
28
28
|
import { TYPES } from '../../types.js';
|
|
29
|
+
/** No map file: nothing to write and nothing to report. */
|
|
30
|
+
const NO_MAP_FILE = {};
|
|
29
31
|
let PushSingleCommandHandler = PushSingleCommandHandler_1 = class PushSingleCommandHandler {
|
|
30
32
|
constructor(secretProvider, logger, variableStore) {
|
|
31
33
|
this.secretProvider = secretProvider;
|
|
@@ -46,7 +48,7 @@ let PushSingleCommandHandler = PushSingleCommandHandler_1 = class PushSingleComm
|
|
|
46
48
|
this.logger.info(`\n${pc.bold(pc.magenta('\u{1F4E4} PUSHING SECRET'))}`);
|
|
47
49
|
this.logger.info(PushSingleCommandHandler_1.RULE);
|
|
48
50
|
this.logger.info(` ${pc.dim('\u2192 ')}${pc.bold(command.key)}${pc.dim(' \u2192 ')}${pc.dim(maskedPath)}`);
|
|
49
|
-
const envVariable =
|
|
51
|
+
const envVariable = EnvironmentVariable.secret(command.key, command.value);
|
|
50
52
|
const plan = yield this.planMapFileUpdate(command);
|
|
51
53
|
try {
|
|
52
54
|
yield this.writeMapFile(plan);
|
|
@@ -77,36 +79,27 @@ let PushSingleCommandHandler = PushSingleCommandHandler_1 = class PushSingleComm
|
|
|
77
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
78
80
|
const { mapFile, key, secretPath, target } = command;
|
|
79
81
|
if (mapFile === undefined) {
|
|
80
|
-
return
|
|
82
|
+
return NO_MAP_FILE;
|
|
81
83
|
}
|
|
82
84
|
const original = yield this.variableStore.readMapFileContent(mapFile);
|
|
83
85
|
const decision = decideMapFileUpdate(original, key, secretPath, target, mapFile);
|
|
84
86
|
switch (decision.kind) {
|
|
85
87
|
case 'create':
|
|
86
88
|
return {
|
|
87
|
-
mapFile,
|
|
88
|
-
original,
|
|
89
|
-
content: decision.content,
|
|
89
|
+
change: { mapFile, original, content: decision.content },
|
|
90
90
|
summary: `Created ${mapFile}`,
|
|
91
91
|
};
|
|
92
92
|
case 'append':
|
|
93
93
|
return {
|
|
94
|
-
mapFile,
|
|
95
|
-
original,
|
|
96
|
-
content: decision.content,
|
|
94
|
+
change: { mapFile, original, content: decision.content },
|
|
97
95
|
summary: `Added ${key} to ${mapFile}`,
|
|
98
96
|
};
|
|
99
97
|
case 'unchanged':
|
|
100
98
|
return {
|
|
101
|
-
mapFile,
|
|
102
|
-
original,
|
|
103
99
|
summary: `${key} already mapped in ${mapFile}, no changes`,
|
|
104
100
|
};
|
|
105
101
|
case 'targetMismatch':
|
|
106
102
|
return {
|
|
107
|
-
mapFile,
|
|
108
|
-
original,
|
|
109
|
-
summary: '',
|
|
110
103
|
warning: `\u26A0 ${mapFile} targets ${this.describeTarget(decision.fileTarget)}, ` +
|
|
111
104
|
`but the secret was pushed to ${this.describeTarget(target)}. ` +
|
|
112
105
|
'The mapping was not added. Use --map=<file> to record it in a different map file.',
|
|
@@ -121,36 +114,35 @@ let PushSingleCommandHandler = PushSingleCommandHandler_1 = class PushSingleComm
|
|
|
121
114
|
}
|
|
122
115
|
});
|
|
123
116
|
}
|
|
124
|
-
writeMapFile(
|
|
125
|
-
return __awaiter(this,
|
|
126
|
-
if (
|
|
117
|
+
writeMapFile(_a) {
|
|
118
|
+
return __awaiter(this, arguments, void 0, function* ({ change }) {
|
|
119
|
+
if (change === undefined) {
|
|
127
120
|
return;
|
|
128
121
|
}
|
|
129
|
-
yield this.variableStore.writeMapFileContent(
|
|
122
|
+
yield this.variableStore.writeMapFileContent(change.mapFile, change.content);
|
|
130
123
|
});
|
|
131
124
|
}
|
|
132
|
-
rollBackMapFile(
|
|
133
|
-
return __awaiter(this,
|
|
134
|
-
if (
|
|
125
|
+
rollBackMapFile(_a, key_1) {
|
|
126
|
+
return __awaiter(this, arguments, void 0, function* ({ change }, key) {
|
|
127
|
+
if (change === undefined) {
|
|
135
128
|
return;
|
|
136
129
|
}
|
|
137
130
|
try {
|
|
138
|
-
yield this.variableStore.restoreMapFile(
|
|
131
|
+
yield this.variableStore.restoreMapFile(change.mapFile, change.original);
|
|
139
132
|
}
|
|
140
|
-
catch (
|
|
141
|
-
this.logger.error(`Could not restore ${
|
|
133
|
+
catch (_b) {
|
|
134
|
+
this.logger.error(`Could not restore ${change.mapFile}. Remove ${key} from it manually.`);
|
|
142
135
|
}
|
|
143
136
|
});
|
|
144
137
|
}
|
|
145
|
-
reportMapFile(
|
|
146
|
-
if (
|
|
138
|
+
reportMapFile({ summary, warning }) {
|
|
139
|
+
if (warning !== undefined) {
|
|
140
|
+
this.logger.warn(pc.yellow(warning));
|
|
147
141
|
return;
|
|
148
142
|
}
|
|
149
|
-
if (
|
|
150
|
-
this.logger.
|
|
151
|
-
return;
|
|
143
|
+
if (summary !== undefined) {
|
|
144
|
+
this.logger.info(`${pc.green('\u2713')} ${summary}\n`);
|
|
152
145
|
}
|
|
153
|
-
this.logger.info(`${pc.green('\u2713')} ${plan.summary}\n`);
|
|
154
146
|
}
|
|
155
147
|
/** Provider and vault name only: a vault URL may carry credentials. */
|
|
156
148
|
describeTarget(target) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PushSingleCommandHandler.js","sourceRoot":"","sources":["../../../../../src/envilder/core/application/pushSingle/PushSingleCommandHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,mBAAmB,GAEpB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"PushSingleCommandHandler.js","sourceRoot":"","sources":["../../../../../src/envilder/core/application/pushSingle/PushSingleCommandHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ export class SecretResolver {
|
|
|
104
104
|
return { status: 'warning', envVar, path: secretName, reason: 'empty' };
|
|
105
105
|
}
|
|
106
106
|
this.secretMasker.mask(value);
|
|
107
|
-
const masked =
|
|
107
|
+
const masked = EnvironmentVariable.secret(envVar, value).maskedValue;
|
|
108
108
|
return { status: 'resolved', envVar, value, masked };
|
|
109
109
|
}
|
|
110
110
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecretResolver.js","sourceRoot":"","sources":["../../../../../src/envilder/core/application/secretResolution/SecretResolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SecretResolver.js","sourceRoot":"","sources":["../../../../../src/envilder/core/application/secretResolution/SecretResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,14 @@
|
|
|
4
4
|
export declare class EnvironmentVariable {
|
|
5
5
|
private readonly _name;
|
|
6
6
|
private readonly _value;
|
|
7
|
-
private readonly _isSecret;
|
|
8
7
|
/**
|
|
9
8
|
* Creates a new environment variable
|
|
10
9
|
*
|
|
11
10
|
* @param name - The name of the environment variable
|
|
12
11
|
* @param value - The value of the environment variable
|
|
13
|
-
* @param isSecret - Whether this variable should be treated as sensitive information
|
|
14
12
|
*/
|
|
15
|
-
constructor(name: string, value: string
|
|
13
|
+
constructor(name: string, value: string);
|
|
14
|
+
static secret(name: string, value: string): EnvironmentVariable;
|
|
16
15
|
/**
|
|
17
16
|
* Gets the name of the environment variable
|
|
18
17
|
*/
|
|
@@ -33,7 +32,7 @@ export declare class EnvironmentVariable {
|
|
|
33
32
|
* Returns a masked representation of a secret path for safe logging.
|
|
34
33
|
*/
|
|
35
34
|
static maskSecretPath(path: string): string;
|
|
36
|
-
|
|
35
|
+
protected static mask(value: string, minLengthToShowTail: number): string;
|
|
37
36
|
/**
|
|
38
37
|
* Validates the environment variable
|
|
39
38
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentVariable.d.ts","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariable.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;
|
|
1
|
+
{"version":3,"file":"EnvironmentVariable.d.ts","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariable.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;;;;OAKG;IACH,YAAY,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAItC;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAE9D;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;OAEG;IACH,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1C;IAED,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAIxE;IAED;;OAEG;IACH,OAAO,CAAC,QAAQ;CAajB"}
|
|
@@ -9,13 +9,14 @@ export class EnvironmentVariable {
|
|
|
9
9
|
*
|
|
10
10
|
* @param name - The name of the environment variable
|
|
11
11
|
* @param value - The value of the environment variable
|
|
12
|
-
* @param isSecret - Whether this variable should be treated as sensitive information
|
|
13
12
|
*/
|
|
14
|
-
constructor(name, value
|
|
13
|
+
constructor(name, value) {
|
|
15
14
|
this.validate(name, value);
|
|
16
15
|
this._name = name;
|
|
17
16
|
this._value = value;
|
|
18
|
-
|
|
17
|
+
}
|
|
18
|
+
static secret(name, value) {
|
|
19
|
+
return new SecretEnvironmentVariable(name, value);
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
21
22
|
* Gets the name of the environment variable
|
|
@@ -33,16 +34,13 @@ export class EnvironmentVariable {
|
|
|
33
34
|
* Gets whether this variable is sensitive information
|
|
34
35
|
*/
|
|
35
36
|
get isSecret() {
|
|
36
|
-
return
|
|
37
|
+
return false;
|
|
37
38
|
}
|
|
38
39
|
/**
|
|
39
40
|
* Returns a masked representation of the value for logging
|
|
40
41
|
*/
|
|
41
42
|
get maskedValue() {
|
|
42
|
-
|
|
43
|
-
return this._value;
|
|
44
|
-
}
|
|
45
|
-
return EnvironmentVariable.mask(this._value, 10);
|
|
43
|
+
return this._value;
|
|
46
44
|
}
|
|
47
45
|
/**
|
|
48
46
|
* Returns a masked representation of a secret path for safe logging.
|
|
@@ -67,4 +65,12 @@ export class EnvironmentVariable {
|
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
}
|
|
68
|
+
class SecretEnvironmentVariable extends EnvironmentVariable {
|
|
69
|
+
get isSecret() {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
get maskedValue() {
|
|
73
|
+
return EnvironmentVariable.mask(this.value, 10);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
70
76
|
//# sourceMappingURL=EnvironmentVariable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentVariable.js","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,8BAA8B,GAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;GAEG;AACH,MAAM,OAAO,mBAAmB;
|
|
1
|
+
{"version":3,"file":"EnvironmentVariable.js","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariable.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,8BAA8B,GAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAI9B;;;;;OAKG;IACH,YAAY,IAAY,EAAE,KAAa;QACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,IAAY,EAAE,KAAa;QACvC,OAAO,IAAI,yBAAyB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,IAAY;QAChC,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAES,MAAM,CAAC,IAAI,CAAC,KAAa,EAAE,mBAA2B;QAC9D,OAAO,KAAK,CAAC,MAAM,GAAG,mBAAmB;YACvC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,IAAY,EAAE,KAAa;QAC1C,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,oBAAoB,CAC5B,qCAAqC,CAAC,IAAI,CAAC,CAC5C,CAAC;QACJ,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CACb,kCAAkC,IAAI,8BAA8B,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,yBAA0B,SAAQ,mBAAmB;IACzD,IAAa,QAAQ;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export declare function isValidEnvironmentVariableName(name: string): boolean;
|
|
2
|
+
/** Whether every common `.env` reader loads a line with this valid name. */
|
|
3
|
+
export declare function isPortableEnvFileName(name: string): boolean;
|
|
2
4
|
/**
|
|
3
5
|
* Builds the rejection message, so every caller reports the same wording. The
|
|
4
6
|
* name is quoted rather than interpolated: it is untrusted input, and quoting
|
|
@@ -6,4 +8,9 @@ export declare function isValidEnvironmentVariableName(name: string): boolean;
|
|
|
6
8
|
* lines. Only the name is echoed, never the mapped value.
|
|
7
9
|
*/
|
|
8
10
|
export declare function invalidEnvironmentVariableNameMessage(name: string): string;
|
|
11
|
+
/**
|
|
12
|
+
* Builds the warning for names a `.env` file holds but not every reader
|
|
13
|
+
* loads. Names only, quoted for the same reason as the rejection message.
|
|
14
|
+
*/
|
|
15
|
+
export declare function nonPortableEnvFileNamesMessage(names: string[]): string;
|
|
9
16
|
//# sourceMappingURL=EnvironmentVariableName.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentVariableName.d.ts","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariableName.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EnvironmentVariableName.d.ts","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariableName.ts"],"names":[],"mappings":"AAmDA,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpE;AAED,4EAA4E;AAC5E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAkB1E;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAQtE"}
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
* round-trip as itself and nothing else.**
|
|
10
10
|
*
|
|
11
11
|
* That is expressed as an allowlist rather than a list of banned characters,
|
|
12
|
-
* because a blocklist cannot hold the invariant.
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
12
|
+
* because a blocklist cannot hold the invariant. Anything outside
|
|
13
|
+
* `[A-Za-z0-9_./-]+` either makes the line unparseable, so the variable is
|
|
14
|
+
* written and then silently lost (a space, `#`, a tab, an accented or
|
|
15
|
+
* non-Latin letter, NUL, vertical tab), or is read back as a *different*
|
|
16
|
+
* assignment, which is the injection in issue #511:
|
|
17
17
|
*
|
|
18
18
|
* - `=` opens a second assignment on the same line.
|
|
19
19
|
* - CR and LF open a second line.
|
|
@@ -22,10 +22,20 @@
|
|
|
22
22
|
* `^` matches after them, so a name embedding one is read back as a
|
|
23
23
|
* separate assignment.
|
|
24
24
|
*
|
|
25
|
-
* Dotted and hyphenated names (historically accepted, non-POSIX) stay valid
|
|
26
|
-
*
|
|
25
|
+
* Dotted and hyphenated names (historically accepted, non-POSIX) stay valid.
|
|
26
|
+
* So does `/`, which map files have always used for hierarchical names
|
|
27
|
+
* (`Database/Password`): it cannot inject anything, and envilder writes and
|
|
28
|
+
* reads it back as itself. Some readers still skip such a line, which
|
|
29
|
+
* {@link isPortableEnvFileName} reports.
|
|
27
30
|
*/
|
|
28
|
-
const READABLE_NAME = /^[A-Za-z0-9_
|
|
31
|
+
const READABLE_NAME = /^[A-Za-z0-9_./-]+$/;
|
|
32
|
+
/**
|
|
33
|
+
* The key grammar every common `.env` reader shares. A name outside it but
|
|
34
|
+
* inside {@link READABLE_NAME} (one holding `/`) round-trips through envilder
|
|
35
|
+
* and `python-dotenv`, while `dotenv` for Node.js skips the line and a POSIX
|
|
36
|
+
* shell cannot `source` it.
|
|
37
|
+
*/
|
|
38
|
+
const PORTABLE_ENV_FILE_NAME = /^[A-Za-z0-9_.-]+$/;
|
|
29
39
|
/**
|
|
30
40
|
* `__proto__` is the one name inside the allowlist that still breaks the
|
|
31
41
|
* round-trip. Writing it is fine, but every reader builds a plain object and
|
|
@@ -41,6 +51,10 @@ export function isValidEnvironmentVariableName(name) {
|
|
|
41
51
|
READABLE_NAME.test(name) &&
|
|
42
52
|
!UNSUPPORTED_NAMES.has(name));
|
|
43
53
|
}
|
|
54
|
+
/** Whether every common `.env` reader loads a line with this valid name. */
|
|
55
|
+
export function isPortableEnvFileName(name) {
|
|
56
|
+
return PORTABLE_ENV_FILE_NAME.test(name);
|
|
57
|
+
}
|
|
44
58
|
/**
|
|
45
59
|
* Builds the rejection message, so every caller reports the same wording. The
|
|
46
60
|
* name is quoted rather than interpolated: it is untrusted input, and quoting
|
|
@@ -57,8 +71,19 @@ export function invalidEnvironmentVariableNameMessage(name) {
|
|
|
57
71
|
'but never resolved');
|
|
58
72
|
}
|
|
59
73
|
return (`Invalid environment variable name ${quoteName(name)}: names may only ` +
|
|
60
|
-
'contain letters, digits, underscore, dot and
|
|
61
|
-
'be read back from a .env file');
|
|
74
|
+
'contain letters, digits, underscore, dot, hyphen and slash, so that ' +
|
|
75
|
+
'they can be read back from a .env file');
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Builds the warning for names a `.env` file holds but not every reader
|
|
79
|
+
* loads. Names only, quoted for the same reason as the rejection message.
|
|
80
|
+
*/
|
|
81
|
+
export function nonPortableEnvFileNamesMessage(names) {
|
|
82
|
+
const quoted = names.map(quoteName).join(', ');
|
|
83
|
+
return (`${quoted} contain "/": envilder writes and reads them back, but dotenv ` +
|
|
84
|
+
'for Node.js skips those lines and a POSIX shell cannot source them. ' +
|
|
85
|
+
'If your app reads the .env file with one of those, use "envilder exec" ' +
|
|
86
|
+
'or rename them with "__" (Database__Password)');
|
|
62
87
|
}
|
|
63
88
|
function quoteName(name) {
|
|
64
89
|
// JSON.stringify escapes CR, LF and the other control characters, but leaves
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentVariableName.js","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariableName.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"EnvironmentVariableName.js","sourceRoot":"","sources":["../../../../src/envilder/core/domain/EnvironmentVariableName.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,sBAAsB,GAAG,mBAAmB,CAAC;AAEnD;;;;;;;;GAQG;AACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAEjD,MAAM,UAAU,8BAA8B,CAAC,IAAY;IACzD,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;QACxB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAC7B,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,OAAO,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qCAAqC,CAAC,IAAY;IAChE,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,OAAO,2CAA2C,CAAC;IACrD,CAAC;IAED,IAAI,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,OAAO,CACL,yCAAyC,SAAS,CAAC,IAAI,CAAC,IAAI;YAC5D,mEAAmE;YACnE,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,CACL,qCAAqC,SAAS,CAAC,IAAI,CAAC,mBAAmB;QACvE,sEAAsE;QACtE,wCAAwC,CACzC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAAe;IAC5D,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,CACL,GAAG,MAAM,gEAAgE;QACzE,sEAAsE;QACtE,yEAAyE;QACzE,+CAA+C,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,6EAA6E;IAC7E,yEAAyE;IACzE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SACxB,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC;SAChC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -2,9 +2,5 @@ import type { MapFileConfig } from '../../domain/MapFileConfig.js';
|
|
|
2
2
|
import type { ILogger } from '../../domain/ports/ILogger.js';
|
|
3
3
|
import type { ISecretProvider } from '../../domain/ports/ISecretProvider.js';
|
|
4
4
|
export declare function resolveRegionWithFallback(profile?: string): Promise<string>;
|
|
5
|
-
export
|
|
6
|
-
/** Log the AWS identity on first use (default: true). */
|
|
7
|
-
identityBanner?: boolean;
|
|
8
|
-
};
|
|
9
|
-
export declare function createAwsSecretProvider(config: MapFileConfig, logger: ILogger, options?: AwsProviderOptions): ISecretProvider;
|
|
5
|
+
export declare function createAwsSecretProvider(config: MapFileConfig, logger: ILogger): ISecretProvider;
|
|
10
6
|
//# sourceMappingURL=AwsSecretProviderFactory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSecretProviderFactory.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,
|
|
1
|
+
{"version":3,"file":"AwsSecretProviderFactory.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,OAAO,GACd,eAAe,CAWjB"}
|
|
@@ -26,13 +26,12 @@ export function resolveRegionWithFallback(profile) {
|
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
|
-
export function createAwsSecretProvider(config, logger
|
|
30
|
-
var _a;
|
|
29
|
+
export function createAwsSecretProvider(config, logger) {
|
|
31
30
|
const { profile } = config;
|
|
32
31
|
const region = () => resolveRegionWithFallback(profile);
|
|
33
32
|
const clientConfig = profile ? { profile, region } : { region };
|
|
34
33
|
const ssm = new SSM(clientConfig);
|
|
35
34
|
const sts = new STS(Object.assign(Object.assign({}, clientConfig), { maxAttempts: 1, requestHandler: { requestTimeout: 2000 } }));
|
|
36
|
-
return new AwsSsmSecretProvider(ssm, logger, sts, profile
|
|
35
|
+
return new AwsSsmSecretProvider(ssm, logger, sts, profile);
|
|
37
36
|
}
|
|
38
37
|
//# sourceMappingURL=AwsSecretProviderFactory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSecretProviderFactory.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAI1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAgB,yBAAyB,CAC7C,OAAgB;;QAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACxC,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnE,CAAC;mBAAO,CAAC;YACP,OAAO,WAAW,CAAC;QACrB,CAAC;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"AwsSecretProviderFactory.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAI1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAgB,yBAAyB,CAC7C,OAAgB;;QAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACxC,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnE,CAAC;mBAAO,CAAC;YACP,OAAO,WAAW,CAAC;QACrB,CAAC;IACH,CAAC;CAAA;AAED,MAAM,UAAU,uBAAuB,CACrC,MAAqB,EACrB,MAAe;IAEf,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAChE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,iCACd,YAAY,KACf,WAAW,EAAE,CAAC,EACd,cAAc,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,IACxC,CAAC;IACH,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -8,12 +8,7 @@ export declare class AwsSsmSecretProvider implements ISecretProvider {
|
|
|
8
8
|
private sts;
|
|
9
9
|
private profile?;
|
|
10
10
|
private identityLogged;
|
|
11
|
-
|
|
12
|
-
/**
|
|
13
|
-
* @param identityBanner - Log the AWS identity on first use. Exec mode turns
|
|
14
|
-
* it off to keep its output to a single summary line.
|
|
15
|
-
*/
|
|
16
|
-
constructor(ssm: SSM, logger: ILogger, sts: STS, profile?: string, identityBanner?: boolean);
|
|
11
|
+
constructor(ssm: SSM, logger: ILogger, sts: STS, profile?: string);
|
|
17
12
|
getSecret(name: string): Promise<string | undefined>;
|
|
18
13
|
setSecret(name: string, value: string): Promise<void>;
|
|
19
14
|
logIdentity(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSsmSecretProvider.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA4B,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAC;AASzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAK7E,qBACa,oBAAqB,YAAW,eAAe;IAC1D,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;
|
|
1
|
+
{"version":3,"file":"AwsSsmSecretProvider.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA4B,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAC;AASzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAK7E,qBACa,oBAAqB,YAAW,eAAe;IAC1D,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAE/B,YAAY,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,EAKhE;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA2BzD;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB1D;IAEK,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAWjC;IAED,OAAO,CAAC,oBAAoB;YAyBd,aAAa;YAQb,cAAc;YAQd,qBAAqB;YASrB,aAAa;CAQ5B"}
|
|
@@ -26,23 +26,15 @@ import { describeError } from '../describeError.js';
|
|
|
26
26
|
import { isExpiredCredentialsError } from './isExpiredCredentialsError.js';
|
|
27
27
|
import { isSsoSessionExpiredError } from './isSsoSessionExpiredError.js';
|
|
28
28
|
let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
29
|
-
|
|
30
|
-
* @param identityBanner - Log the AWS identity on first use. Exec mode turns
|
|
31
|
-
* it off to keep its output to a single summary line.
|
|
32
|
-
*/
|
|
33
|
-
constructor(ssm, logger, sts, profile, identityBanner = true) {
|
|
29
|
+
constructor(ssm, logger, sts, profile) {
|
|
34
30
|
this.identityLogged = false;
|
|
35
31
|
this.ssm = ssm;
|
|
36
32
|
this.logger = logger;
|
|
37
33
|
this.sts = sts;
|
|
38
34
|
this.profile = profile;
|
|
39
|
-
this.identityBanner = identityBanner;
|
|
40
35
|
}
|
|
41
36
|
getSecret(name) {
|
|
42
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
if (this.identityBanner) {
|
|
44
|
-
yield this.logIdentity();
|
|
45
|
-
}
|
|
46
38
|
try {
|
|
47
39
|
const command = new GetParameterCommand({
|
|
48
40
|
Name: name,
|
|
@@ -70,7 +62,6 @@ let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
|
70
62
|
}
|
|
71
63
|
setSecret(name, value) {
|
|
72
64
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
|
-
yield this.logIdentity();
|
|
74
65
|
const command = new PutParameterCommand({
|
|
75
66
|
Name: name,
|
|
76
67
|
Value: value,
|
|
@@ -167,7 +158,7 @@ let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
|
167
158
|
};
|
|
168
159
|
AwsSsmSecretProvider = __decorate([
|
|
169
160
|
injectable(),
|
|
170
|
-
__metadata("design:paramtypes", [Function, Object, Function, String
|
|
161
|
+
__metadata("design:paramtypes", [Function, Object, Function, String])
|
|
171
162
|
], AwsSsmSecretProvider);
|
|
172
163
|
export { AwsSsmSecretProvider };
|
|
173
164
|
//# sourceMappingURL=AwsSsmSecretProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSsmSecretProvider.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAY,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"AwsSsmSecretProvider.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EnvFileParser.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/EnvFileParser.ts"],"names":[],"mappings":"AAaA,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBhE"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* dotenv's `LINE` grammar and `parse`, copied from dotenv 17 with one change:
|
|
3
|
+
* the key class also admits `/`, the hierarchy separator map files use
|
|
4
|
+
* (`Database/Password`). dotenv skips such a line, so reading the files we
|
|
5
|
+
* write through it would lose those keys, both when merging into an existing
|
|
6
|
+
* file and when checking the result before it reaches disk.
|
|
7
|
+
*
|
|
8
|
+
* Everything else is dotenv's, value rules included, so a file without `/` in
|
|
9
|
+
* its keys parses exactly as dotenv parses it. The conformance tests pin that.
|
|
10
|
+
*/
|
|
11
|
+
const LINE = /(?:^|^)\s*(?:export\s+)?([\w./-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
|
|
12
|
+
export function parseEnvFile(src) {
|
|
13
|
+
// A plain object on purpose, as in dotenv: `__proto__` must vanish here too,
|
|
14
|
+
// which is why the name rule rejects it.
|
|
15
|
+
const obj = {};
|
|
16
|
+
const lines = src.replace(/\r\n?/gm, '\n');
|
|
17
|
+
for (const match of lines.matchAll(LINE)) {
|
|
18
|
+
const key = match[1];
|
|
19
|
+
let value = (match[2] || '').trim();
|
|
20
|
+
const maybeQuote = value[0];
|
|
21
|
+
value = value.replace(/^(['"`])([\s\S]*)\1$/gm, '$2');
|
|
22
|
+
if (maybeQuote === '"') {
|
|
23
|
+
value = value.replace(/\\n/g, '\n').replace(/\\r/g, '\r');
|
|
24
|
+
}
|
|
25
|
+
obj[key] = value;
|
|
26
|
+
}
|
|
27
|
+
return obj;
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=EnvFileParser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EnvFileParser.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/EnvFileParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,IAAI,GACR,+IAA+I,CAAC;AAElJ,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,6EAA6E;IAC7E,yCAAyC;IACzC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE3C,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;QACtD,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;YACvB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5D,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -13,6 +13,7 @@ export declare class FileVariableStore implements IVariableStore {
|
|
|
13
13
|
restoreMapFile(destination: string, original: string | null): Promise<void>;
|
|
14
14
|
getEnvironment(source: string): Promise<Record<string, string>>;
|
|
15
15
|
saveEnvironment(destination: string, envVariables: Record<string, string>): Promise<void>;
|
|
16
|
+
private warnAboutNonPortableNames;
|
|
16
17
|
private readExistingEnvContent;
|
|
17
18
|
private buildEnvContent;
|
|
18
19
|
/**
|
|
@@ -38,15 +39,15 @@ export declare class FileVariableStore implements IVariableStore {
|
|
|
38
39
|
* No supported syntax reaches this today: the grammar is shared with dotenv
|
|
39
40
|
* precisely so that none can, and every form that once did — duplicates, a
|
|
40
41
|
* colon separator, a value starting on the next physical line — is claimed
|
|
41
|
-
* and replaced. This is the net for the day the two drift apart, which
|
|
42
|
-
*
|
|
42
|
+
* and replaced. This is the net for the day the two drift apart, which a
|
|
43
|
+
* change to either pattern or to {@link parseEnvFile} leaves open.
|
|
43
44
|
*/
|
|
44
45
|
private assertNoManagedAssignmentSurvives;
|
|
45
46
|
private renderAssignments;
|
|
46
47
|
/**
|
|
47
48
|
* Serializes a value for a single `.env` assignment. Candidate
|
|
48
49
|
* representations are tried in order of preference and accepted only once
|
|
49
|
-
*
|
|
50
|
+
* {@link parseEnvFile} confirms the assignment yields exactly the intended
|
|
50
51
|
* key/value, never by inspection alone. An existing delimiter (from
|
|
51
52
|
* `originalValue`, when updating an existing assignment) is preferred but
|
|
52
53
|
* only kept when it still round-trips for the new value.
|
|
@@ -72,7 +73,7 @@ export declare class FileVariableStore implements IVariableStore {
|
|
|
72
73
|
private keysThatAppeared;
|
|
73
74
|
/**
|
|
74
75
|
* The values the file already held for keys this run is not writing. Read
|
|
75
|
-
* through
|
|
76
|
+
* through {@link parseEnvFile} so duplicate keys collapse the same way a consumer
|
|
76
77
|
* would see them.
|
|
77
78
|
*/
|
|
78
79
|
private collectUnmanagedValues;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVariableStore.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FileVariableStore.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACd,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAkD3E,qBACa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,MAAM,CAAU;IAExB,YAAmC,MAAM,EAAE,OAAO,EAKjD;IAEK,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAGhE;IAEK,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA4B7D;IAED,OAAO,CAAC,uBAAuB;YAQjB,YAAY;IAmBpB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS/D;IAEK,mBAAmB,CACvB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAcf;IAEK,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAYf;IAEK,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAepE;IAEK,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,CAwBf;IAED,OAAO,CAAC,yBAAyB;YAOnB,sBAAsB;IAoBpC,OAAO,CAAC,eAAe;IA2EvB;;;;;;;;;OASG;IACH,OAAO,CAAC,uBAAuB;IAsB/B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,iCAAiC;IAqBzC,OAAO,CAAC,iBAAiB;IAMzB;;;;;;;OAOG;IACH,OAAO,CAAC,wBAAwB;IAgBhC,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,qBAAqB;IAc7B;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,YAAY;IAcpB,8EAA8E;IAC9E,OAAO,CAAC,sBAAsB;IAO9B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IASxB;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAgB9B;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;CAoBjC;AAQD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAkBxB"}
|