Map new allowedMasterQueues → allowedWorkerQueues

Author: matt-aitken

apps/webapp/app/presenters/v3/RegionsPresenter.server.ts

@@ -30,7 +30,7 @@ export class RegionsPresenter extends BasePresenter {
         id: true,
         organizationId: true,
         defaultWorkerGroupId: true,
-        allowedMasterQueues: true,
+        allowedWorkerQueues: true,
       },
       where: {
         slug: projectSlug,
@@ -70,9 +70,9 @@ export class RegionsPresenter extends BasePresenter {
       where: isAdmin
         ? undefined
         : // Hide hidden unless they're allowed to use them
-        project.allowedMasterQueues.length > 0
+        project.allowedWorkerQueues.length > 0
         ? {
-            masterQueue: { in: project.allowedMasterQueues },
+            masterQueue: { in: project.allowedWorkerQueues },
           }
         : {
             hidden: false,

apps/webapp/app/v3/services/setDefaultRegion.server.ts

@@ -32,8 +32,8 @@ export class SetDefaultRegionService extends BaseService {
 
     // If their project is restricted, only allow them to set default regions that are allowed
     if (!isAdmin) {
-      if (project.allowedMasterQueues.length > 0) {
-        if (!project.allowedMasterQueues.includes(workerGroup.masterQueue)) {
+      if (project.allowedWorkerQueues.length > 0) {
+        if (!project.allowedWorkerQueues.includes(workerGroup.masterQueue)) {
           throw new ServiceValidationError("You're not allowed to set this region as default");
         }
       } else if (workerGroup.hidden) {

internal-packages/database/prisma/schema.prisma

@@ -336,7 +336,7 @@ model Project {
   defaultWorkerGroupId String?
 
   /// The master queues they are allowed to use (impacts what they can set as default and trigger runs with)
-  allowedMasterQueues String[] @default([])
+  allowedWorkerQueues String[] @default([]) @map("allowedMasterQueues")
 
   environments           RuntimeEnvironment[]
   backgroundWorkers      BackgroundWorker[]