@terascope/job-components 2.14.2 → 2.16.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/config-validators.d.ts +13 -4
- package/dist/src/config-validators.d.ts.map +1 -1
- package/dist/src/config-validators.js +44 -3
- package/dist/src/config-validators.js.map +1 -1
- package/dist/src/job-schemas.d.ts.map +1 -1
- package/dist/src/job-schemas.js +2 -0
- package/dist/src/job-schemas.js.map +1 -1
- package/dist/src/job-validator.d.ts +4 -1
- package/dist/src/job-validator.d.ts.map +1 -1
- package/dist/src/job-validator.js +37 -4
- package/dist/src/job-validator.js.map +1 -1
- package/dist/src/operations/base-schema.d.ts +9 -3
- package/dist/src/operations/base-schema.d.ts.map +1 -1
- package/dist/src/operations/base-schema.js.map +1 -1
- package/dist/src/operations/core/schema-core.d.ts +5 -1
- package/dist/src/operations/core/schema-core.d.ts.map +1 -1
- package/dist/src/operations/core/schema-core.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,18 +1,27 @@
|
|
|
1
|
-
import { Terafoundation as TF } from '@terascope/types';
|
|
1
|
+
import { Teraslice, Terafoundation as TF } from '@terascope/types';
|
|
2
2
|
import { ValidatedJobConfig, OpConfig, APIConfig } from './interfaces/index.js';
|
|
3
3
|
/**
|
|
4
4
|
* Merges the provided inputSchema with commonSchema and then validates the
|
|
5
5
|
* provided opConfig against the resulting schema.
|
|
6
6
|
*/
|
|
7
|
-
export declare function validateOpConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context):
|
|
7
|
+
export declare function validateOpConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context): {
|
|
8
|
+
config: OpConfig & T;
|
|
9
|
+
warnings: Teraslice.JobWarning[];
|
|
10
|
+
};
|
|
8
11
|
/**
|
|
9
12
|
* Merges the provided inputSchema with commonSchema and then validates the
|
|
10
13
|
* provided apiConfig against the resulting schema.
|
|
11
14
|
*/
|
|
12
|
-
export declare function validateAPIConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context):
|
|
15
|
+
export declare function validateAPIConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context): {
|
|
16
|
+
config: APIConfig & T;
|
|
17
|
+
warnings: Teraslice.JobWarning[];
|
|
18
|
+
};
|
|
13
19
|
/**
|
|
14
20
|
* Merges the provided inputSchema with commonSchema and then validates the
|
|
15
21
|
* provided jobConfig against the resulting schema.
|
|
16
22
|
*/
|
|
17
|
-
export declare function validateJobConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context):
|
|
23
|
+
export declare function validateJobConfig<T>(inputSchema: TF.Schema<any>, inputConfig: Record<string, any>, context: TF.Context): {
|
|
24
|
+
config: ValidatedJobConfig & T;
|
|
25
|
+
warnings: Teraslice.JobWarning[];
|
|
26
|
+
};
|
|
18
27
|
//# sourceMappingURL=config-validators.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-validators.d.ts","sourceRoot":"","sources":["../../src/config-validators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,EAAE,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-validators.d.ts","sourceRoot":"","sources":["../../src/config-validators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,cAAc,IAAI,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGhF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAC9B,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,GACnF;IAAE,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;CAAE,CA2B5D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAC/B,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,GACnF;IAAE,MAAM,EAAE,SAAS,GAAG,CAAC,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;CAAE,CA6B7D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAC/B,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,GACnF;IAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;CAAE,CAsCtE"}
|
|
@@ -8,7 +8,21 @@ export function validateOpConfig(inputSchema, inputConfig, context) {
|
|
|
8
8
|
const schema = Object.assign({}, opSchema, inputSchema);
|
|
9
9
|
const validator = new SchemaValidator(schema, inputConfig._op, undefined, undefined, context);
|
|
10
10
|
try {
|
|
11
|
-
|
|
11
|
+
const config = validator.validate(inputConfig);
|
|
12
|
+
const warnings = validator.deprecationWarnings
|
|
13
|
+
.map((schemaWarning) => ({
|
|
14
|
+
type: 'JobValidation',
|
|
15
|
+
reason: {
|
|
16
|
+
type: 'assetOperation',
|
|
17
|
+
kind: 'deprecation',
|
|
18
|
+
reason: {
|
|
19
|
+
_op: inputConfig._op,
|
|
20
|
+
field: schemaWarning.field,
|
|
21
|
+
description: schemaWarning.description,
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
}));
|
|
25
|
+
return { config, warnings };
|
|
12
26
|
}
|
|
13
27
|
catch (err) {
|
|
14
28
|
throw new Error(`Validation failed for operation config: ${inputConfig._op} - ${err.message}`);
|
|
@@ -22,7 +36,21 @@ export function validateAPIConfig(inputSchema, inputConfig, context) {
|
|
|
22
36
|
const schema = Object.assign({}, apiSchema, inputSchema);
|
|
23
37
|
const validator = new SchemaValidator(schema, inputConfig._name, undefined, undefined, context);
|
|
24
38
|
try {
|
|
25
|
-
|
|
39
|
+
const config = validator.validate(inputConfig);
|
|
40
|
+
const warnings = validator.deprecationWarnings
|
|
41
|
+
.map((schemaWarning) => ({
|
|
42
|
+
type: 'JobValidation',
|
|
43
|
+
reason: {
|
|
44
|
+
type: 'assetAPIProperty',
|
|
45
|
+
kind: 'deprecation',
|
|
46
|
+
reason: {
|
|
47
|
+
api_name: inputConfig._name,
|
|
48
|
+
field: schemaWarning.field,
|
|
49
|
+
description: schemaWarning.description,
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
}));
|
|
53
|
+
return { config, warnings };
|
|
26
54
|
}
|
|
27
55
|
catch (err) {
|
|
28
56
|
throw new Error(`Validation failed for api config: ${inputConfig._name} - ${err.message}`);
|
|
@@ -42,7 +70,20 @@ export function validateJobConfig(inputSchema, inputConfig, context) {
|
|
|
42
70
|
|| (jobProperties.memory && jobProperties.resources_requests_memory)) {
|
|
43
71
|
throw new Error(`cpu/memory can't be mixed with resource settings of the same type.`);
|
|
44
72
|
}
|
|
45
|
-
|
|
73
|
+
// collect warnings from job fields
|
|
74
|
+
const warnings = validator.deprecationWarnings
|
|
75
|
+
.map((schemaWarning) => ({
|
|
76
|
+
type: 'JobValidation',
|
|
77
|
+
reason: {
|
|
78
|
+
type: 'jobProperty',
|
|
79
|
+
kind: 'deprecation',
|
|
80
|
+
reason: {
|
|
81
|
+
field: schemaWarning.field,
|
|
82
|
+
description: schemaWarning.description,
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
}));
|
|
86
|
+
return { config: jobProperties, warnings };
|
|
46
87
|
}
|
|
47
88
|
catch (err) {
|
|
48
89
|
throw new Error(`Validation failed for job config: ${inputConfig.name} - ${err.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-validators.js","sourceRoot":"","sources":["../../src/config-validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEvD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC5B,WAA2B,EAAE,WAAgC,EAAE,OAAmB;IAElF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,CAA4B,CAAC;IACnF,MAAM,SAAS,GAAG,IAAI,eAAe,CACjC,MAAM,EACN,WAAW,CAAC,GAAG,EACf,SAAS,EACT,SAAS,EACT,OAAO,CAAC,CAAC;IACb,IAAI,CAAC;QACD,
|
|
1
|
+
{"version":3,"file":"config-validators.js","sourceRoot":"","sources":["../../src/config-validators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-schemas.d.ts","sourceRoot":"","sources":["../../src/job-schemas.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"job-schemas.d.ts","sourceRoot":"","sources":["../../src/job-schemas.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CA2XtE;AAED,eAAO,MAAM,aAAa,kBAAY,CAAC;AAEvC;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAwB/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAkChD,CAAC"}
|
package/dist/src/job-schemas.js
CHANGED
|
@@ -213,6 +213,7 @@ export function jobSchema(context) {
|
|
|
213
213
|
doc: 'DEPRECATED: number of cpus to reserve per teraslice worker in kubernetes',
|
|
214
214
|
default: undefined,
|
|
215
215
|
format: 'Number',
|
|
216
|
+
deprecated: '"cpu" on a job is deprecated and should use "resources_requests_cpu" instead'
|
|
216
217
|
};
|
|
217
218
|
schemas.cpu_execution_controller = {
|
|
218
219
|
doc: 'number of cpus to reserve per teraslice execution controller in kubernetes',
|
|
@@ -275,6 +276,7 @@ export function jobSchema(context) {
|
|
|
275
276
|
doc: 'DEPRECATED: memory, in bytes, to reserve per teraslice worker in Kubernetes',
|
|
276
277
|
default: undefined,
|
|
277
278
|
format: 'Number',
|
|
279
|
+
deprecated: '"memory" on a job is deprecated and should use "resources_requests_memory" instead'
|
|
278
280
|
};
|
|
279
281
|
schemas.memory_execution_controller = {
|
|
280
282
|
doc: 'memory, in bytes, to reserve per teraslice execution controller in kubernetes',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-schemas.js","sourceRoot":"","sources":["../../src/job-schemas.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"job-schemas.js","sourceRoot":"","sources":["../../src/job-schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ export declare class JobValidator {
|
|
|
6
6
|
private readonly opLoader;
|
|
7
7
|
constructor(context: Context);
|
|
8
8
|
/** Validate the job configuration, including the Operations and APIs configuration */
|
|
9
|
-
validateConfig(jobSpec: Partial<Teraslice.JobConfig | Teraslice.JobConfigParams>): Promise<
|
|
9
|
+
validateConfig(jobSpec: Partial<Teraslice.JobConfig | Teraslice.JobConfigParams>): Promise<{
|
|
10
|
+
jobConfig: ValidatedJobConfig;
|
|
11
|
+
warnings: Teraslice.JobWarning[];
|
|
12
|
+
}>;
|
|
10
13
|
/**
|
|
11
14
|
* Loads the slicer for the given job to determine if it is relocatable,
|
|
12
15
|
* then sets that value as a property on the jobConfig so it is persisted
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-validator.d.ts","sourceRoot":"","sources":["../../src/job-validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAY,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUrE,qBAAa,YAAY;IACd,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAE/B,OAAO,EAAE,OAAO;IAS5B,sFAAsF;IAChF,cAAc,CAChB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC,GAClE,OAAO,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"job-validator.d.ts","sourceRoot":"","sources":["../../src/job-validator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAY,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAUrE,qBAAa,YAAY;IACd,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAE/B,OAAO,EAAE,OAAO;IAS5B,sFAAsF;IAChF,cAAc,CAChB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC,GAClE,OAAO,CAAC;QAAE,SAAS,EAAE,kBAAkB,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;KAAE,CAAC;IA+I/E;;;;;OAKG;YACW,iBAAiB;IAmB/B,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;CAO1D"}
|
|
@@ -18,11 +18,12 @@ export class JobValidator {
|
|
|
18
18
|
/** Validate the job configuration, including the Operations and APIs configuration */
|
|
19
19
|
async validateConfig(jobSpec) {
|
|
20
20
|
// top level job validation occurs, but not operations
|
|
21
|
-
const jobConfig = validateJobConfig(this.schema, cloneDeep(jobSpec), this.context);
|
|
21
|
+
const { config: jobConfig, warnings: jobWarnings } = validateJobConfig(this.schema, cloneDeep(jobSpec), this.context);
|
|
22
22
|
const assetIds = jobConfig.assets || [];
|
|
23
23
|
const apis = {};
|
|
24
24
|
const validateJobFns = [];
|
|
25
25
|
const validateApisFns = [];
|
|
26
|
+
const allWarnings = [...jobWarnings];
|
|
26
27
|
const opAPIMapping = new Map();
|
|
27
28
|
const handleModule = (opConfig, op, index) => {
|
|
28
29
|
const { Schema: OpSchema, API } = op;
|
|
@@ -41,7 +42,13 @@ export class JobValidator {
|
|
|
41
42
|
// revert name back to original
|
|
42
43
|
job.operations[index]._op = originalName;
|
|
43
44
|
});
|
|
44
|
-
const
|
|
45
|
+
const opResult = schema.validate(opConfig);
|
|
46
|
+
// TODO: v3 schemas may return the config directly instead of
|
|
47
|
+
// { config, warnings }. Support for the old shape will be dropped in Teraslice v4.
|
|
48
|
+
// See https://github.com/terascope/teraslice/issues/4501
|
|
49
|
+
const validatedConfig = isValidateResult(opResult) ? opResult.config : opResult;
|
|
50
|
+
const warnings = isValidateResult(opResult) ? (opResult.warnings ?? []) : [];
|
|
51
|
+
allWarnings.push(...warnings);
|
|
45
52
|
const needsAPI = has(validatedConfig, '_api_name') || has(validatedConfig, 'api_name');
|
|
46
53
|
if (needsAPI) {
|
|
47
54
|
const apiName = get(validatedConfig, '_api_name', null) ?? get(validatedConfig, 'api_name', null);
|
|
@@ -77,7 +84,14 @@ export class JobValidator {
|
|
|
77
84
|
// revert name back to original
|
|
78
85
|
job.apis[index]._name = originalName;
|
|
79
86
|
});
|
|
80
|
-
|
|
87
|
+
const apiResult = schema.validate(apiConfig);
|
|
88
|
+
// TODO: v3 schemas may return the config directly instead of
|
|
89
|
+
// { config, warnings }. Support for the old shape will be dropped in Teraslice v4.
|
|
90
|
+
// See https://github.com/terascope/teraslice/issues/4501
|
|
91
|
+
const validatedApiConfig = isValidateResult(apiResult) ? apiResult.config : apiResult;
|
|
92
|
+
const apiWarnings = isValidateResult(apiResult) ? (apiResult.warnings ?? []) : [];
|
|
93
|
+
allWarnings.push(...apiWarnings);
|
|
94
|
+
return validatedApiConfig;
|
|
81
95
|
});
|
|
82
96
|
// this can mutate the job
|
|
83
97
|
validateApisFns.forEach((fn) => {
|
|
@@ -98,7 +112,7 @@ export class JobValidator {
|
|
|
98
112
|
this.context.apis.executionContext.addToRegistry(name, api);
|
|
99
113
|
});
|
|
100
114
|
await this._applyRelocatable(jobConfig);
|
|
101
|
-
return jobConfig;
|
|
115
|
+
return { jobConfig, warnings: allWarnings };
|
|
102
116
|
}
|
|
103
117
|
/**
|
|
104
118
|
* Loads the slicer for the given job to determine if it is relocatable,
|
|
@@ -127,4 +141,23 @@ export class JobValidator {
|
|
|
127
141
|
}
|
|
128
142
|
}
|
|
129
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* Type guard to distinguish new-style schema validate() results (ValidateResult)
|
|
146
|
+
* from old-style results (plain config object).
|
|
147
|
+
*
|
|
148
|
+
* @backwards-compat: v3 schemas return the config directly. This guard exists to
|
|
149
|
+
* support both shapes during the deprecation window. Will be removed in Teraslice v4
|
|
150
|
+
* when all schemas are required to return { config, warnings }.
|
|
151
|
+
* See https://github.com/terascope/teraslice/issues/4501
|
|
152
|
+
*/
|
|
153
|
+
function isValidateResult(result) {
|
|
154
|
+
// Check for both 'config' and 'warnings' to avoid false positives on legacy op
|
|
155
|
+
// configs that happen to have a 'config' property.
|
|
156
|
+
return result != null
|
|
157
|
+
&& typeof result === 'object'
|
|
158
|
+
&& 'config' in result
|
|
159
|
+
&& typeof result.config === 'object'
|
|
160
|
+
&& 'warnings' in result
|
|
161
|
+
&& Array.isArray(result.warnings);
|
|
162
|
+
}
|
|
130
163
|
//# sourceMappingURL=job-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-validator.js","sourceRoot":"","sources":["../../src/job-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAChC,MAAM,EACT,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,MAAM,OAAO,YAAY;IACd,MAAM,CAA6B;IACzB,OAAO,CAAU;IACjB,QAAQ,CAAkB;IAE3C,YAAY,OAAgB;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAe,CAAC;YAChC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB;YACvD,wBAAwB,EAAE,IAAI;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,sFAAsF;IACtF,KAAK,CAAC,cAAc,CAChB,OAAiE;QAEjE,sDAAsD;QACtD,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"job-validator.js","sourceRoot":"","sources":["../../src/job-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Terafoundation } from '@terascope/types';
|
|
1
|
+
import { Teraslice, Terafoundation } from '@terascope/types';
|
|
2
2
|
import SchemaCore, { OpType } from './core/schema-core.js';
|
|
3
3
|
import { Context, OpConfig, APIConfig, ValidatedJobConfig } from '../interfaces/index.js';
|
|
4
4
|
/**
|
|
@@ -7,8 +7,14 @@ import { Context, OpConfig, APIConfig, ValidatedJobConfig } from '../interfaces/
|
|
|
7
7
|
export default abstract class BaseSchema<T extends Record<string, any>, S = any> extends SchemaCore<T> {
|
|
8
8
|
schema: Terafoundation.Schema<S>;
|
|
9
9
|
constructor(context: Context, opType?: OpType);
|
|
10
|
-
validate(inputConfig: Record<string, any>):
|
|
11
|
-
|
|
10
|
+
validate(inputConfig: Record<string, any>): {
|
|
11
|
+
config: APIConfig & T;
|
|
12
|
+
warnings: Teraslice.JobWarning[];
|
|
13
|
+
};
|
|
14
|
+
validate(inputConfig: Record<string, any>): {
|
|
15
|
+
config: OpConfig & T;
|
|
16
|
+
warnings: Teraslice.JobWarning[];
|
|
17
|
+
};
|
|
12
18
|
validateJob(_job: ValidatedJobConfig): void;
|
|
13
19
|
static type(): string;
|
|
14
20
|
abstract build<U = any>(context?: Context): Terafoundation.Schema<S & U>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-schema.d.ts","sourceRoot":"","sources":["../../../src/operations/base-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"base-schema.d.ts","sourceRoot":"","sources":["../../../src/operations/base-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAC5B,kBAAkB,EACrB,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAC3E,SAAQ,UAAU,CAAC,CAAC,CAAC;IAErB,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAErB,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAoB;IAK1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QACxC,MAAM,EAAE,SAAS,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;KAC3D;IACD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;QACxC,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;KAC1D;IAUD,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAI3C,MAAM,CAAC,IAAI,IAAI,MAAM;IAIrB,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CAC3E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-schema.js","sourceRoot":"","sources":["../../../src/operations/base-schema.ts"],"names":[],"mappings":"AACA,OAAO,UAAsB,MAAM,uBAAuB,CAAC;AAK3D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAgB,UAC1B,SAAQ,UAAa;IACrB,MAAM;IACN,MAAM,CAA2B;IAEjC,YAAY,OAAgB,EAAE,SAAiB,WAAW;QACtD,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"base-schema.js","sourceRoot":"","sources":["../../../src/operations/base-schema.ts"],"names":[],"mappings":"AACA,OAAO,UAAsB,MAAM,uBAAuB,CAAC;AAK3D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,CAAC,OAAO,OAAgB,UAC1B,SAAQ,UAAa;IACrB,MAAM;IACN,MAAM,CAA2B;IAEjC,YAAY,OAAgB,EAAE,SAAiB,WAAW;QACtD,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAQD,QAAQ,CACJ,WAAgC;QAEhC,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACxB,OAAO,iBAAiB,CAAI,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,gBAAgB,CAAI,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,WAAW,CAAC,IAAwB;IAEpC,CAAC;IAED,MAAM,CAAC,IAAI;QACP,OAAO,SAAS,CAAC;IACrB,CAAC;CAGJ"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Teraslice } from '@terascope/types';
|
|
1
2
|
import { Context, OpConfig, ValidatedJobConfig } from '../../interfaces/index.js';
|
|
2
3
|
/**
|
|
3
4
|
* A base class for supporting "Schema" definition
|
|
@@ -7,7 +8,10 @@ export default abstract class SchemaCore<T> {
|
|
|
7
8
|
readonly opType: OpType;
|
|
8
9
|
constructor(context: Context, opType: OpType);
|
|
9
10
|
abstract build(context?: Context): any;
|
|
10
|
-
abstract validate(inputConfig: Record<string, any>):
|
|
11
|
+
abstract validate(inputConfig: Record<string, any>): {
|
|
12
|
+
config: OpConfig & T;
|
|
13
|
+
warnings: Teraslice.JobWarning[];
|
|
14
|
+
};
|
|
11
15
|
abstract validateJob?(job: ValidatedJobConfig): void;
|
|
12
16
|
}
|
|
13
17
|
export type OpType = 'operation' | 'api';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-core.d.ts","sourceRoot":"","sources":["../../../../src/operations/core/schema-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAElF;;GAEG;AAEH,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU,CAAC,CAAC;IACtC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAK5C,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,GAAG;IACtC,QAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"schema-core.d.ts","sourceRoot":"","sources":["../../../../src/operations/core/schema-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAElF;;GAEG;AAEH,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,UAAU,CAAC,CAAC;IACtC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAK5C,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,GAAG;IACtC,QAAQ,CAAC,QAAQ,CACb,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjC;QAAE,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAA;KAAE;IAC7D,QAAQ,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI;CACvD;AAED,MAAM,MAAM,MAAM,GAAG,WAAW,GAAG,KAAK,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-core.js","sourceRoot":"","sources":["../../../../src/operations/core/schema-core.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema-core.js","sourceRoot":"","sources":["../../../../src/operations/core/schema-core.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAgB,UAAU;IAC1B,OAAO,CAAU;IAClB,MAAM,CAAS;IAExB,YAAY,OAAgB,EAAE,MAAc;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;CAOJ"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terascope/job-components",
|
|
3
3
|
"displayName": "Job Components",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.16.0",
|
|
5
5
|
"description": "A teraslice library for validating jobs schemas, registering apis, and defining and running new Job APIs",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/job-components#readme",
|
|
7
7
|
"bugs": {
|
|
@@ -28,14 +28,14 @@
|
|
|
28
28
|
"prom-client": "~15.1.3",
|
|
29
29
|
"semver": "~7.8.5",
|
|
30
30
|
"uuid": "~14.0.1",
|
|
31
|
-
"@terascope/core-utils": "~2.
|
|
32
|
-
"@terascope/types": "~2.
|
|
31
|
+
"@terascope/core-utils": "~2.14.0",
|
|
32
|
+
"@terascope/types": "~2.13.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@jest/globals": "^30.4.1",
|
|
36
36
|
"@types/semver": "~7.7.1",
|
|
37
37
|
"benchmark": "~2.1.4",
|
|
38
|
-
"fs-extra": "~11.3.
|
|
38
|
+
"fs-extra": "~11.3.6",
|
|
39
39
|
"jest-extended": "~7.0.0",
|
|
40
40
|
"jest-fixtures": "~0.6.0"
|
|
41
41
|
},
|