refactor(config): split utils (#144)

MyUnisoft · Nov 9, 2023 · 158f082 · 158f082
1 parent 400079b
commit 158f082
Show file tree

Hide file tree

Showing 13 changed files with 429 additions and 366 deletions.
diff --git a/src/agent/test/FT/selfMonitoring.spec.ts b/src/agent/test/FT/selfMonitoring.spec.ts
@@ -39,6 +39,7 @@ describe("Self-monitoring", () => {
   before(async() => {
     process.env.GRAFANA_API_TOKEN = "toto";
     setGlobalDispatcher(kMockAgent);
+    kMockAgent.disableNetConnect();
 
     const pool = kMockAgent.get("https://discord.com");
     pool.intercept({

diff --git a/src/config/src/index.ts b/src/config/src/index.ts
@@ -40,16 +40,16 @@ export async function initConfig(configPath: string | URL): Promise<SigynInitial
     config.templates![key] = utils.extendsTemplates(template, config);
   }
 
-  const rules = await utils.initializeRules(config);
+  const rules = await utils.rules.initialize(config);
   validateConfig(config);
 
-  config.rules = utils.applyRulesLogQLVariables({ ...config, rules });
+  config.rules = utils.rules.applyLogQLVariables({ ...config, rules });
 
-  const compositeRules = utils.initializeCompositeRules(config);
+  const compositeRules = utils.compositeRules.initialize(config);
 
   initializedConfig = utils.applyDefaultValues({
     ...config,
-    compositeRules: utils.handleCompositeRulesTemplates(config, compositeRules)
+    compositeRules: utils.compositeRules.handleTemplates(config, compositeRules)
   });
 
   return initializedConfig;

diff --git a/src/config/src/types.ts b/src/config/src/types.ts
@@ -222,7 +222,7 @@ export interface SigynInitializedCompositeRule {
   notifCount: number;
   ruleCountThreshold?: number;
   interval: string;
-  template: string | SigynInitializedTemplate;
+  template: SigynInitializedTemplate;
   notifiers: string[];
   throttle?: {
     count: number;

diff --git a/src/config/src/utils.ts b/src/config/src/utils.ts