workspace timestamp in workspace name

dist/index.js

@@ -5272,6 +5272,9 @@ class SharedWorkspaceLocking {
     }
     static GetWorkspaceTimestamp(workspace, buildParametersContext) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (workspace.split(`_`).length > 0) {
+                return Number(workspace.split(`_`)[1]);
+            }
             if (!(yield SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
                 throw new Error("Workspace doesn't exist, can't call get all locks");
             }
@@ -5301,9 +5304,10 @@ class SharedWorkspaceLocking {
             if (lockId !== ``) {
                 yield SharedWorkspaceLocking.LockWorkspace(workspace, lockId, buildParametersContext);
             }
-            const file = `${Date.now()}_workspace`;
+            const timestamp = Date.now();
+            const file = `${timestamp}_workspace`;
             fs.writeFileSync(file, '');
-            yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${workspace}/${file}`, false, true);
+            yield cloud_runner_system_1.CloudRunnerSystem.Run(`aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}_${timestamp}/${workspace}/${file}`, false, true);
             fs.rmSync(file);
             const workspaces = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`);
             cloud_runner_logger_1.default.log(`All workspaces ${workspaces}`);

src/model/cloud-runner/services/shared-workspace-locking.ts

@@ -152,6 +152,10 @@ export class SharedWorkspaceLocking {
     workspace: string,
     buildParametersContext: BuildParameters,
   ): Promise<Number> {
+    if (workspace.split(`_`).length > 0) {
+      return Number(workspace.split(`_`)[1]);
+    }
+
     if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
       throw new Error("Workspace doesn't exist, can't call get all locks");
     }
@@ -195,11 +199,11 @@ export class SharedWorkspaceLocking {
     if (lockId !== ``) {
       await SharedWorkspaceLocking.LockWorkspace(workspace, lockId, buildParametersContext);
     }
-
+    const timestamp = Date.now();
-    const file = `${Date.now()}_workspace`;
+    const file = `${timestamp}_workspace`;
     fs.writeFileSync(file, '');
     await CloudRunnerSystem.Run(
-      `aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${workspace}/${file}`,
+      `aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}_${timestamp}/${workspace}/${file}`,
       false,
       true,
     );