feature: add support for multi-region param

src/commands-base/base-command.ts

@@ -4,20 +4,6 @@ import { PrintCommandContext } from 'types/commands/base-command';
 import { printGeneratedCommand } from 'utils/command-printer';
 import logger from 'utils/logger';
 
-export const sharedFlags = {
-  verbose: Flags.boolean({
-    description: 'Print advanced logs (optional).',
-    default: false,
-    helpGroup: 'global',
-  }),
-
-  'print-command': Flags.boolean({
-    aliases: ['pc'],
-    description: 'Print the command that was executed (optional).',
-    default: false,
-    helpGroup: 'global',
-  }),
-};
 export abstract class BaseCommand extends Command {
   protected static _withPrintCommand = true;
   private _printCommandCalled = false;
@@ -44,13 +30,28 @@ export abstract class BaseCommand extends Command {
     this._printContext = { command, flags, args };
   }
 
-  public static serializeFlags<T>(flags: T): T & typeof sharedFlags {
+  public static serializeFlags<T>(flags: T): T & typeof this.sharedFlags {
     return {
-      ...sharedFlags,
+      ...this.sharedFlags,
       ...flags,
-    } as typeof flags & typeof sharedFlags;
+    } as typeof flags & typeof this.sharedFlags;
   }
 
+  static sharedFlags = {
+    verbose: Flags.boolean({
+      description: 'Print advanced logs (optional).',
+      default: false,
+      helpGroup: 'global',
+    }),
+
+    'print-command': Flags.boolean({
+      aliases: ['pc'],
+      description: 'Print the command that was executed (optional).',
+      default: false,
+      helpGroup: 'global',
+    }),
+  };
+
   protected catch(err: Error & { exitCode?: number }): any {
     err?.message && logger.error((err as Error).message);
     logger.debug(err);

src/commands/app/deploy.ts

@@ -1,14 +1,14 @@
 import { Flags } from '@oclif/core';
 
-import { addToRegionToFlags } from 'commands/utils/region';
+import { addRegionToFlags } from 'commands/utils/region';
 import { AuthenticatedCommand } from 'commands-base/authenticated-command';
 import { DynamicChoicesService } from 'services/dynamic-choices-service';
 import { getCurrentWorkingDirectory } from 'services/env-service';
 import { getManifestAssetPath, readManifestFile } from 'services/manifest-service';
 import { getTasksForClientSide, getTasksForServerSide } from 'services/share/deploy';
-import { Region } from 'types/general/region';
 import { ManifestHostingType } from 'types/services/manifest-service';
 import logger from 'utils/logger';
+import { getRegionFromString } from 'utils/region';
 
 const MESSAGES = {
   directory: 'Directory path of you project in your machine. If not included will use the current working directory.',
@@ -22,7 +22,7 @@ export default class AppDeploy extends AuthenticatedCommand {
   static withPrintCommand = false;
   static examples = ['<%= config.bin %> <%= command.id %>'];
   static flags = AppDeploy.serializeFlags(
-    addToRegionToFlags({
+    addRegionToFlags({
       directoryPath: Flags.string({
         char: 'd',
         description: MESSAGES.directory,
@@ -61,7 +61,8 @@ export default class AppDeploy extends AuthenticatedCommand {
   public async run(): Promise<void> {
     try {
       const { flags } = await this.parse(AppDeploy);
-      const { directoryPath, appId, appVersionId, region, force } = flags;
+      const { directoryPath, appId, appVersionId, region: strRegion, force } = flags;
+      const region = getRegionFromString(strRegion);
       const manifestFileDir = directoryPath || getCurrentWorkingDirectory();
       const manifestFileData = readManifestFile(manifestFileDir);
       flags.appId = appId || manifestFileData.app.id;
@@ -73,15 +74,19 @@ export default class AppDeploy extends AuthenticatedCommand {
       const { cdn, server } = manifestFileData.app?.hosting || {};
       if (cdn && cdn.type === ManifestHostingType.Upload) {
         logger.info('Deploying files to cdn...');
-        await getTasksForClientSide(Number(appVersionId), getManifestAssetPath(manifestFileDir, cdn.path)).run();
+        await getTasksForClientSide(
+          Number(appVersionId),
+          getManifestAssetPath(manifestFileDir, cdn.path),
+          region,
+        ).run();
       }
 
       if (server && server.type === ManifestHostingType.Upload) {
         logger.info('Deploying server side files...');
         await getTasksForServerSide(
           Number(appVersionId),
           getManifestAssetPath(manifestFileDir, server.path),
-          region as Region,
+          region,
         ).run();
       }
     } catch (error) {

src/commands/code/env.ts

@@ -1,16 +1,16 @@
 import { Flags } from '@oclif/core';
 import { Relationship } from '@oclif/core/lib/interfaces/parser';
 
-import { addToRegionToFlags } from 'commands/utils/region';
+import { addRegionToFlags } from 'commands/utils/region';
 import { AuthenticatedCommand } from 'commands-base/authenticated-command';
 import { APP_ENV_MANAGEMENT_MODES } from 'consts/manage-app-env';
 import { DynamicChoicesService } from 'services/dynamic-choices-service';
 import { handleEnvironmentRequest, listAppEnvKeys } from 'services/manage-app-env-service';
 import { PromptService } from 'services/prompt-service';
 import { ManageAppEnvFlags } from 'types/commands/manage-app-env';
 import { AppId } from 'types/general';
-import { Region } from 'types/general/region';
 import logger from 'utils/logger';
+import { getRegionFromString } from 'utils/region';
 
 const MODES_WITH_KEYS: Array<APP_ENV_MANAGEMENT_MODES> = [
   APP_ENV_MANAGEMENT_MODES.SET,
@@ -71,7 +71,7 @@ export default class Env extends AuthenticatedCommand {
   static examples = ['<%= config.bin %> <%= command.id %>'];
 
   static flags = Env.serializeFlags(
-    addToRegionToFlags({
+    addRegionToFlags({
       appId: Flags.integer({
         char: 'i',
         aliases: ['a'],
@@ -100,7 +100,8 @@ export default class Env extends AuthenticatedCommand {
   public async run(): Promise<void> {
     try {
       const { flags } = await this.parse(Env);
-      const { region } = flags;
+      const { region: strRegion } = flags;
+      const region = getRegionFromString(strRegion);
       let { mode, key, value, appId } = flags as ManageAppEnvFlags;
 
       if (!appId) {
@@ -112,7 +113,7 @@ export default class Env extends AuthenticatedCommand {
       value = await promptForValueIfNotProvided(mode, value);
       this.preparePrintCommand(this, { appId, mode, key, value });
 
-      await handleEnvironmentRequest(appId, mode, key, value, region as Region);
+      await handleEnvironmentRequest(appId, mode, key, value, region);
     } catch (error: any) {
       logger.debug(error, this.DEBUG_TAG);
 

src/commands/code/logs.ts

@@ -1,17 +1,17 @@
 import { Flags } from '@oclif/core';
 import { Relationship } from '@oclif/core/lib/interfaces/parser';
 
-import { addToRegionToFlags } from 'commands/utils/region';
+import { addRegionToFlags } from 'commands/utils/region';
 import { AuthenticatedCommand } from 'commands-base/authenticated-command';
 import { APP_VERSION_ID_TO_ENTER } from 'consts/messages';
 import { streamMessages } from 'services/client-channel-service';
 import { DynamicChoicesService } from 'services/dynamic-choices-service';
 import { logsStream } from 'services/notification-service';
 import { PromptService } from 'services/prompt-service';
 import { EventSource, LogType, LogsCommandArguments, LogsFilterCriteriaArguments } from 'types/commands/logs';
-import { Region } from 'types/general/region';
 import { isDefined } from 'utils/guards';
 import logger from 'utils/logger';
+import { getRegionFromString } from 'utils/region';
 import { TIME_IN_MILLISECONDS } from 'utils/time-enum';
 import { getDayDiff, isDate } from 'utils/validations';
 
@@ -49,7 +49,7 @@ export default class Logs extends AuthenticatedCommand {
   static examples = ['<%= config.bin %> <%= command.id %> -i APP_VERSION_ID -t LOGS_TYPE'];
 
   static flags = Logs.serializeFlags(
-    addToRegionToFlags({
+    addRegionToFlags({
       appVersionId: Flags.integer({
         char: 'i',
         aliases: ['v'],
@@ -87,7 +87,8 @@ export default class Logs extends AuthenticatedCommand {
   public async run(): Promise<void> {
     try {
       const { flags } = await this.parse(Logs);
-      const { logsStartDate, logsEndDate, logSearchFromText, region } = flags;
+      const { logsStartDate, logsEndDate, logSearchFromText, region: strRegion } = flags;
+      const region = getRegionFromString(strRegion);
       const appVersionId = await this.getAppVersionId(flags.appVersionId);
 
       const eventSource = (flags.eventSource || (await eventSourcePrompt())) as EventSource;
@@ -114,7 +115,7 @@ export default class Logs extends AuthenticatedCommand {
         logSearchFromText: logsFilterCriteria?.text,
       });
 
-      const clientChannel = await logsStream(args.appVersionId, args.logsType, logsFilterCriteria, region as Region);
+      const clientChannel = await logsStream(args.appVersionId, args.logsType, logsFilterCriteria, region);
       await streamMessages(clientChannel);
     } catch (error: any) {
       logger.debug(error, this.DEBUG_TAG);

src/commands/code/push.ts

@@ -1,12 +1,12 @@
 import { Flags } from '@oclif/core';
 
-import { addToRegionToFlags } from 'commands/utils/region';
+import { addRegionToFlags } from 'commands/utils/region';
 import { AuthenticatedCommand } from 'commands-base/authenticated-command';
 import { APP_ID_TO_ENTER, APP_VERSION_ID_TO_ENTER } from 'consts/messages';
 import { DynamicChoicesService } from 'services/dynamic-choices-service';
 import { getTasksForServerSide } from 'services/share/deploy';
-import { Region } from 'types/general/region';
 import logger from 'utils/logger';
+import { getRegionFromString } from 'utils/region';
 
 const MESSAGES = {
   directory: 'Directory path of you project in your machine. If not included will use the current working directory.',
@@ -24,7 +24,7 @@ export default class Push extends AuthenticatedCommand {
   ];
 
   static flags = Push.serializeFlags(
-    addToRegionToFlags({
+    addRegionToFlags({
       directoryPath: Flags.string({
         char: 'd',
         description: MESSAGES.directory,
@@ -50,7 +50,8 @@ export default class Push extends AuthenticatedCommand {
 
   public async run(): Promise<void> {
     const { flags } = await this.parse(Push);
-    const { directoryPath, region } = flags;
+    const { directoryPath, region: strRegion } = flags;
+    const region = getRegionFromString(strRegion);
     let appVersionId = flags.appVersionId;
 
     try {
@@ -68,7 +69,7 @@ export default class Push extends AuthenticatedCommand {
       logger.debug(`push code to appVersionId: ${appVersionId}`, this.DEBUG_TAG);
       this.preparePrintCommand(this, { appVersionId, directoryPath: directoryPath });
 
-      const tasks = getTasksForServerSide(appVersionId, directoryPath, region as Region);
+      const tasks = getTasksForServerSide(appVersionId, directoryPath, region);
 
       await tasks.run();
     } catch (error: any) {

src/commands/code/status.ts

@@ -1,16 +1,16 @@
 import { Flags } from '@oclif/core';
 import { StatusCodes } from 'http-status-codes';
 
-import { addToRegionToFlags } from 'commands/utils/region';
+import { addRegionToFlags } from 'commands/utils/region';
 import { AuthenticatedCommand } from 'commands-base/authenticated-command';
 import { APP_VERSION_ID_TO_ENTER, VAR_UNKNOWN } from 'consts/messages';
 import { DynamicChoicesService } from 'services/dynamic-choices-service';
 import { getAppVersionDeploymentStatus } from 'services/push-service';
 import { getMondayCodeBuild } from 'src/services/app-builds-service';
 import { HttpError } from 'types/errors';
-import { Region } from 'types/general/region';
 import { AppVersionDeploymentStatus } from 'types/services/push-service';
 import logger from 'utils/logger';
+import { getRegionFromString } from 'utils/region';
 
 const printDeploymentStatus = (
   appVersionId: number,
@@ -37,7 +37,7 @@ export default class Status extends AuthenticatedCommand {
   static examples = ['<%= config.bin %> <%= command.id %> -i APP_VERSION_ID'];
 
   static flags = Status.serializeFlags(
-    addToRegionToFlags({
+    addRegionToFlags({
       appVersionId: Flags.integer({
         char: 'i',
         aliases: ['v'],
@@ -48,7 +48,8 @@ export default class Status extends AuthenticatedCommand {
 
   public async run(): Promise<void> {
     const { flags } = await this.parse(Status);
-    const { region } = flags;
+    const { region: strRegion } = flags;
+    const region = getRegionFromString(strRegion);
     let appVersionId = flags.appVersionId;
     try {
       if (!appVersionId) {
@@ -57,8 +58,8 @@ export default class Status extends AuthenticatedCommand {
       }
 
       this.preparePrintCommand(this, { appVersionId });
-      const deploymentStatus = await getAppVersionDeploymentStatus(appVersionId, region as Region);
-      const mondayCodeRelease = await getMondayCodeBuild(appVersionId, region as Region);
+      const deploymentStatus = await getAppVersionDeploymentStatus(appVersionId, region);
+      const mondayCodeRelease = await getMondayCodeBuild(appVersionId, region);
 
       if (deploymentStatus.deployment) {
         deploymentStatus.deployment.liveUrl = mondayCodeRelease?.data?.liveUrl;

src/commands/utils/region.ts

@@ -12,8 +12,8 @@ export const regionFlag = {
   }),
 };
 
-export function addToRegionToFlags<T>(flags: T): T {
-  if (isPermitted(Permissions.MULTI_REGION)) {
+export function addRegionToFlags<T>(flags: T): T {
+  if (isPermitted(Permissions.MCODE_MULTI_REGION)) {
     return {
       ...flags,
       ...regionFlag,

src/services/manage-app-env-service.ts

@@ -10,7 +10,7 @@
 import { HttpMethodTypes } from 'types/services/api-service';
 import { ListAppEnvironmentKeysResponse } from 'types/services/manage-app-env-service';
 import logger from 'utils/logger';
-import { queryBuilderAddRegion } from 'utils/region';
+import { addRegionToQuery } from 'utils/region';
 import { appsUrlBuilder } from 'utils/urls-builder';
 
 const handleHttpErrors = (error: HttpError) => {
@@ -33,7 +33,7 @@
   try {
     const path = appEnvironmentKeysUrl(appId);
     const url = appsUrlBuilder(path);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
 
     const response = await execute<ListAppEnvironmentKeysResponse>(
       {
@@ -59,7 +59,7 @@
   try {
     const path = appEnvironmentUrl(appId, key);
     const url = appsUrlBuilder(path);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
 
     await execute({
       query,
@@ -81,7 +81,7 @@
   try {
     const path = appEnvironmentUrl(appId, key);
     const url = appsUrlBuilder(path);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
 
     await execute({
       query,
@@ -144,7 +144,7 @@
   key?: string,
   value?: string,
   region?: Region,
 ) => {
   if (!appId || !mode) {
     throw new Error('appId and mode are required');
   }

src/services/notification-service.ts

@@ -9,7 +9,7 @@ import { Region } from 'types/general/region';
 import { HttpMethodTypes } from 'types/services/api-service';
 import { ClientChannel } from 'types/services/notification-service';
 import logger from 'utils/logger';
-import { queryBuilderAddRegion } from 'utils/region';
+import { addRegionToQuery } from 'utils/region';
 import { appsUrlBuilder } from 'utils/urls-builder';
 
 export const logsStream = async (
@@ -22,7 +22,7 @@ export const logsStream = async (
     const logsStreamForUrl = getLogsStreamForAppVersionIdUrl(appVersionId, logsType, logsFilterCriteria);
     const url = appsUrlBuilder(logsStreamForUrl);
     logger.debug(`fetching logs url: ${url}`);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
     const response = await execute<ClientChannel>(
       {
         query,

src/services/push-service.ts

@@ -29,15 +29,15 @@ import {
 } from 'types/services/push-service';
 import logger from 'utils/logger';
 import { createProgressBarString } from 'utils/progress-bar';
-import { queryBuilderAddRegion } from 'utils/region';
+import { addRegionToQuery } from 'utils/region';
 import { appsUrlBuilder } from 'utils/urls-builder';
 
 export const getSignedStorageUrl = async (appVersionId: number, region?: Region): Promise<string> => {
   const DEBUG_TAG = 'get_signed_storage_url';
   try {
     const baseSignUrl = getDeploymentSignedUrl(appVersionId);
     const url = appsUrlBuilder(baseSignUrl);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
 
     const response = await execute<SignedUrl>(
       {
@@ -77,7 +77,7 @@ export const getAppVersionDeploymentStatus = async (appVersionId: number, region
   try {
     const baseAppVersionIdStatusUrl = getAppVersionDeploymentStatusUrl(appVersionId);
     const url = appsUrlBuilder(baseAppVersionIdStatusUrl);
-    const query = queryBuilderAddRegion({}, region);
+    const query = addRegionToQuery({}, region);
 
     const response = await execute<AppVersionDeploymentStatus>(
       {