@push.rocks/qenv 8.0.0 → 8.1.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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.d.ts +2 -0
- package/dist_ts/index.js +3 -1
- package/dist_ts/qenv.classes.invalidqenvfileerror.d.ts +21 -0
- package/dist_ts/qenv.classes.invalidqenvfileerror.js +25 -0
- package/dist_ts/qenv.classes.missingqenvfileerror.d.ts +16 -0
- package/dist_ts/qenv.classes.missingqenvfileerror.js +19 -0
- package/dist_ts/qenv.classes.qenv.d.ts +13 -2
- package/dist_ts/qenv.classes.qenv.js +51 -6
- package/package.json +1 -1
- package/readme.md +46 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +2 -0
- package/ts/qenv.classes.invalidqenvfileerror.ts +43 -0
- package/ts/qenv.classes.missingqenvfileerror.ts +28 -0
- package/ts/qenv.classes.qenv.ts +63 -5
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/qenv',
|
|
6
|
-
version: '8.
|
|
6
|
+
version: '8.1.0',
|
|
7
7
|
description: 'A module for easily handling environment variables in Node.js projects with support for .yml and .json configuration.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHVIQUF1SDtDQUNySSxDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export * from './qenv.classes.qenv.js';
|
|
2
|
+
export * from './qenv.classes.invalidqenvfileerror.js';
|
|
3
|
+
export * from './qenv.classes.missingqenvfileerror.js';
|
|
2
4
|
export * from './qenv.classes.missingrequiredenvvarserror.js';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsd0NBQXdDLENBQUM7QUFDdkQsY0FBYyx3Q0FBd0MsQ0FBQztBQUN2RCxjQUFjLCtDQUErQyxDQUFDIn0=
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/** which rule of the `required:` list a qenv.yml broke */
|
|
2
|
+
export type TQenvInvalidQenvFileReason = 'requiredNotAnArray' | 'requiredEntryNotAString';
|
|
3
|
+
export interface IQenvInvalidQenvFileErrorOptions {
|
|
4
|
+
qenvFilePathAbsolute: string;
|
|
5
|
+
reason: TQenvInvalidQenvFileReason;
|
|
6
|
+
/** the type name of the offending value, never the value itself */
|
|
7
|
+
invalidValueTypeName: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Thrown when qenv.yml declares a `required:` that qenv cannot read as a list of names. Such a
|
|
11
|
+
* declaration silently enforced nothing, which is the same fail-open as a missing qenv.yml.
|
|
12
|
+
* A file without any `required:` key, and one with an empty list, legitimately require nothing
|
|
13
|
+
* and never reach this error.
|
|
14
|
+
*/
|
|
15
|
+
export declare class QenvInvalidQenvFileError extends Error {
|
|
16
|
+
readonly code = "QENV_INVALID_QENV_FILE";
|
|
17
|
+
readonly qenvFilePathAbsolute: string;
|
|
18
|
+
readonly reason: TQenvInvalidQenvFileReason;
|
|
19
|
+
readonly invalidValueTypeName: string;
|
|
20
|
+
constructor(optionsArg: IQenvInvalidQenvFileErrorOptions);
|
|
21
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
const reasonDescriptions = {
|
|
2
|
+
requiredNotAnArray: (typeNameArg) => `"required:" is of type ${typeNameArg} instead of a list of environment variable names`,
|
|
3
|
+
requiredEntryNotAString: (typeNameArg) => `"required:" contains an entry of type ${typeNameArg} instead of an environment variable name`,
|
|
4
|
+
};
|
|
5
|
+
/**
|
|
6
|
+
* Thrown when qenv.yml declares a `required:` that qenv cannot read as a list of names. Such a
|
|
7
|
+
* declaration silently enforced nothing, which is the same fail-open as a missing qenv.yml.
|
|
8
|
+
* A file without any `required:` key, and one with an empty list, legitimately require nothing
|
|
9
|
+
* and never reach this error.
|
|
10
|
+
*/
|
|
11
|
+
export class QenvInvalidQenvFileError extends Error {
|
|
12
|
+
constructor(optionsArg) {
|
|
13
|
+
super(`The qenv.yml at ${optionsArg.qenvFilePathAbsolute} declares an unreadable requirement: ` +
|
|
14
|
+
`${reasonDescriptions[optionsArg.reason](optionsArg.invalidValueTypeName)}. ` +
|
|
15
|
+
`Write "required:" as a list of environment variable names, or omit it to require nothing.`);
|
|
16
|
+
this.code = 'QENV_INVALID_QENV_FILE';
|
|
17
|
+
this.name = 'QenvInvalidQenvFileError';
|
|
18
|
+
this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
|
|
19
|
+
this.reason = optionsArg.reason;
|
|
20
|
+
// only the type is carried and rendered: a malformed qenv.yml can hold a value where a name
|
|
21
|
+
// belongs, and a value may be a secret
|
|
22
|
+
this.invalidValueTypeName = optionsArg.invalidValueTypeName;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicWVudi5jbGFzc2VzLmludmFsaWRxZW52ZmlsZWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvcWVudi5jbGFzc2VzLmludmFsaWRxZW52ZmlsZWVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE1BQU0sa0JBQWtCLEdBQXdFO0lBQzlGLGtCQUFrQixFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FDbEMsMEJBQTBCLFdBQVcsa0RBQWtEO0lBQ3pGLHVCQUF1QixFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FDdkMseUNBQXlDLFdBQVcsMENBQTBDO0NBQ2pHLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxLQUFLO0lBTWpELFlBQVksVUFBNEM7UUFDdEQsS0FBSyxDQUNILG1CQUFtQixVQUFVLENBQUMsb0JBQW9CLHVDQUF1QztZQUN2RixHQUFHLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUM3RSwyRkFBMkYsQ0FDOUYsQ0FBQztRQVZZLFNBQUksR0FBRyx3QkFBd0IsQ0FBQztRQVc5QyxJQUFJLENBQUMsSUFBSSxHQUFHLDBCQUEwQixDQUFDO1FBQ3ZDLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUM7UUFDNUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBQ2hDLDRGQUE0RjtRQUM1Rix1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLG9CQUFvQixHQUFHLFVBQVUsQ0FBQyxvQkFBb0IsQ0FBQztJQUM5RCxDQUFDO0NBQ0YifQ==
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export interface IQenvMissingQenvFileErrorOptions {
|
|
2
|
+
qenvFilePathAbsolute: string;
|
|
3
|
+
qenvDir: string;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Thrown when a Qenv that is set to fail on missing variables finds no qenv.yml at all.
|
|
7
|
+
* Without the file there is no `required:` list to enforce, so every check would pass by
|
|
8
|
+
* accident - a deployable that forgot to ship its qenv.yml would look healthy. `code` identifies
|
|
9
|
+
* the refusal even when two copies of qenv end up in one tree, which makes `instanceof` unreliable.
|
|
10
|
+
*/
|
|
11
|
+
export declare class QenvMissingQenvFileError extends Error {
|
|
12
|
+
readonly code = "QENV_MISSING_QENV_FILE";
|
|
13
|
+
readonly qenvFilePathAbsolute: string;
|
|
14
|
+
readonly qenvDir: string;
|
|
15
|
+
constructor(optionsArg: IQenvMissingQenvFileErrorOptions);
|
|
16
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Thrown when a Qenv that is set to fail on missing variables finds no qenv.yml at all.
|
|
3
|
+
* Without the file there is no `required:` list to enforce, so every check would pass by
|
|
4
|
+
* accident - a deployable that forgot to ship its qenv.yml would look healthy. `code` identifies
|
|
5
|
+
* the refusal even when two copies of qenv end up in one tree, which makes `instanceof` unreliable.
|
|
6
|
+
*/
|
|
7
|
+
export class QenvMissingQenvFileError extends Error {
|
|
8
|
+
constructor(optionsArg) {
|
|
9
|
+
super(`qenv found no qenv.yml at ${optionsArg.qenvFilePathAbsolute}. It was constructed to fail ` +
|
|
10
|
+
`on missing required environment variables, and without qenv.yml there is no "required:" ` +
|
|
11
|
+
`list to enforce, so nothing would be checked. Ship qenv.yml with your deployable, or ` +
|
|
12
|
+
`construct Qenv with failOnMissing set to false.`);
|
|
13
|
+
this.code = 'QENV_MISSING_QENV_FILE';
|
|
14
|
+
this.name = 'QenvMissingQenvFileError';
|
|
15
|
+
this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
|
|
16
|
+
this.qenvDir = optionsArg.qenvDir;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicWVudi5jbGFzc2VzLm1pc3NpbmdxZW52ZmlsZWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvcWVudi5jbGFzc2VzLm1pc3NpbmdxZW52ZmlsZWVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBOzs7OztHQUtHO0FBQ0gsTUFBTSxPQUFPLHdCQUF5QixTQUFRLEtBQUs7SUFLakQsWUFBWSxVQUE0QztRQUN0RCxLQUFLLENBQ0gsNkJBQTZCLFVBQVUsQ0FBQyxvQkFBb0IsK0JBQStCO1lBQ3pGLDBGQUEwRjtZQUMxRix1RkFBdUY7WUFDdkYsaURBQWlELENBQ3BELENBQUM7UUFWWSxTQUFJLEdBQUcsd0JBQXdCLENBQUM7UUFXOUMsSUFBSSxDQUFDLElBQUksR0FBRywwQkFBMEIsQ0FBQztRQUN2QyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsVUFBVSxDQUFDLG9CQUFvQixDQUFDO1FBQzVELElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztJQUNwQyxDQUFDO0NBQ0YifQ==
|
|
@@ -23,13 +23,24 @@ export declare class Qenv {
|
|
|
23
23
|
* @param qenvFileBasePathArg directory that holds qenv.yml
|
|
24
24
|
* @param envFileBasePathArg directory that holds env.json, env.yml or env.yaml
|
|
25
25
|
* @param failOnMissing throws a QenvMissingRequiredEnvVarsError when a variable listed under
|
|
26
|
-
* `required:` in qenv.yml is not provided by any source
|
|
27
|
-
*
|
|
26
|
+
* `required:` in qenv.yml is not provided by any source, a QenvMissingQenvFileError when there
|
|
27
|
+
* is no qenv.yml to read that list from, and a QenvInvalidQenvFileError when the list cannot be
|
|
28
|
+
* read as names. Pass false to only record the names in `missingEnvVars` and continue.
|
|
29
|
+
* @throws QenvMissingQenvFileError
|
|
30
|
+
* @throws QenvInvalidQenvFileError
|
|
28
31
|
* @throws QenvMissingRequiredEnvVarsError
|
|
29
32
|
*/
|
|
30
33
|
constructor(qenvFileBasePathArg?: string, envFileBasePathArg?: string, failOnMissing?: boolean);
|
|
31
34
|
private initializeFilePaths;
|
|
32
35
|
private loadRequiredEnvVars;
|
|
36
|
+
/**
|
|
37
|
+
* Refuses a qenv.yml whose `required:` cannot be read as names: it enforces nothing, which is
|
|
38
|
+
* the fail-open a missing qenv.yml would be. A caller that opted out of failing keeps running,
|
|
39
|
+
* but hears the same named reason instead of losing the requirement silently.
|
|
40
|
+
*/
|
|
41
|
+
private refuseInvalidQenvFile;
|
|
42
|
+
/** names the type of a value without rendering it: a value in a name's place may be a secret */
|
|
43
|
+
private describeValueType;
|
|
33
44
|
private loadAvailableEnvVars;
|
|
34
45
|
private checkForMissingEnvVars;
|
|
35
46
|
/**
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as plugins from './qenv.plugins.js';
|
|
2
|
+
import { QenvInvalidQenvFileError, } from './qenv.classes.invalidqenvfileerror.js';
|
|
3
|
+
import { QenvMissingQenvFileError } from './qenv.classes.missingqenvfileerror.js';
|
|
2
4
|
import { QenvMissingRequiredEnvVarsError } from './qenv.classes.missingrequiredenvvarserror.js';
|
|
3
5
|
export class Qenv {
|
|
4
6
|
/**
|
|
@@ -6,8 +8,11 @@ export class Qenv {
|
|
|
6
8
|
* @param qenvFileBasePathArg directory that holds qenv.yml
|
|
7
9
|
* @param envFileBasePathArg directory that holds env.json, env.yml or env.yaml
|
|
8
10
|
* @param failOnMissing throws a QenvMissingRequiredEnvVarsError when a variable listed under
|
|
9
|
-
* `required:` in qenv.yml is not provided by any source
|
|
10
|
-
*
|
|
11
|
+
* `required:` in qenv.yml is not provided by any source, a QenvMissingQenvFileError when there
|
|
12
|
+
* is no qenv.yml to read that list from, and a QenvInvalidQenvFileError when the list cannot be
|
|
13
|
+
* read as names. Pass false to only record the names in `missingEnvVars` and continue.
|
|
14
|
+
* @throws QenvMissingQenvFileError
|
|
15
|
+
* @throws QenvInvalidQenvFileError
|
|
11
16
|
* @throws QenvMissingRequiredEnvVarsError
|
|
12
17
|
*/
|
|
13
18
|
constructor(qenvFileBasePathArg = process.cwd(), envFileBasePathArg, failOnMissing = true) {
|
|
@@ -22,7 +27,7 @@ export class Qenv {
|
|
|
22
27
|
this.logger = new plugins.smartlog.ConsoleLog();
|
|
23
28
|
this.qenvFilePathAbsolute = '';
|
|
24
29
|
this.initializeFilePaths(qenvFileBasePathArg, envFileBasePathArg);
|
|
25
|
-
this.loadRequiredEnvVars();
|
|
30
|
+
this.loadRequiredEnvVars(failOnMissing);
|
|
26
31
|
this.loadAvailableEnvVars();
|
|
27
32
|
this.checkForMissingEnvVars(failOnMissing);
|
|
28
33
|
}
|
|
@@ -51,19 +56,59 @@ export class Qenv {
|
|
|
51
56
|
}
|
|
52
57
|
}
|
|
53
58
|
}
|
|
54
|
-
loadRequiredEnvVars() {
|
|
59
|
+
loadRequiredEnvVars(failOnMissing) {
|
|
55
60
|
if (!this.fileExists(this.qenvFilePathAbsolute)) {
|
|
61
|
+
if (failOnMissing) {
|
|
62
|
+
// enforcing without the file that declares what to enforce would pass every check by
|
|
63
|
+
// accident: a deployable that forgot to ship qenv.yml must be refused by name, not
|
|
64
|
+
// silently exempted
|
|
65
|
+
throw new QenvMissingQenvFileError({
|
|
66
|
+
qenvFilePathAbsolute: this.qenvFilePathAbsolute,
|
|
67
|
+
qenvDir: plugins.path.dirname(this.qenvFilePathAbsolute),
|
|
68
|
+
});
|
|
69
|
+
}
|
|
56
70
|
return;
|
|
57
71
|
}
|
|
58
72
|
const qenvFile = this.readObjectFromFile(this.qenvFilePathAbsolute);
|
|
59
73
|
const declaredRequirements = qenvFile['required'];
|
|
74
|
+
if (declaredRequirements === undefined || declaredRequirements === null) {
|
|
75
|
+
// a qenv.yml that lists no requirement legitimately requires nothing
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
60
78
|
if (!Array.isArray(declaredRequirements)) {
|
|
61
|
-
this.
|
|
79
|
+
this.refuseInvalidQenvFile(failOnMissing, 'requiredNotAnArray', declaredRequirements);
|
|
62
80
|
return;
|
|
63
81
|
}
|
|
64
82
|
const declaredEntries = declaredRequirements;
|
|
83
|
+
const invalidEntryIndex = declaredEntries.findIndex((entry) => typeof entry !== 'string');
|
|
84
|
+
if (invalidEntryIndex !== -1) {
|
|
85
|
+
this.refuseInvalidQenvFile(failOnMissing, 'requiredEntryNotAString', declaredEntries[invalidEntryIndex]);
|
|
86
|
+
}
|
|
65
87
|
this.requiredEnvVars.push(...declaredEntries.filter((entry) => typeof entry === 'string'));
|
|
66
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Refuses a qenv.yml whose `required:` cannot be read as names: it enforces nothing, which is
|
|
91
|
+
* the fail-open a missing qenv.yml would be. A caller that opted out of failing keeps running,
|
|
92
|
+
* but hears the same named reason instead of losing the requirement silently.
|
|
93
|
+
*/
|
|
94
|
+
refuseInvalidQenvFile(failOnMissing, reason, invalidValue) {
|
|
95
|
+
const invalidQenvFileError = new QenvInvalidQenvFileError({
|
|
96
|
+
qenvFilePathAbsolute: this.qenvFilePathAbsolute,
|
|
97
|
+
reason,
|
|
98
|
+
invalidValueTypeName: this.describeValueType(invalidValue),
|
|
99
|
+
});
|
|
100
|
+
if (failOnMissing) {
|
|
101
|
+
throw invalidQenvFileError;
|
|
102
|
+
}
|
|
103
|
+
this.logger.log('warn', invalidQenvFileError.message);
|
|
104
|
+
}
|
|
105
|
+
/** names the type of a value without rendering it: a value in a name's place may be a secret */
|
|
106
|
+
describeValueType(valueArg) {
|
|
107
|
+
if (valueArg === null) {
|
|
108
|
+
return 'null';
|
|
109
|
+
}
|
|
110
|
+
return Array.isArray(valueArg) ? 'array' : typeof valueArg;
|
|
111
|
+
}
|
|
67
112
|
loadAvailableEnvVars() {
|
|
68
113
|
// resolved synchronously: a required env var is always a name, and every source a name can come
|
|
69
114
|
// from - process environment, env file, Docker secrets - is a synchronous read. Resolving it
|
|
@@ -276,4 +321,4 @@ export class Qenv {
|
|
|
276
321
|
: {};
|
|
277
322
|
}
|
|
278
323
|
}
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"qenv.classes.qenv.js","sourceRoot":"","sources":["../ts/qenv.classes.qenv.ts"],"names":[],"mappings":"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"}
|
|
324
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"qenv.classes.qenv.js","sourceRoot":"","sources":["../ts/qenv.classes.qenv.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -67,6 +67,24 @@ Every listed name is resolved while the `Qenv` instance is constructed. What is
|
|
|
67
67
|
`availableEnvVars` and, as a string, in `keyValueObject`; what is missing lands in `missingEnvVars`
|
|
68
68
|
and, unless you pass `failOnMissing: false`, makes the constructor throw.
|
|
69
69
|
|
|
70
|
+
With `failOnMissing` left at its default `true`, the `qenv.yml` itself is part of what is enforced:
|
|
71
|
+
if there is none at the given path, the constructor throws `QenvMissingQenvFileError` and names the
|
|
72
|
+
path it looked at. Without the file there is no `required:` list, so every check would pass by
|
|
73
|
+
accident - a container image that forgot to ship its `qenv.yml` would look healthy while enforcing
|
|
74
|
+
nothing. **Ship `qenv.yml` with your deployable**, next to the code that reads it. A `qenv.yml`
|
|
75
|
+
whose `required:` cannot be read as a list of names - a scalar instead of a list, or an entry that
|
|
76
|
+
is not a name - is refused the same way, with `QenvInvalidQenvFileError`.
|
|
77
|
+
|
|
78
|
+
A `qenv.yml` that requires nothing is legitimate and constructs: write `required: []`, or leave the
|
|
79
|
+
`required:` key out altogether. Only the file's absence and an unreadable list are refused.
|
|
80
|
+
|
|
81
|
+
The CLI or library case that reads from wherever it happens to run passes `failOnMissing: false`:
|
|
82
|
+
|
|
83
|
+
```typescript
|
|
84
|
+
// no qenv.yml expected here - resolve what is there, enforce nothing
|
|
85
|
+
const qenv = new Qenv(process.cwd(), undefined, false);
|
|
86
|
+
```
|
|
87
|
+
|
|
70
88
|
#### 2. Provide Values (`env.yml` or `env.json`)
|
|
71
89
|
|
|
72
90
|
For local development, create an `env.yml` or `env.json` file:
|
|
@@ -363,8 +381,11 @@ new Qenv(
|
|
|
363
381
|
)
|
|
364
382
|
```
|
|
365
383
|
|
|
366
|
-
|
|
367
|
-
`
|
|
384
|
+
With `failOnMissing` true the constructor throws `QenvMissingQenvFileError` when there is no
|
|
385
|
+
`qenv.yml` at `qenvFileBasePathArg`, `QenvInvalidQenvFileError` when its `required:` cannot be read
|
|
386
|
+
as a list of names, and `QenvMissingRequiredEnvVarsError` when a name listed under `required:` is
|
|
387
|
+
not provided by any source. With `failOnMissing` false the constructor never throws: a missing
|
|
388
|
+
`qenv.yml` is accepted and an unreadable `required:` is logged as a warning.
|
|
368
389
|
|
|
369
390
|
#### Methods
|
|
370
391
|
|
|
@@ -397,6 +418,29 @@ Thrown by the constructor when `failOnMissing` is true and a required variable h
|
|
|
397
418
|
| `requiredEnvVars` | `string[]` | Every name listed under `required:` |
|
|
398
419
|
| `qenvFilePathAbsolute` | `string` | The qenv.yml that declared them |
|
|
399
420
|
|
|
421
|
+
### Class: `QenvMissingQenvFileError`
|
|
422
|
+
|
|
423
|
+
Thrown by the constructor when `failOnMissing` is true and there is no `qenv.yml` to read the
|
|
424
|
+
`required:` list from.
|
|
425
|
+
|
|
426
|
+
| Member | Type | Description |
|
|
427
|
+
|--------|------|-------------|
|
|
428
|
+
| `code` | `'QENV_MISSING_QENV_FILE'` | Stable identifier, safe across duplicate installs |
|
|
429
|
+
| `qenvFilePathAbsolute` | `string` | The qenv.yml path that was looked at |
|
|
430
|
+
| `qenvDir` | `string` | The resolved directory that should hold it |
|
|
431
|
+
|
|
432
|
+
### Class: `QenvInvalidQenvFileError`
|
|
433
|
+
|
|
434
|
+
Thrown by the constructor when `failOnMissing` is true and `required:` is not a list of names;
|
|
435
|
+
logged as a warning with the same message when `failOnMissing` is false.
|
|
436
|
+
|
|
437
|
+
| Member | Type | Description |
|
|
438
|
+
|--------|------|-------------|
|
|
439
|
+
| `code` | `'QENV_INVALID_QENV_FILE'` | Stable identifier, safe across duplicate installs |
|
|
440
|
+
| `reason` | `'requiredNotAnArray' \| 'requiredEntryNotAString'` | Which rule the file broke |
|
|
441
|
+
| `invalidValueTypeName` | `string` | The type of the offending value, never the value itself |
|
|
442
|
+
| `qenvFilePathAbsolute` | `string` | The qenv.yml that declared it |
|
|
443
|
+
|
|
400
444
|
## Issue Reporting and Security
|
|
401
445
|
|
|
402
446
|
For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/index.ts
CHANGED
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/** which rule of the `required:` list a qenv.yml broke */
|
|
2
|
+
export type TQenvInvalidQenvFileReason = 'requiredNotAnArray' | 'requiredEntryNotAString';
|
|
3
|
+
|
|
4
|
+
export interface IQenvInvalidQenvFileErrorOptions {
|
|
5
|
+
qenvFilePathAbsolute: string;
|
|
6
|
+
reason: TQenvInvalidQenvFileReason;
|
|
7
|
+
/** the type name of the offending value, never the value itself */
|
|
8
|
+
invalidValueTypeName: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const reasonDescriptions: Record<TQenvInvalidQenvFileReason, (typeNameArg: string) => string> = {
|
|
12
|
+
requiredNotAnArray: (typeNameArg) =>
|
|
13
|
+
`"required:" is of type ${typeNameArg} instead of a list of environment variable names`,
|
|
14
|
+
requiredEntryNotAString: (typeNameArg) =>
|
|
15
|
+
`"required:" contains an entry of type ${typeNameArg} instead of an environment variable name`,
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Thrown when qenv.yml declares a `required:` that qenv cannot read as a list of names. Such a
|
|
20
|
+
* declaration silently enforced nothing, which is the same fail-open as a missing qenv.yml.
|
|
21
|
+
* A file without any `required:` key, and one with an empty list, legitimately require nothing
|
|
22
|
+
* and never reach this error.
|
|
23
|
+
*/
|
|
24
|
+
export class QenvInvalidQenvFileError extends Error {
|
|
25
|
+
public readonly code = 'QENV_INVALID_QENV_FILE';
|
|
26
|
+
public readonly qenvFilePathAbsolute: string;
|
|
27
|
+
public readonly reason: TQenvInvalidQenvFileReason;
|
|
28
|
+
public readonly invalidValueTypeName: string;
|
|
29
|
+
|
|
30
|
+
constructor(optionsArg: IQenvInvalidQenvFileErrorOptions) {
|
|
31
|
+
super(
|
|
32
|
+
`The qenv.yml at ${optionsArg.qenvFilePathAbsolute} declares an unreadable requirement: ` +
|
|
33
|
+
`${reasonDescriptions[optionsArg.reason](optionsArg.invalidValueTypeName)}. ` +
|
|
34
|
+
`Write "required:" as a list of environment variable names, or omit it to require nothing.`
|
|
35
|
+
);
|
|
36
|
+
this.name = 'QenvInvalidQenvFileError';
|
|
37
|
+
this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
|
|
38
|
+
this.reason = optionsArg.reason;
|
|
39
|
+
// only the type is carried and rendered: a malformed qenv.yml can hold a value where a name
|
|
40
|
+
// belongs, and a value may be a secret
|
|
41
|
+
this.invalidValueTypeName = optionsArg.invalidValueTypeName;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export interface IQenvMissingQenvFileErrorOptions {
|
|
2
|
+
qenvFilePathAbsolute: string;
|
|
3
|
+
qenvDir: string;
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Thrown when a Qenv that is set to fail on missing variables finds no qenv.yml at all.
|
|
8
|
+
* Without the file there is no `required:` list to enforce, so every check would pass by
|
|
9
|
+
* accident - a deployable that forgot to ship its qenv.yml would look healthy. `code` identifies
|
|
10
|
+
* the refusal even when two copies of qenv end up in one tree, which makes `instanceof` unreliable.
|
|
11
|
+
*/
|
|
12
|
+
export class QenvMissingQenvFileError extends Error {
|
|
13
|
+
public readonly code = 'QENV_MISSING_QENV_FILE';
|
|
14
|
+
public readonly qenvFilePathAbsolute: string;
|
|
15
|
+
public readonly qenvDir: string;
|
|
16
|
+
|
|
17
|
+
constructor(optionsArg: IQenvMissingQenvFileErrorOptions) {
|
|
18
|
+
super(
|
|
19
|
+
`qenv found no qenv.yml at ${optionsArg.qenvFilePathAbsolute}. It was constructed to fail ` +
|
|
20
|
+
`on missing required environment variables, and without qenv.yml there is no "required:" ` +
|
|
21
|
+
`list to enforce, so nothing would be checked. Ship qenv.yml with your deployable, or ` +
|
|
22
|
+
`construct Qenv with failOnMissing set to false.`
|
|
23
|
+
);
|
|
24
|
+
this.name = 'QenvMissingQenvFileError';
|
|
25
|
+
this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
|
|
26
|
+
this.qenvDir = optionsArg.qenvDir;
|
|
27
|
+
}
|
|
28
|
+
}
|
package/ts/qenv.classes.qenv.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import * as plugins from './qenv.plugins.js';
|
|
2
|
+
import {
|
|
3
|
+
QenvInvalidQenvFileError,
|
|
4
|
+
type TQenvInvalidQenvFileReason,
|
|
5
|
+
} from './qenv.classes.invalidqenvfileerror.js';
|
|
6
|
+
import { QenvMissingQenvFileError } from './qenv.classes.missingqenvfileerror.js';
|
|
2
7
|
import { QenvMissingRequiredEnvVarsError } from './qenv.classes.missingrequiredenvvarserror.js';
|
|
3
8
|
|
|
4
9
|
/**
|
|
@@ -36,8 +41,11 @@ export class Qenv {
|
|
|
36
41
|
* @param qenvFileBasePathArg directory that holds qenv.yml
|
|
37
42
|
* @param envFileBasePathArg directory that holds env.json, env.yml or env.yaml
|
|
38
43
|
* @param failOnMissing throws a QenvMissingRequiredEnvVarsError when a variable listed under
|
|
39
|
-
* `required:` in qenv.yml is not provided by any source
|
|
40
|
-
*
|
|
44
|
+
* `required:` in qenv.yml is not provided by any source, a QenvMissingQenvFileError when there
|
|
45
|
+
* is no qenv.yml to read that list from, and a QenvInvalidQenvFileError when the list cannot be
|
|
46
|
+
* read as names. Pass false to only record the names in `missingEnvVars` and continue.
|
|
47
|
+
* @throws QenvMissingQenvFileError
|
|
48
|
+
* @throws QenvInvalidQenvFileError
|
|
41
49
|
* @throws QenvMissingRequiredEnvVarsError
|
|
42
50
|
*/
|
|
43
51
|
constructor(
|
|
@@ -46,7 +54,7 @@ export class Qenv {
|
|
|
46
54
|
failOnMissing: boolean = true
|
|
47
55
|
) {
|
|
48
56
|
this.initializeFilePaths(qenvFileBasePathArg, envFileBasePathArg);
|
|
49
|
-
this.loadRequiredEnvVars();
|
|
57
|
+
this.loadRequiredEnvVars(failOnMissing);
|
|
50
58
|
this.loadAvailableEnvVars();
|
|
51
59
|
this.checkForMissingEnvVars(failOnMissing);
|
|
52
60
|
}
|
|
@@ -81,22 +89,72 @@ export class Qenv {
|
|
|
81
89
|
}
|
|
82
90
|
}
|
|
83
91
|
|
|
84
|
-
private loadRequiredEnvVars() {
|
|
92
|
+
private loadRequiredEnvVars(failOnMissing: boolean) {
|
|
85
93
|
if (!this.fileExists(this.qenvFilePathAbsolute)) {
|
|
94
|
+
if (failOnMissing) {
|
|
95
|
+
// enforcing without the file that declares what to enforce would pass every check by
|
|
96
|
+
// accident: a deployable that forgot to ship qenv.yml must be refused by name, not
|
|
97
|
+
// silently exempted
|
|
98
|
+
throw new QenvMissingQenvFileError({
|
|
99
|
+
qenvFilePathAbsolute: this.qenvFilePathAbsolute,
|
|
100
|
+
qenvDir: plugins.path.dirname(this.qenvFilePathAbsolute),
|
|
101
|
+
});
|
|
102
|
+
}
|
|
86
103
|
return;
|
|
87
104
|
}
|
|
88
105
|
const qenvFile = this.readObjectFromFile(this.qenvFilePathAbsolute);
|
|
89
106
|
const declaredRequirements = qenvFile['required'];
|
|
107
|
+
if (declaredRequirements === undefined || declaredRequirements === null) {
|
|
108
|
+
// a qenv.yml that lists no requirement legitimately requires nothing
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
90
111
|
if (!Array.isArray(declaredRequirements)) {
|
|
91
|
-
this.
|
|
112
|
+
this.refuseInvalidQenvFile(failOnMissing, 'requiredNotAnArray', declaredRequirements);
|
|
92
113
|
return;
|
|
93
114
|
}
|
|
94
115
|
const declaredEntries: unknown[] = declaredRequirements;
|
|
116
|
+
const invalidEntryIndex = declaredEntries.findIndex((entry) => typeof entry !== 'string');
|
|
117
|
+
if (invalidEntryIndex !== -1) {
|
|
118
|
+
this.refuseInvalidQenvFile(
|
|
119
|
+
failOnMissing,
|
|
120
|
+
'requiredEntryNotAString',
|
|
121
|
+
declaredEntries[invalidEntryIndex]
|
|
122
|
+
);
|
|
123
|
+
}
|
|
95
124
|
this.requiredEnvVars.push(
|
|
96
125
|
...declaredEntries.filter((entry): entry is string => typeof entry === 'string')
|
|
97
126
|
);
|
|
98
127
|
}
|
|
99
128
|
|
|
129
|
+
/**
|
|
130
|
+
* Refuses a qenv.yml whose `required:` cannot be read as names: it enforces nothing, which is
|
|
131
|
+
* the fail-open a missing qenv.yml would be. A caller that opted out of failing keeps running,
|
|
132
|
+
* but hears the same named reason instead of losing the requirement silently.
|
|
133
|
+
*/
|
|
134
|
+
private refuseInvalidQenvFile(
|
|
135
|
+
failOnMissing: boolean,
|
|
136
|
+
reason: TQenvInvalidQenvFileReason,
|
|
137
|
+
invalidValue: unknown
|
|
138
|
+
) {
|
|
139
|
+
const invalidQenvFileError = new QenvInvalidQenvFileError({
|
|
140
|
+
qenvFilePathAbsolute: this.qenvFilePathAbsolute,
|
|
141
|
+
reason,
|
|
142
|
+
invalidValueTypeName: this.describeValueType(invalidValue),
|
|
143
|
+
});
|
|
144
|
+
if (failOnMissing) {
|
|
145
|
+
throw invalidQenvFileError;
|
|
146
|
+
}
|
|
147
|
+
this.logger.log('warn', invalidQenvFileError.message);
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/** names the type of a value without rendering it: a value in a name's place may be a secret */
|
|
151
|
+
private describeValueType(valueArg: unknown): string {
|
|
152
|
+
if (valueArg === null) {
|
|
153
|
+
return 'null';
|
|
154
|
+
}
|
|
155
|
+
return Array.isArray(valueArg) ? 'array' : typeof valueArg;
|
|
156
|
+
}
|
|
157
|
+
|
|
100
158
|
private loadAvailableEnvVars() {
|
|
101
159
|
// resolved synchronously: a required env var is always a name, and every source a name can come
|
|
102
160
|
// from - process environment, env file, Docker secrets - is a synchronous read. Resolving it
|