k6-perf-reporter 1.3.0 → 1.4.1

package/README.md

@@ -259,7 +259,11 @@ For InfluxDB time queries, use relative or absolute formats:
 
 ## Environment Variables
 
-Set these for easier usage:
+You can configure InfluxDB settings via environment variables. They can be used in two ways:
+
+### 1. Complete Configuration via Environment Variables
+
+Set all four variables to use environment-only configuration:
 
 ```bash
 export INFLUX_URL=http://localhost:8086
@@ -268,19 +272,29 @@ export INFLUX_ORG=your-org
 export INFLUX_BUCKET=k6
 ```
 
-Then use:
+Then run the CLI without needing a config file:
 ```bash
 npx tsx src/cli.ts generate \
-  --url $INFLUX_URL \
-  --token $INFLUX_TOKEN \
-  --org $INFLUX_ORG \
-  --bucket $INFLUX_BUCKET \
-  --test-name api-load-test \
+  --run-id 123456790121 \
   --start-time "-1h" \
   --end-time "now()" \
-  --format html
+  --format cli
 ```
 
+### 2. Override Specific Values from Config File
+
+You can also use environment variables to override individual settings from `.config.json`:
+
+```bash
+# .config.json exists with default settings
+export INFLUX_TOKEN=production-token
+
+# Now the CLI will use the token from env var while other settings come from .config.json
+npx tsx src/cli.ts generate --run-id 123456790121 --format cli
+```
+
+**Note:** Environment variables always take precedence over values in `.config.json`.
+
 ## Prerequisites
 
 - Node.js 16+

package/dist/config.d.ts

@@ -8,6 +8,9 @@ export declare class Config {
     private static instance;
     private config;
     private constructor();
+    private loadConfig;
+    private loadFromEnv;
+    private overrideWithEnv;
     static getInstance(configPath?: string): Config;
     getConfig(): InfluxConfig;
 }

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAe;IAE7B,OAAO;IAMP,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAO/C,SAAS,IAAI,YAAY;CAG1B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAe;IAE7B,OAAO;IAIP,OAAO,CAAC,UAAU;IAyBlB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,eAAe;IASvB,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAO/C,SAAS,IAAI,YAAY;CAG1B"}

package/dist/config.js

