@empiricalrun/playwright-utils 0.37.0 → 0.38.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/playwright-utils
 
+## 0.38.0
+
+### Minor Changes
+
+- 1967ac3: feat: support iam creds for s3 uploads
+
+### Patch Changes
+
+- Updated dependencies [1967ac3]
+  - @empiricalrun/r2-uploader@0.9.0
+  - @empiricalrun/test-gen@0.78.7
+
 ## 0.37.0
 
 ### Minor Changes

package/dist/reporter/uploader.d.ts

@@ -1,15 +1,20 @@
+import { StorageCredentials } from "@empiricalrun/r2-uploader";
 export interface UploaderConfig {
     projectName: string;
     runId: string;
     baseUrl?: string;
     uploadBucket?: string;
+    credentials: StorageCredentials;
 }
 export declare class Uploader {
     private _baseUrl;
     private _uploadBucket;
     private _destinationDir;
+    private _credentials;
     constructor(config: UploaderConfig);
-    private static _hasR2Credentials;
+    private static _getR2Credentials;
+    private static _getS3Credentials;
+    static getCredentialsFromEnv(enableS3: boolean): StorageCredentials | null;
     get isEnabled(): boolean;
     get baseUrl(): string;
     get destinationDir(): string;

package/dist/reporter/uploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../src/reporter/uploader.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAS;gBAEpB,MAAM,EAAE,cAAc;IAUlC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAQhC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAEK,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAiCnB,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAqBV,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGtC;AAED,wBAAgB,cAAc,IAAI,QAAQ,GAAG,IAAI,CAiBhD"}
+{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../src/reporter/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAGnB,MAAM,2BAA2B,CAAC;AAKnC,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,kBAAkB,CAAC;CACjC;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAqB;gBAE7B,MAAM,EAAE,cAAc;IAWlC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAgBhC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAUhC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,OAAO,GAAG,kBAAkB,GAAG,IAAI;IAO1E,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAEK,UAAU,CACd,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA6BnB,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAiBV,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGtC;AAED,wBAAgB,cAAc,IAAI,QAAQ,GAAG,IAAI,CAyBhD"}

package/dist/reporter/uploader.js

@@ -12,19 +12,44 @@ class Uploader {
     _baseUrl;
     _uploadBucket;
     _destinationDir;
+    _credentials;
     constructor(config) {
         this._baseUrl = config.baseUrl || "https://reports.empirical.run";
         this._uploadBucket = config.uploadBucket || "test-report";
         this._destinationDir = `${config.projectName}/${config.runId}`;
-        logger_1.logger.debug(`[Uploader] Initialized with destination: ${this._destinationDir}`);
+        this._credentials = config.credentials;
+        logger_1.logger.debug(`[Uploader] Initialized with destination: ${this._destinationDir}, provider: ${this._credentials.provider}`);
     }
-    static _hasR2Credentials() {
-        return !!(process.env.R2_ACCOUNT_ID &&
+    static _getR2Credentials() {
+        if (process.env.R2_ACCOUNT_ID &&
             process.env.R2_ACCESS_KEY_ID &&
-            process.env.R2_SECRET_ACCESS_KEY);
+            process.env.R2_SECRET_ACCESS_KEY) {
+            return {
+                provider: "r2",
+                accountId: process.env.R2_ACCOUNT_ID,
+                accessKeyId: process.env.R2_ACCESS_KEY_ID,
+                secretAccessKey: process.env.R2_SECRET_ACCESS_KEY,
+            };
+        }
+        return null;
+    }
+    static _getS3Credentials() {
+        if (process.env.S3_REGION && process.env.S3_UPLOAD_BUCKET) {
+            return {
+                provider: "s3-iam",
+                region: process.env.S3_REGION,
+            };
+        }
+        return null;
+    }
+    static getCredentialsFromEnv(enableS3) {
+        if (enableS3) {
+            return Uploader._getS3Credentials();
+        }
+        return Uploader._getR2Credentials();
     }
     get isEnabled() {
-        return Uploader._hasR2Credentials();
+        return true;
     }
     get baseUrl() {
         return this._baseUrl;
@@ -36,10 +61,6 @@ class Uploader {
         return `${this._baseUrl}/${this._destinationDir}`;
     }
     async uploadFile(filePath, destinationPath) {
-        if (!this.isEnabled) {
-            logger_1.logger.debug("[Uploader] R2 credentials not found, skipping upload");
-            return null;
-        }
         try {
             const fullDestinationPath = path_1.default.join(this._destinationDir, destinationPath);
             const sourceDir = path_1.default.dirname(filePath);
@@ -49,6 +70,7 @@ class Uploader {
                 destinationDir: path_1.default.dirname(fullDestinationPath),
                 uploadBucket: this._uploadBucket,
                 baseUrl: this._baseUrl,
+                credentials: this._credentials,
             });
             const result = await (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
             if (result) {
@@ -63,16 +85,13 @@ class Uploader {
         }
     }
     async uploadDirectory(sourceDir, destinationPrefix) {
-        if (!this.isEnabled) {
-            logger_1.logger.debug("[Uploader] R2 credentials not found, skipping upload");
-            return;
-        }
         const fullDestinationDir = path_1.default.join(this._destinationDir, destinationPrefix);
         const uploadTask = (0, r2_uploader_1.createUploadTask)({
             sourceDir,
             destinationDir: fullDestinationDir,
             uploadBucket: this._uploadBucket,
             baseUrl: this._baseUrl,
+            credentials: this._credentials,
         });
         await (0, r2_uploader_1.sendTaskToQueue)(uploadTask);
     }
@@ -86,12 +105,18 @@ function createUploader() {
         logger_1.logger.debug("[Uploader] PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set");
         return null;
     }
-    if (!Uploader["_hasR2Credentials"]()) {
-        logger_1.logger.debug("[Uploader] R2 credentials not found");
+    const enableS3 = process.env.ENABLE_S3_UPLOADS === "true";
+    const credentials = Uploader.getCredentialsFromEnv(enableS3);
+    if (!credentials) {
+        const storageType = enableS3 ? "S3" : "R2";
+        logger_1.logger.debug(`[Uploader] ${storageType} credentials not found`);
         return null;
     }
+    const uploadBucket = enableS3 ? process.env.S3_UPLOAD_BUCKET : "test-report";
     return new Uploader({
         projectName: process.env.PROJECT_NAME,
         runId: process.env.TEST_RUN_GITHUB_ACTION_ID,
+        uploadBucket,
+        credentials,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,8 +43,8 @@
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
     "@empiricalrun/llm": "^0.25.1",
-    "@empiricalrun/r2-uploader": "^0.8.0",
-    "@empiricalrun/test-gen": "^0.78.6"
+    "@empiricalrun/r2-uploader": "^0.9.0",
+    "@empiricalrun/test-gen": "^0.78.7"
   },
   "scripts": {
     "dev": "tsc --build --watch",