Merge pull request #8 from WarpBuilds/feat/request-context

Author: guptaankit015

dist/index.js

@@ -35,6 +35,7 @@ interface BuilderDetailsResponse extends BuilderInstance {}
 
 interface CleanupState {
   builderName: string;
+  idempotencyKey: string;
   builderInstances: BuilderInstance[];
   certDirs: string[];
 }
@@ -47,6 +48,7 @@ export class WarpBuildRemoteBuilders {
   private readonly apiDomain: string;
   private scriptStartTime: number;
   private builderName: string;
+  private idempotencyKey: string;
   private builderInstances: BuilderInstance[] = [];
   private certDirs: string[] = [];
   private assignmentPromise: Promise<void> | null = null;
@@ -58,7 +60,9 @@ export class WarpBuildRemoteBuilders {
     this.scriptStartTime = Date.now();
     this.apiDomain = process.env.WARPBUILD_API_DOMAIN || 'https://api.warpbuild.com';
     this.isWarpBuildRunner = this.determineRunnerType();
-    this.builderName = `builder-${uuidv4()}`;
+    // Example output: lq1cr8p2n5x7d3fy
+    this.idempotencyKey = uuidv4().replace(/-/g, '').substring(0, 16);
+    this.builderName = `builder-${this.idempotencyKey}`;
 
     core.debug(`API domain: ${this.apiDomain}`);
     core.debug(`Is WarpBuild runner: ${this.isWarpBuildRunner}`);
@@ -87,6 +91,7 @@ export class WarpBuildRemoteBuilders {
   public saveState(): void {
     const state: CleanupState = {
       builderName: this.builderName,
+      idempotencyKey: this.idempotencyKey,
       builderInstances: this.builderInstances,
       certDirs: this.certDirs
     };
@@ -100,6 +105,7 @@ export class WarpBuildRemoteBuilders {
     if (stateStr) {
       const state = JSON.parse(stateStr) as CleanupState;
       this.builderName = state.builderName;
+      this.idempotencyKey = state.idempotencyKey;
       this.builderInstances = state.builderInstances;
       this.certDirs = state.certDirs;
       core.debug(`Loaded cleanup state: ${JSON.stringify(state)}`);
@@ -108,6 +114,21 @@ export class WarpBuildRemoteBuilders {
     }
   }
 
+  /**
+     * Get request context from github action job environment variables
+     * 
+     * @returns {Object}
+     */
+  public getRequestContext() {
+    return {
+        runner_name: process.env.RUNNER_NAME,
+        github_job_id: process.env.GITHUB_JOB,
+        run_id: process.env.GITHUB_RUN_ID,
+        run_attempt: process.env.GITHUB_RUN_ATTEMPT,
+        repo: process.env.GITHUB_REPOSITORY,
+    };
+  }
+
   /**
    * Check if required tools are available
    */
@@ -164,7 +185,7 @@ export class WarpBuildRemoteBuilders {
                 'Content-Type': 'application/json',
                 Authorization: authHeader
               },
-              body: JSON.stringify({profile_name: profileName.trim()})
+              body: JSON.stringify({profile_name: profileName.trim(), request_metadata: this.getRequestContext(), external_unique_id: this.idempotencyKey})
             });
 
             if (!response.ok) {
@@ -493,7 +514,7 @@ export class WarpBuildRemoteBuilders {
         const response = await fetch(removeBuilderEndpoint, {
           method: 'POST',
           headers: {Authorization: authHeader},
-          body: JSON.stringify({request_id: builderInstance.request_id})
+          body: JSON.stringify({request_id: builderInstance.request_id, external_unique_id: this.idempotencyKey })
         },
       );