testbeats 2.0.3 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testbeats",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Publish test results to Microsoft Teams, Google Chat, Slack and InfluxDB",
   "main": "src/index.js",
   "types": "./src/index.d.ts",

package/src/cli.js

@@ -6,10 +6,9 @@ const sade = require('sade');
 const prog = sade('testbeats');
 const { PublishCommand } = require('./commands/publish.command');
 const logger = require('./utils/logger');
-const { ConfigBuilder } = require('./utils/config.builder');
 
 prog
-  .version('2.0.3')
+  .version('2.0.4')
   .option('-c, --config', 'path to config file')
   .option('-l, --logLevel', 'Log Level', "INFO")
   .option('--slack', 'slack webhook url')
@@ -30,8 +29,6 @@ prog.command('publish')
   .action(async (opts) => {
     try {
       logger.setLevel(opts.logLevel);
-      const config_builder = new ConfigBuilder(opts);
-      config_builder.build();
       const publish_command = new PublishCommand(opts);
       await publish_command.publish();
     } catch (error) {

package/src/commands/publish.command.js

@@ -3,6 +3,7 @@ const trp = require('test-results-parser');
 const prp = require('performance-results-parser');
 
 const beats = require('../beats');
+const { ConfigBuilder } = require('../utils/config.builder');
 const target_manager = require('../targets');
 const logger = require('../utils/logger');
 const { processData } = require('../helpers/helper');
@@ -19,6 +20,7 @@ class PublishCommand {
 
   async publish() {
     logger.info(`🥁 TestBeats v${pkg.version}`);
+    this.#buildConfig();
     this.#validateOptions();
     this.#setConfigFromFile();
     this.#processConfig();
@@ -28,6 +30,11 @@ class PublishCommand {
     logger.info('✅ Results published successfully!');
   }
 
+  #buildConfig() {
+    const config_builder = new ConfigBuilder(this.opts);
+    config_builder.build();
+  }
+
   #validateOptions() {
     if (!this.opts) {
       throw new Error('Missing publish options');
@@ -42,8 +49,10 @@ class PublishCommand {
       const cwd = process.cwd();
       const file_path = path.join(cwd, this.opts.config);
       try {
-        this.opts.config = require(path.join(cwd, this.opts.config));
+        const config_json = require(path.join(cwd, this.opts.config));
+        this.opts.config = config_json;
       } catch (error) {
+        logger.error({ error }, `Failed to read config file: '${file_path}' with error: '${error.message}'`);
         throw new Error(`Config file not found: ${file_path}`);
       }
     }
@@ -63,7 +72,7 @@ class PublishCommand {
   }
 
   #validateConfig() {
-    logger.info("🛠️  Validating configuration...")
+    logger.info("🛠️ Validating configuration...")
     for (const config of this.configs) {
       this.#validateResults(config);
       this.#validateTargets(config);

package/src/utils/config.builder.js

@@ -1,3 +1,6 @@
+const path = require('path');
+const logger = require('./logger');
+
 class ConfigBuilder {
 
   /**
@@ -11,16 +14,22 @@ class ConfigBuilder {
     if (!this.opts) {
       return;
     }
-    if (this.opts.config) {
+    if (typeof this.opts.config === 'object') {
+      return
+    }
+    if (this.opts.config && typeof this.opts.config === 'string') {
       return;
     }
 
+    logger.info('🏗 Building config...')
     this.#buildConfig();
     this.#buildBeats();
     this.#buildResults();
     this.#buildTargets();
     this.#buildExtensions();
 
+    logger.debug(`🛠️ Generated Config: \n${JSON.stringify(this.config, null, 2)}`);
+
     this.opts.config = this.config;
   }
 
@@ -67,7 +76,7 @@ class ConfigBuilder {
     this.config.results = [
       {
         type,
-        files: [file]
+        files: [path.join(file)]
       }
     ]
   }