block region il from scheduler

Author: Yanivridel

src/commands/scheduler/create.ts

@@ -6,7 +6,7 @@ import { PromptService } from 'src/services/prompt-service';
 import { SchedulerService } from 'src/services/scheduler-service';
 import { printJobs, validateCronExpression, validateTargetUrl } from 'src/services/scheduler-service.utils';
 import logger from 'src/utils/logger';
-import { chooseRegionIfNeeded, getRegionFromString } from 'src/utils/region';
+import { chooseSchedulerRegionIfNeeded, getRegionFromString } from 'src/utils/region';
 import { addPrefixIfNotExists } from 'src/utils/urls-builder';
 import { isDefined } from 'src/utils/validations';
 
@@ -29,7 +29,7 @@ export default class SchedulerCreate extends AuthenticatedCommand {
     const parsedRegion = getRegionFromString(region);
 
     if (!appId) appId = await DynamicChoicesService.chooseApp();
-    const selectedRegion = await chooseRegionIfNeeded(parsedRegion, { appId });
+    const selectedRegion = await chooseSchedulerRegionIfNeeded(parsedRegion, { appId });
     if (!name) name = await PromptService.promptInput(SchedulerMessages.name, true);
     if (!schedule) schedule = await PromptService.promptInput(SchedulerMessages.schedule, true);
     validateCronExpression(schedule);

src/commands/scheduler/delete.ts

@@ -3,7 +3,7 @@ import { SchedulerBaseFlags } from 'src/consts/scheduler/flags';
 import { DynamicChoicesService } from 'src/services/dynamic-choices-service';
 import { SchedulerService } from 'src/services/scheduler-service';
 import logger from 'src/utils/logger';
-import { chooseRegionIfNeeded, getRegionFromString } from 'src/utils/region';
+import { chooseSchedulerRegionIfNeeded, getRegionFromString } from 'src/utils/region';
 
 export default class SchedulerDelete extends AuthenticatedCommand {
   static description = 'Delete a scheduler job for an app';
@@ -20,7 +20,7 @@ export default class SchedulerDelete extends AuthenticatedCommand {
     const parsedRegion = getRegionFromString(region);
 
     if (!appId) appId = await DynamicChoicesService.chooseApp();
-    const selectedRegion = await chooseRegionIfNeeded(parsedRegion, { appId });
+    const selectedRegion = await chooseSchedulerRegionIfNeeded(parsedRegion, { appId });
     if (!name) name = await DynamicChoicesService.chooseSchedulerJob(appId, selectedRegion);
 
     logger.debug(`Deleting scheduler job ${name} for appId: ${appId}`, this.DEBUG_TAG);

src/commands/scheduler/list.ts

@@ -4,14 +4,15 @@ import { DynamicChoicesService } from 'src/services/dynamic-choices-service';
 import { SchedulerService } from 'src/services/scheduler-service';
 import { printJobs } from 'src/services/scheduler-service.utils';
 import logger from 'src/utils/logger';
-import { chooseRegionIfNeeded, getRegionFromString } from 'src/utils/region';
+import { chooseSchedulerRegionIfNeeded, getRegionFromString, regionFlag } from 'src/utils/region';
 
 export default class SchedulerList extends AuthenticatedCommand {
   static description = 'List all scheduler jobs for an app';
   static examples = ['<%= config.bin %> <%= command.id %> -a APP_ID'];
 
   static flags = SchedulerList.serializeFlags({
     appId: SchedulerBaseFlags.appId,
+    ...regionFlag,
   });
 
   DEBUG_TAG = 'scheduler_list';
@@ -23,7 +24,7 @@ export default class SchedulerList extends AuthenticatedCommand {
     const parsedRegion = getRegionFromString(region);
 
     appId = appId ? Number(appId) : await DynamicChoicesService.chooseApp();
-    const selectedRegion = await chooseRegionIfNeeded(parsedRegion, { appId });
+    const selectedRegion = await chooseSchedulerRegionIfNeeded(parsedRegion, { appId });
 
     logger.debug(`Listing scheduler jobs for appId: ${appId}`, this.DEBUG_TAG);
     this.preparePrintCommand(this, { appId, region: selectedRegion });

src/commands/scheduler/run.ts

@@ -3,7 +3,7 @@ import { SchedulerBaseFlags } from 'src/consts/scheduler/flags';
 import { DynamicChoicesService } from 'src/services/dynamic-choices-service';
 import { SchedulerService } from 'src/services/scheduler-service';
 import logger from 'src/utils/logger';
-import { chooseRegionIfNeeded, getRegionFromString } from 'src/utils/region';
+import { chooseSchedulerRegionIfNeeded, getRegionFromString } from 'src/utils/region';
 
 export default class SchedulerRun extends AuthenticatedCommand {
   static description = 'Manually trigger a scheduled job to run for an app';
@@ -20,7 +20,7 @@ export default class SchedulerRun extends AuthenticatedCommand {
     const parsedRegion = getRegionFromString(region);
 
     if (!appId) appId = await DynamicChoicesService.chooseApp();
-    const selectedRegion = await chooseRegionIfNeeded(parsedRegion, { appId });
+    const selectedRegion = await chooseSchedulerRegionIfNeeded(parsedRegion, { appId });
     if (!name) name = await DynamicChoicesService.chooseSchedulerJob(appId, selectedRegion);
 
     logger.debug(`Running scheduler job ${name} for appId: ${appId}`, this.DEBUG_TAG);

src/commands/scheduler/update.ts

@@ -7,7 +7,7 @@ import { SchedulerService } from 'src/services/scheduler-service';
 import { printJobs, validateCronExpression, validateTargetUrl } from 'src/services/scheduler-service.utils';
 import { UpdateJobRequest } from 'src/types/services/scheduler-service';
 import logger from 'src/utils/logger';
-import { chooseRegionIfNeeded, getRegionFromString } from 'src/utils/region';
+import { chooseSchedulerRegionIfNeeded, getRegionFromString } from 'src/utils/region';
 import { addPrefixIfNotExists } from 'src/utils/urls-builder';
 import { isDefined, isDefinedAndNotEmpty } from 'src/utils/validations';
 
@@ -30,7 +30,7 @@ export default class SchedulerUpdate extends AuthenticatedCommand {
     const parsedRegion = getRegionFromString(region);
 
     if (!appId) appId = await DynamicChoicesService.chooseApp();
-    const selectedRegion = await chooseRegionIfNeeded(parsedRegion, { appId });
+    const selectedRegion = await chooseSchedulerRegionIfNeeded(parsedRegion, { appId });
     const jobs = await SchedulerService.listJobs(appId, selectedRegion);
     if (!name) name = await DynamicChoicesService.chooseSchedulerJob(appId, selectedRegion, jobs);
 

src/utils/region.ts

@@ -72,3 +72,16 @@ export async function chooseRegionIfNeeded(
   const returnedRegion = await regionsPrompt();
   return getRegionFromString(returnedRegion);
 }
+
+export async function chooseSchedulerRegionIfNeeded(
+  region?: Region,
+  options?: { appId?: number; appVersionId?: number },
+): Promise<Region | undefined> {
+  if (region === Region.IL) {
+    throw new Error(
+      'Cloud Scheduler is not available in the IL region. Please use a different region (US, EU, or AU) for scheduler operations.',
+    );
+  }
+
+  return chooseRegionIfNeeded(region, options);
+}