use genericanem for main service

terascope · Apr 11, 2024 · e3b648e · e3b648e
1 parent bacd4e9
commit e3b648e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/packages/terafoundation/src/connectors/s3.ts b/packages/terafoundation/src/connectors/s3.ts
@@ -63,8 +63,8 @@ export default {
             }
         };
     },
-    validate_config(
-        sysconfig: Terafoundation.SysConfig<any>,
+    validate_config<S>(
+        _sysconfig: Terafoundation.SysConfig<S>,
         subconfig: S3ClientConfig,
         name: string
     ): void {

diff --git a/packages/terafoundation/src/validate-configs.ts b/packages/terafoundation/src/validate-configs.ts
@@ -84,9 +84,10 @@ export default function validateConfigs<
     const listOfValidations: Record<string, Terafoundation.ValidationObj<S>> = {};
     const {
         schema: sysconfigSchema,
-        validatorFn: terasliceValidatorFn
+        validatorFn: mainSvcValidatorFn
     } = extractInitializers<S>(config.config_schema, sysconfig);
-    listOfValidations.teraslice = { validatorFn: terasliceValidatorFn, subconfig: {} };
+    const mainSvcName = Object.keys(sysconfigSchema)[0];
+    listOfValidations[mainSvcName] = { validatorFn: mainSvcValidatorFn, subconfig: {} };
     const {
         schema: foundationSchema,
         validatorFn: foundationValidatorFn
@@ -124,15 +125,15 @@ export default function validateConfigs<
             const connectors: Record<string, any> = subConfig.connectors || {};
             for (const [connector, connectorConfig] of Object.entries(connectors)) {
                 const {
-                    schema: connSchema,
+                    schema: connectorSchema,
                     validatorFn: connValidatorFn
                 } = getConnectorInitializers<S>(connector);
 
                 result[schemaKey].connectors[connector] = {};
                 for (const [connection, connectionConfig] of Object.entries(connectorConfig)) {
                     const validatedConnConfig = validateConfig(
                         cluster,
-                        connSchema,
+                        connectorSchema,
                         connectionConfig as any
                     );
 

diff --git a/packages/terafoundation/test/validate-configs-spec.ts b/packages/terafoundation/test/validate-configs-spec.ts
@@ -184,7 +184,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -205,7 +205,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -226,7 +226,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -247,7 +247,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -280,7 +280,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -302,7 +302,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -328,7 +328,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -357,7 +357,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -383,7 +383,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {} };
+                return {};
             }
         };
 
@@ -443,7 +443,7 @@ describe('Validate Configs', () => {
         };
         const config = {
             config_schema() {
-                return { schema: {}, validatorFn: testFn };
+                return { schema: { teraslice: {} }, validatorFn: testFn };
             }
         };