@@ -7,10 +7,48 @@ exports.Config = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 class Config {
-    constructor(configPath = ".config.json") {
-        const fullPath = path_1.default.resolve(configPath);
-        const data = JSON.parse(fs_1.default.readFileSync(fullPath, "utf-8"));
-        this.config = data.influx;
+    constructor(configPath) {
+        this.config = this.loadConfig(configPath);
+    }
+    loadConfig(configPath) {
+        // Try to load from JSON file first
+        const filePath = configPath || ".config.json";
+        const fullPath = path_1.default.resolve(filePath);
+        let config;
+        if (fs_1.default.existsSync(fullPath)) {
+            const data = JSON.parse(fs_1.default.readFileSync(fullPath, "utf-8"));
+            config = data.influx;
+        }
+        else {
+            // If file doesn't exist, try to load from env vars
+            const envConfig = this.loadFromEnv();
+            if (!envConfig) {
+                throw new Error(`Config file not found at ${fullPath} and no environment variables set. ` +
+                    `Set INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG, INFLUX_BUCKET or provide a config file.`);
+            }
+            return envConfig;
+        }
+        // Override with environment variables if they exist
+        return this.overrideWithEnv(config);
+    }
+    loadFromEnv() {
+        const url = process.env.INFLUX_URL;
+        const token = process.env.INFLUX_TOKEN;
+        const org = process.env.INFLUX_ORG;
+        const bucket = process.env.INFLUX_BUCKET;
+        // Only return if all env vars are set
+        if (url && token && org && bucket) {
+            return { url, token, org, bucket };
+        }
+        return null;
+    }
+    overrideWithEnv(config) {
+        return {
+            url: process.env.INFLUX_URL || config.url,
+            token: process.env.INFLUX_TOKEN || config.token,
+            org: process.env.INFLUX_ORG || config.org,
+            bucket: process.env.INFLUX_BUCKET || config.bucket,
+        };
     }
     static getInstance(configPath) {
         if (!Config.instance) {

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AASxB,MAAa,MAAM;IAIjB,YAAoB,aAAqB,cAAc;QACrD,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,UAAmB;QACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AApBD,wBAoBC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AASxB,MAAa,MAAM;IAIjB,YAAoB,UAAmB;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAEO,UAAU,CAAC,UAAmB;QACpC,mCAAmC;QACnC,MAAM,QAAQ,GAAG,UAAU,IAAI,cAAc,CAAC;QAC9C,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,MAAoB,CAAC;QAEzB,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;YAC5D,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,mDAAmD;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CACb,4BAA4B,QAAQ,qCAAqC;oBACzE,mFAAmF,CACpF,CAAC;YACJ,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,oDAAoD;QACpD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAEO,WAAW;QACjB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAEzC,sCAAsC;QACtC,IAAI,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;YAClC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,eAAe,CAAC,MAAoB;QAC1C,OAAO;YACL,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,GAAG;YACzC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK;YAC/C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,MAAM,CAAC,GAAG;YACzC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,MAAM;SACnD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,UAAmB;QACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AAlED,wBAkEC"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "k6-perf-reporter",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Reporting tool for k6 performance tests with InfluxDB 2 integration",
+  "license": "MIT",
   "main": "dist/index.js",
   "bin": {
     "k6-reporter": "dist/cli.js"

package/src/config.ts

@@ -12,10 +12,56 @@ export class Config {
   private static instance: Config;
   private config: InfluxConfig;
 
-  private constructor(configPath: string = ".config.json") {
-    const fullPath = path.resolve(configPath);
-    const data = JSON.parse(fs.readFileSync(fullPath, "utf-8"));
-    this.config = data.influx;
+  private constructor(configPath?: string) {
+    this.config = this.loadConfig(configPath);
+  }
+
+  private loadConfig(configPath?: string): InfluxConfig {
+    // Try to load from JSON file first
+    const filePath = configPath || ".config.json";
+    const fullPath = path.resolve(filePath);
+    let config: InfluxConfig;
+
+    if (fs.existsSync(fullPath)) {
+      const data = JSON.parse(fs.readFileSync(fullPath, "utf-8"));
+      config = data.influx;
+    } else {
+      // If file doesn't exist, try to load from env vars
+      const envConfig = this.loadFromEnv();
+      if (!envConfig) {
+        throw new Error(
+          `Config file not found at ${fullPath} and no environment variables set. ` +
+          `Set INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG, INFLUX_BUCKET or provide a config file.`
+        );
+      }
+      return envConfig;
+    }
+
+    // Override with environment variables if they exist
+    return this.overrideWithEnv(config);
+  }
+
+  private loadFromEnv(): InfluxConfig | null {
+    const url = process.env.INFLUX_URL;
+    const token = process.env.INFLUX_TOKEN;
+    const org = process.env.INFLUX_ORG;
+    const bucket = process.env.INFLUX_BUCKET;
+
+    // Only return if all env vars are set
+    if (url && token && org && bucket) {
+      return { url, token, org, bucket };
+    }
+
+    return null;
+  }
+
+  private overrideWithEnv(config: InfluxConfig): InfluxConfig {
+    return {
+      url: process.env.INFLUX_URL || config.url,
+      token: process.env.INFLUX_TOKEN || config.token,
+      org: process.env.INFLUX_ORG || config.org,
+      bucket: process.env.INFLUX_BUCKET || config.bucket,
+    };
   }
 
   static getInstance(configPath?: string): Config {

package/.config.json

@@ -1,8 +0,0 @@
-{
-  "influx": {
-    "url": "https://influx.cmn.monomarket.tech",
-    "token": "JFP9pZu3Sp134rkCZ6gT7FtSBmQRWgl8VmVhFMHTXrbkhKQ3LrvrM4FXECR7Lr8MsDGWLIsU7IJFcjL_QHwvqA==",
-    "org": "ced1cdfb28534a3e",
-    "bucket": "jmeter"
-  }
-}