improve locking naming

dist/index.js

@@ -206,9 +206,10 @@ const github_cli_1 = __nccwpck_require__(44990);
 const cli_1 = __nccwpck_require__(55651);
 const github_1 = __importDefault(__nccwpck_require__(83654));
 const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
+const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
 class BuildParameters {
     static shouldUseRetainedWorkspaceMode(buildParameters) {
-        return buildParameters.maxRetainedWorkspaces > 0;
+        return buildParameters.maxRetainedWorkspaces > 0 && cloud_runner_1.default.lockedWorkspace !== ``;
     }
     static async create() {
         const buildFile = this.parseBuildFile(input_1.default.buildName, input_1.default.targetPlatform, input_1.default.androidExportType);
@@ -1050,7 +1051,7 @@ class CloudRunner {
         if (!CloudRunner.buildParameters.isCliMode)
             core.endGroup();
         try {
-            if (__1.BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)) {
+            if (buildParameters.maxRetainedWorkspaces > 0) {
                 CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
                 const result = await shared_workspace_locking_1.default.GetLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
                 if (result) {
@@ -3116,7 +3117,7 @@ class Kubernetes {
     defaultSecretsArray) {
         try {
             this.buildParameters = buildParameters;
-            const id = __1.BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters) && cloud_runner_1.default.lockedWorkspace !== ``
+            const id = __1.BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)
                 ? cloud_runner_1.default.lockedWorkspace
                 : buildParameters.buildGuid;
             this.pvcName = `unity-builder-pvc-${id}`;
@@ -4317,7 +4318,7 @@ class RemoteClient {
         if (!build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)) {
             return;
         }
-        remote_client_logger_1.RemoteClientLogger.log(`Retained Workspace: ${cloud_runner_1.default.lockedWorkspace !== ``}`);
+        remote_client_logger_1.RemoteClientLogger.log(`Retained Workspace: ${build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)}`);
         if (node_fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)) &&
             node_fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`)))) {
             cloud_runner_logger_1.default.log(`Retained Workspace Already Exists!`);
@@ -4827,9 +4828,7 @@ class CloudRunnerFolders {
     }
     // Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
     static get uniqueCloudRunnerJobFolderAbsolute() {
-        return cloud_runner_1.default.buildParameters &&
+        return cloud_runner_1.default.buildParameters && build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters)
-            build_parameters_1.default.shouldUseRetainedWorkspaceMode(cloud_runner_1.default.buildParameters) &&
-            cloud_runner_1.default.lockedWorkspace !== ``
             ? node_path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.lockedWorkspace)
             : node_path_1.default.join(`/`, CloudRunnerFolders.buildVolumeFolder, cloud_runner_1.default.buildParameters.buildGuid);
     }

src/model/build-parameters.ts

@@ -11,6 +11,7 @@ import { GithubCliReader } from './input-readers/github-cli';
 import { Cli } from './cli/cli';
 import GitHub from './github';
 import CloudRunnerOptions from './cloud-runner/cloud-runner-options';
+import CloudRunner from './cloud-runner/cloud-runner';
 
 class BuildParameters {
   // eslint-disable-next-line no-undef
@@ -82,7 +83,7 @@ class BuildParameters {
   public cacheUnityInstallationOnMac!: boolean;
   public unityHubVersionOnMac!: string;
   public static shouldUseRetainedWorkspaceMode(buildParameters: BuildParameters) {
-    return buildParameters.maxRetainedWorkspaces > 0;
+    return buildParameters.maxRetainedWorkspaces > 0 && CloudRunner.lockedWorkspace !== ``;
   }
 
   static async create(): Promise<BuildParameters> {

src/model/cloud-runner/cloud-runner.ts

@@ -91,7 +91,7 @@ class CloudRunner {
     );
     if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
     try {
-      if (BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)) {
+      if (buildParameters.maxRetainedWorkspaces > 0) {
         CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
 
         const result = await SharedWorkspaceLocking.GetLockedWorkspace(

src/model/cloud-runner/providers/k8s/index.ts

@@ -95,10 +95,9 @@ class Kubernetes implements ProviderInterface {
   ) {
     try {
       this.buildParameters = buildParameters;
-      const id =
+      const id = BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)
-        BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters) && CloudRunner.lockedWorkspace !== ``
+        ? CloudRunner.lockedWorkspace
-          ? CloudRunner.lockedWorkspace
+        : buildParameters.buildGuid;
-          : buildParameters.buildGuid;
       this.pvcName = `unity-builder-pvc-${id}`;
       this.cleanupCronJobName = `unity-builder-cronjob-${id}`;
       this.serviceAccountName = `service-account-${buildParameters.buildGuid}`;

src/model/cloud-runner/remote-client/index.ts

@@ -172,7 +172,9 @@ export class RemoteClient {
     if (!BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)) {
       return;
     }
-    RemoteClientLogger.log(`Retained Workspace: ${CloudRunner.lockedWorkspace !== ``}`);
+    RemoteClientLogger.log(
+      `Retained Workspace: ${BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)}`,
+    );
     if (
       fs.existsSync(CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)) &&
       fs.existsSync(CloudRunnerFolders.ToLinuxFolder(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`)))

src/model/cloud-runner/services/cloud-runner-folders.ts

@@ -13,9 +13,7 @@ export class CloudRunnerFolders {
   // Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
 
   public static get uniqueCloudRunnerJobFolderAbsolute(): string {
-    return CloudRunner.buildParameters &&
+    return CloudRunner.buildParameters && BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)
-      BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters) &&
-      CloudRunner.lockedWorkspace !== ``
       ? path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.lockedWorkspace)
       : path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.buildParameters.buildGuid);
   }