don't set schema field until in extractInitializers

terascope · Apr 10, 2024 · 1f2c8be · 1f2c8be
1 parent 0b2a499
commit 1f2c8be
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/packages/terafoundation/src/connectors/s3.ts b/packages/terafoundation/src/connectors/s3.ts
@@ -1,6 +1,6 @@
 import { Logger } from '@terascope/utils';
 import { createS3Client, S3ClientConfig } from '@terascope/file-asset-apis';
-import * as i from '../interfaces';
+import { Terafoundation } from '@terascope/types';
 
 export default {
     create() {
@@ -64,7 +64,7 @@ export default {
         };
     },
     validate_config(
-        sysconfig: i.FoundationSysConfig<any>,
+        sysconfig: Terafoundation.SysConfig<any>,
         subconfig: S3ClientConfig,
         name: string
     ): void {

diff --git a/packages/terafoundation/src/validate-configs.ts b/packages/terafoundation/src/validate-configs.ts
@@ -46,7 +46,11 @@ function extractInitializers<S>(
     sysconfig: PartialDeep<i.FoundationSysConfig<S>>
 ): Terafoundation.Initializers {
     if (isFunction(fn)) {
-        return fn(sysconfig);
+        const result = fn(sysconfig);
+        if (result.schema) {
+            return result;
+        }
+        return { schema: fn(sysconfig) };
     }
     if (isPlainObject(fn)) {
         return { schema: fn };

diff --git a/packages/teraslice/src/lib/config/schemas/system.ts b/packages/teraslice/src/lib/config/schemas/system.ts
@@ -5,7 +5,6 @@ import {
     isInteger
 } from '@terascope/utils';
 import { cpus } from 'node:os';
-import { Initializers } from 'packages/types/dist/src/terafoundation'; // FIXME
 
 const workerCount = cpus().length;
 
@@ -323,14 +322,8 @@ export const schema = {
     }
 };
 
-// This function is used to make cross-field validations if needed
-export const validatorFn = () => {};
-
-export function configSchema(): Initializers {
-    return {
-        schema: { teraslice: schema },
-        validatorFn
-    };
+export function configSchema() {
+    return { teraslice: schema };
 }
 
 // TODO: fix this

diff --git a/packages/teraslice/test/config/schemas/system_schema-spec.ts b/packages/teraslice/test/config/schemas/system_schema-spec.ts
@@ -4,7 +4,7 @@ import { config_schema } from '../../../src/lib/config/schemas/system.js';
 import('@terascope/job-components');
 
 describe('system_schema', () => {
-    const schema = config_schema().schema.teraslice;
+    const schema = config_schema().teraslice;
 
     function checkValidation(config: Record<string, any>) {
         try {