Change order of arguments

Author: Andrew Farries

Diff for: components/server/src/workspace/workspace-cluster-imagebuilder-client-provider.ts

@@ -37,7 +37,7 @@ export class WorkspaceClusterImagebuilderClientProvider implements ImageBuilderC
         workspace: Workspace,
         instance: WorkspaceInstance,
     ): Promise<PromisifiedImageBuilderClient> {
-        const clusters = await this.clientProvider.getStartClusterSets(user, workspace, instance, applicationCluster);
+        const clusters = await this.clientProvider.getStartClusterSets(applicationCluster, user, workspace, instance);
         for await (let cluster of clusters) {
             const info = await this.source.getWorkspaceCluster(cluster.installation, applicationCluster);
             if (!info) {

Diff for: components/server/src/workspace/workspace-starter.ts

@@ -618,10 +618,10 @@ export class WorkspaceStarter {
     ): Promise<StartWorkspaceResponse.AsObject | undefined> {
         let lastInstallation = "";
         const clusters = await this.clientProvider.getStartClusterSets(
+            this.config.installationShortname,
             euser,
             workspace,
             instance,
-            this.config.installationShortname,
         );
         for await (let cluster of clusters) {
             try {

Diff for: components/ws-manager-api/typescript/src/client-provider.spec.ts

@@ -140,32 +140,32 @@ class TestClientProvider {
     public async getStartClusterSets() {
         await this.expectInstallations(
             [["a2", "a3"]],
-            await this.provider.getStartClusterSets({} as User, {} as Workspace, {} as WorkspaceInstance, "xx01"),
+            await this.provider.getStartClusterSets("xx01", {} as User, {} as Workspace, {} as WorkspaceInstance),
             "default case",
         );
         await this.expectInstallations(
             [["con1"], ["a2", "a3", "con1"]],
             await this.provider.getStartClusterSets(
+                "xx01",
                 { rolesOrPermissions: ["new-workspace-cluster"] } as User,
                 {} as Workspace,
                 {} as WorkspaceInstance,
-                "xx01",
             ),
             "new workspace cluster",
         );
         await this.expectInstallations(
             [["a2", "a3", "con2"]],
             await this.provider.getStartClusterSets(
+                "xx01",
                 { rolesOrPermissions: ["monitor"] } as User,
                 {} as Workspace,
                 {} as WorkspaceInstance,
-                "xx01",
             ),
             "cluster has permission w/o precedence, user too",
         );
         await this.expectInstallations(
             [["a2", "a3"]],
-            await this.provider.getStartClusterSets({} as User, {} as Workspace, {} as WorkspaceInstance, "xx01"),
+            await this.provider.getStartClusterSets("xx01", {} as User, {} as Workspace, {} as WorkspaceInstance),
             "cluster has permission w/o precedence, user NOT",
         );
     }

Diff for: components/ws-manager-api/typescript/src/client-provider.ts

@@ -46,10 +46,10 @@ export class WorkspaceManagerClientProvider implements Disposable {
      * @returns a set of workspace clusters we can start the workspace in
      */
     public async getStartClusterSets(
+        applicationCluster: string,
         user: ExtendedUser,
         workspace: Workspace,
         instance: WorkspaceInstance,
-        applicationCluster: string,
     ): Promise<IWorkspaceClusterStartSet> {
         const allClusters = await this.source.getAllWorkspaceClusters(applicationCluster);
         const availableClusters = allClusters.filter((c) => c.score > 0 && c.state === "available");