terafoundation 0.56.0 → 0.57.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/src/interfaces.d.ts +3 -0
- package/dist/src/interfaces.d.ts.map +1 -1
- package/dist/src/schema.d.ts +3 -27
- package/dist/src/schema.d.ts.map +1 -1
- package/dist/src/schema.js +116 -58
- package/dist/src/schema.js.map +1 -1
- package/dist/src/validate-configs.js +2 -2
- package/dist/src/validate-configs.js.map +1 -1
- package/package.json +4 -4
package/dist/src/interfaces.d.ts
CHANGED
|
@@ -82,6 +82,9 @@ export type FoundationSysConfig<S> = {
|
|
|
82
82
|
log_path: string;
|
|
83
83
|
log_level: LogLevelConfig;
|
|
84
84
|
logging: LogType[];
|
|
85
|
+
asset_storage_connection_type?: string;
|
|
86
|
+
asset_storage_connection?: string;
|
|
87
|
+
asset_storage_bucket?: string;
|
|
85
88
|
};
|
|
86
89
|
} & S;
|
|
87
90
|
export type FoundationContext<S = Record<string, any>, A = Record<string, any>, D extends string = string> = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"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"}
|
package/dist/src/schema.d.ts
CHANGED
|
@@ -1,28 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
default: string;
|
|
5
|
-
env: string;
|
|
6
|
-
};
|
|
7
|
-
log_path: {
|
|
8
|
-
doc: string;
|
|
9
|
-
default: string;
|
|
10
|
-
format: StringConstructor;
|
|
11
|
-
};
|
|
12
|
-
logging: {
|
|
13
|
-
doc: string;
|
|
14
|
-
default: string[];
|
|
15
|
-
format(config: unknown): void;
|
|
16
|
-
};
|
|
17
|
-
log_level: {
|
|
18
|
-
doc: string;
|
|
19
|
-
default: string;
|
|
20
|
-
format(val: unknown): void;
|
|
21
|
-
};
|
|
22
|
-
workers: {
|
|
23
|
-
doc: string;
|
|
24
|
-
default: number;
|
|
25
|
-
};
|
|
26
|
-
};
|
|
27
|
-
export = _default;
|
|
1
|
+
import convict from 'convict';
|
|
2
|
+
import { SysConfig } from 'packages/types/dist/src/terafoundation';
|
|
3
|
+
export declare function foundationSchema(sysconfig: SysConfig<any>): convict.Schema<any>;
|
|
28
4
|
//# sourceMappingURL=schema.d.ts.map
|
package/dist/src/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAKnE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAuH/E"}
|
package/dist/src/schema.js
CHANGED
|
@@ -1,70 +1,128 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.foundationSchema = void 0;
|
|
2
4
|
const os_1 = require("os");
|
|
3
5
|
const workerCount = (0, os_1.cpus)().length;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
6
|
+
const DEFAULT_ASSET_STORAGE_CONNECTION_TYPE = 'elasticsearch-next';
|
|
7
|
+
function foundationSchema(sysconfig) {
|
|
8
|
+
const schema = {
|
|
9
|
+
environment: {
|
|
10
|
+
doc: 'If set to `production`, console logging will be disabled and logs will be sent to a file',
|
|
11
|
+
default: 'development',
|
|
12
|
+
env: 'NODE_ENV'
|
|
13
|
+
},
|
|
14
|
+
log_path: {
|
|
15
|
+
doc: 'Directory where the logs will be stored if logging is set to `file`',
|
|
16
|
+
default: process.cwd(),
|
|
17
|
+
format: String
|
|
18
|
+
},
|
|
19
|
+
logging: {
|
|
20
|
+
doc: 'Logging destinations. Expects an array of logging targets',
|
|
21
|
+
default: ['console'],
|
|
22
|
+
format(config) {
|
|
23
|
+
const values = { console: true, file: true };
|
|
24
|
+
if (!Array.isArray(config)) {
|
|
25
|
+
throw new Error('value for logging set in terafoundation must be an array');
|
|
26
|
+
}
|
|
27
|
+
config.forEach((type) => {
|
|
28
|
+
if (!values[type]) {
|
|
29
|
+
throw new Error(`value: ${type} is not a valid configuration for logging`);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
22
32
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
33
|
+
},
|
|
34
|
+
log_level: {
|
|
35
|
+
doc: 'Default logging levels',
|
|
36
|
+
default: 'info',
|
|
37
|
+
format(val) {
|
|
38
|
+
const check = {
|
|
39
|
+
trace: true, debug: true, info: true, warn: true, error: true, fatal: true
|
|
40
|
+
};
|
|
41
|
+
if (typeof val === 'string') {
|
|
42
|
+
if (!check[val]) {
|
|
43
|
+
throw new Error(`string configuration parameter for log_level is not an accepted value: ${val}`);
|
|
44
|
+
}
|
|
26
45
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
46
|
+
else if (Array.isArray(val)) {
|
|
47
|
+
// expect data formatted like this => [{console: 'warn'}, {file: 'info'}]
|
|
48
|
+
const options = { console: true, file: true };
|
|
49
|
+
const incorrectKeys = val.reduce((prev, curr) => {
|
|
50
|
+
Object.keys(curr).forEach((key) => {
|
|
51
|
+
if (!options[key]) {
|
|
52
|
+
prev.push(curr);
|
|
53
|
+
}
|
|
54
|
+
if (!check[curr[key]]) {
|
|
55
|
+
prev.push(curr);
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
return prev;
|
|
59
|
+
}, []);
|
|
60
|
+
if (incorrectKeys.length > 0) {
|
|
61
|
+
throw new Error('array configuration parameter for log_level are not configured correctly');
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
throw new Error('configuration parameter for log_level can either be a string or an array, please check the documentation');
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
workers: {
|
|
70
|
+
doc: 'Number of workers per server',
|
|
71
|
+
default: workerCount
|
|
72
|
+
},
|
|
73
|
+
asset_storage_connection_type: {
|
|
74
|
+
doc: 'Name of the connection type used to store assets',
|
|
75
|
+
default: DEFAULT_ASSET_STORAGE_CONNECTION_TYPE,
|
|
76
|
+
format(connectionTypeName) {
|
|
77
|
+
const validConnectionTypes = ['elasticsearch-next', 'elasticsearch', 's3'];
|
|
78
|
+
const connectionTypesPresent = Object.keys(sysconfig.terafoundation.connectors);
|
|
79
|
+
if (!connectionTypesPresent.includes(connectionTypeName)) {
|
|
80
|
+
throw new Error('asset_storage_connection_type not found in terafoundation.connectors');
|
|
81
|
+
}
|
|
82
|
+
if (!validConnectionTypes.includes(connectionTypeName)) {
|
|
83
|
+
throw new Error(`Invalid asset_storage_connection_type. Valid types: ${validConnectionTypes.toString()}`);
|
|
40
84
|
}
|
|
41
85
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
throw new Error('array configuration parameter for log_level are not configured correctly');
|
|
86
|
+
},
|
|
87
|
+
asset_storage_connection: {
|
|
88
|
+
doc: 'Name of the connection used to store assets.',
|
|
89
|
+
default: 'default',
|
|
90
|
+
format(connectionName) {
|
|
91
|
+
let connectionType;
|
|
92
|
+
if (sysconfig.terafoundation.asset_storage_connection_type) {
|
|
93
|
+
connectionType = sysconfig.terafoundation.asset_storage_connection_type;
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
connectionType = DEFAULT_ASSET_STORAGE_CONNECTION_TYPE;
|
|
97
|
+
}
|
|
98
|
+
const connectionsPresent = Object.keys(sysconfig.terafoundation.connectors[`${connectionType}`]);
|
|
99
|
+
if (!connectionsPresent.includes(connectionName)) {
|
|
100
|
+
throw new Error(`${connectionName} not found in terafoundation.connectors.${connectionType}`);
|
|
58
101
|
}
|
|
59
102
|
}
|
|
60
|
-
|
|
61
|
-
|
|
103
|
+
},
|
|
104
|
+
asset_storage_bucket: {
|
|
105
|
+
doc: 'Name of S3 bucket used to store assets. Can only be used if "asset_storage_connection_type" is "s3".',
|
|
106
|
+
default: undefined,
|
|
107
|
+
format(bucketName) {
|
|
108
|
+
let connectionType;
|
|
109
|
+
if (sysconfig.terafoundation.asset_storage_connection_type) {
|
|
110
|
+
connectionType = sysconfig.terafoundation.asset_storage_connection_type;
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
connectionType = DEFAULT_ASSET_STORAGE_CONNECTION_TYPE;
|
|
114
|
+
}
|
|
115
|
+
if (typeof bucketName !== 'string') {
|
|
116
|
+
throw new Error('asset_storage_bucket must be a string');
|
|
117
|
+
}
|
|
118
|
+
if (connectionType !== 's3') {
|
|
119
|
+
throw new Error('asset_storage_bucket can only be used if asset_storage_connection_type is set to "s3"');
|
|
120
|
+
}
|
|
121
|
+
// TODO: add regex to check if valid bucket name
|
|
62
122
|
}
|
|
63
123
|
}
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
};
|
|
124
|
+
};
|
|
125
|
+
return schema;
|
|
126
|
+
}
|
|
127
|
+
exports.foundationSchema = foundationSchema;
|
|
70
128
|
//# sourceMappingURL=schema.js.map
|
package/dist/src/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ const convict_format_with_validator_1 = __importDefault(require("convict-format-
|
|
|
34
34
|
// @ts-expect-error no types
|
|
35
35
|
const convict_format_with_moment_1 = __importDefault(require("convict-format-with-moment"));
|
|
36
36
|
const connector_utils_1 = require("./connector-utils");
|
|
37
|
-
const schema_1 =
|
|
37
|
+
const schema_1 = require("./schema");
|
|
38
38
|
(0, convict_1.addFormats)(convict_format_with_validator_1.default);
|
|
39
39
|
(0, convict_1.addFormats)(convict_format_with_moment_1.default);
|
|
40
40
|
function validateConfig(cluster, schema, namespaceConfig) {
|
|
@@ -78,7 +78,7 @@ function validateConfigs(cluster, config, sysconfig) {
|
|
|
78
78
|
throw new Error('Terafoundation requires a valid system configuration');
|
|
79
79
|
}
|
|
80
80
|
const schema = extractSchema(config.config_schema, sysconfig);
|
|
81
|
-
schema.terafoundation = schema_1.
|
|
81
|
+
schema.terafoundation = (0, schema_1.foundationSchema)(sysconfig);
|
|
82
82
|
const result = {};
|
|
83
83
|
if (config.schema_formats) {
|
|
84
84
|
config.schema_formats.forEach((format) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-configs.js","sourceRoot":"","sources":["../../src/validate-configs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,mDAA8C;AAC9C,4CAG0B;AAC1B,4BAA4B;AAC5B,kGAA0E;AAC1E,4BAA4B;AAC5B,4FAAoE;AACpE,uDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"validate-configs.js","sourceRoot":"","sources":["../../src/validate-configs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "terafoundation",
|
|
3
3
|
"displayName": "Terafoundation",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.57.0",
|
|
5
5
|
"description": "A Clustering and Foundation tool for Terascope Tools",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/terafoundation#readme",
|
|
7
7
|
"bugs": {
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"test:watch": "ts-scripts test --watch . --"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@terascope/file-asset-apis": "^0.
|
|
31
|
-
"@terascope/utils": "^0.
|
|
30
|
+
"@terascope/file-asset-apis": "^0.12.0",
|
|
31
|
+
"@terascope/utils": "^0.56.0",
|
|
32
32
|
"aws-sdk": "^2.1401.0",
|
|
33
33
|
"bluebird": "^3.7.2",
|
|
34
34
|
"bunyan": "^1.8.15",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"convict-format-with-moment": "^6.2.0",
|
|
37
37
|
"convict-format-with-validator": "^6.2.0",
|
|
38
38
|
"elasticsearch": "^15.4.1",
|
|
39
|
-
"elasticsearch-store": "^0.
|
|
39
|
+
"elasticsearch-store": "^0.79.0",
|
|
40
40
|
"js-yaml": "^4.1.0",
|
|
41
41
|
"mongoose": "~6.6.5",
|
|
42
42
|
"nanoid": "^3.3.4",
|