feat: GCP handling in CLI (#2631)

Synced from monorepo@dd3da607cce506b5497c04ac07c44774e7954892

Author: divyenduz

.sync-commit

@@ -1 +1 @@
-1da65b45fc9190b0ae85a8d80fb43e2891fdeab0
+dd3da607cce506b5497c04ac07c44774e7954892

src/commands/branch/create.ts

@@ -297,7 +297,13 @@ export async function implementation(this: LocalContext, flags: Flags) {
   }
 
   if (!flags['parent-branch']) {
-    flags['parent-branch'] = await this.getBranch(this, {}, { organizationId, projectId });
+    const branches = await this.api.branches.listBranches({
+      pathParams: { organizationID: organizationId, projectID: projectId }
+    });
+    flags['parent-branch'] = '';
+    if (branches.branches.length > 0) {
+      flags['parent-branch'] = await this.getBranch(this, {}, { organizationId, projectId });
+    }
   }
 
   const parentBranchId = flags['parent-branch'];

src/lib/cli-utils.ts

@@ -262,9 +262,32 @@ type Region = {
   id: string;
   publicAccess: boolean;
   backupsEnabled: boolean;
+  provider: 'aws' | 'gcp' | 'custom';
   organizationId: string | null;
 };
 
+const regionProviderLabels = {
+  aws: 'AWS',
+  gcp: 'GCP',
+  custom: 'Custom'
+} satisfies Record<Region['provider'], string>;
+
+const regionProviderColors = {
+  aws: chalk.hex('#FF9900'),
+  gcp: chalk.hex('#4285F4'),
+  custom: chalk.gray
+} satisfies Record<Region['provider'], (text: string) => string>;
+
+function formatRegionProvider(provider: Region['provider']) {
+  const label = `(${regionProviderLabels[provider]})`;
+  return regionProviderColors[provider](label);
+}
+
+function formatRegionChoiceMessage(region: Region, group?: 'Organization' | 'Global') {
+  const prefix = group ? `[${group}] ` : '';
+  return `${prefix}${region.id} ${formatRegionProvider(region.provider)}`;
+}
+
 export function groupAndSortRegions(regions: Region[]): { name: string; message: string }[] {
   const organizationRegions = regions.filter((r) => r.organizationId !== null);
   const globalRegions = regions.filter((r) => r.organizationId === null);
@@ -280,11 +303,11 @@ export function groupAndSortRegions(regions: Region[]): { name: string; message:
   return [
     ...organizationRegions.map((region) => ({
       name: region.id,
-      message: showGroups ? `[Organization] ${region.id}` : region.id
+      message: formatRegionChoiceMessage(region, showGroups ? 'Organization' : undefined)
     })),
     ...sortedGlobalRegions.map((region) => ({
       name: region.id,
-      message: showGroups ? `[Global] ${region.id}` : region.id
+      message: formatRegionChoiceMessage(region, showGroups ? 'Global' : undefined)
     }))
   ];
 }

src/lib/cli-utils.unit.test.ts

@@ -7,6 +7,7 @@ type Region = {
   id: string;
   publicAccess: boolean;
   backupsEnabled: boolean;
+  provider: 'aws' | 'gcp' | 'custom';
   organizationId: string | null;
 };
 
@@ -18,8 +19,12 @@ const normalizeTableOutput = (output: string) => {
     .map((line) => line.split(/\s+/));
 };
 
-function createRegion(id: string, organizationId: string | null = null): Region {
-  return { id, publicAccess: true, backupsEnabled: true, organizationId };
+function stripMessages(choices: { name: string; message: string }[]) {
+  return choices.map((choice) => ({ ...choice, message: stripAnsi(choice.message) }));
+}
+
+function createRegion(id: string, organizationId: string | null = null, provider: Region['provider'] = 'aws'): Region {
+  return { id, publicAccess: true, backupsEnabled: true, provider, organizationId };
 }
 
 describe('groupAndSortRegions', () => {
@@ -29,9 +34,20 @@ describe('groupAndSortRegions', () => {
 
       const result = groupAndSortRegions(regions);
 
-      expect(result).toEqual([
-        { name: 'us-east-1', message: 'us-east-1' },
-        { name: 'eu-west-1', message: 'eu-west-1' }
+      expect(stripMessages(result)).toEqual([
+        { name: 'us-east-1', message: 'us-east-1 (AWS)' },
+        { name: 'eu-west-1', message: 'eu-west-1 (AWS)' }
+      ]);
+    });
+
+    it('should add cloud provider labels to region messages', () => {
+      const regions = [createRegion('us-east-1', null, 'aws'), createRegion('europe-west1', null, 'gcp')];
+
+      const result = groupAndSortRegions(regions);
+
+      expect(stripMessages(result)).toEqual([
+        { name: 'us-east-1', message: 'us-east-1 (AWS)' },
+        { name: 'europe-west1', message: 'europe-west1 (GCP)' }
       ]);
     });
 
@@ -58,22 +74,30 @@ describe('groupAndSortRegions', () => {
 
       const result = groupAndSortRegions(regions);
 
-      expect(result).toEqual([
-        { name: 'org-region-1', message: 'org-region-1' },
-        { name: 'org-region-2', message: 'org-region-2' }
+      expect(stripMessages(result)).toEqual([
+        { name: 'org-region-1', message: 'org-region-1 (AWS)' },
+        { name: 'org-region-2', message: 'org-region-2 (AWS)' }
       ]);
     });
+
+    it('should add custom provider labels to organization region messages', () => {
+      const regions = [createRegion('org-region-1', 'org-123', 'custom')];
+
+      const result = groupAndSortRegions(regions);
+
+      expect(stripMessages(result)).toEqual([{ name: 'org-region-1', message: 'org-region-1 (Custom)' }]);
+    });
   });
 
   describe('with both global and organization regions', () => {
     it('should add group prefixes to messages', () => {
-      const regions = [createRegion('us-east-1'), createRegion('org-region-1', 'org-123')];
+      const regions = [createRegion('us-east-1'), createRegion('org-region-1', 'org-123', 'custom')];
 
       const result = groupAndSortRegions(regions);
 
-      expect(result).toEqual([
-        { name: 'org-region-1', message: '[Organization] org-region-1' },
-        { name: 'us-east-1', message: '[Global] us-east-1' }
+      expect(stripMessages(result)).toEqual([
+        { name: 'org-region-1', message: '[Organization] org-region-1 (Custom)' },
+        { name: 'us-east-1', message: '[Global] us-east-1 (AWS)' }
       ]);
     });
 
@@ -116,15 +140,15 @@ describe('groupAndSortRegions', () => {
 
       const result = groupAndSortRegions(regions);
 
-      expect(result).toEqual([{ name: 'us-west-2', message: 'us-west-2' }]);
+      expect(stripMessages(result)).toEqual([{ name: 'us-west-2', message: 'us-west-2 (AWS)' }]);
     });
 
     it('should handle single organization region', () => {
       const regions = [createRegion('org-region-1', 'org-123')];
 
       const result = groupAndSortRegions(regions);
 
-      expect(result).toEqual([{ name: 'org-region-1', message: 'org-region-1' }]);
+      expect(stripMessages(result)).toEqual([{ name: 'org-region-1', message: 'org-region-1 (AWS)' }]);
     });
   });
 });