[eas-cli] Remove random branch name generation for --auto branch name…

… non-vcs fallback (#2747)
expo · Dec 10, 2024 · 3740ee4 · 3740ee4
1 parent 751d3d1
commit 3740ee4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
+- Remove random branch name generation for --auto branch name non-vcs fallback. ([#2747](https://github.com/expo/eas-cli/pull/2747) by [@wschurman](https://github.com/wschurman))
+
 ### 🧹 Chores
 
 ## [14.1.0](https://github.com/expo/eas-cli/releases/tag/v14.1.0) - 2024-12-10

diff --git a/packages/eas-cli/src/branch/utils.ts b/packages/eas-cli/src/branch/utils.ts
@@ -1,9 +1,7 @@
 import { Client } from '../vcs/vcs';
 
-export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string> {
-  return (
-    (await vcsClient.getBranchNameAsync()) || `branch-${Math.random().toString(36).substring(2, 4)}`
-  );
+export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string | null> {
+  return await vcsClient.getBranchNameAsync();
 }
 
 export class BranchNotFoundError extends Error {

diff --git a/packages/eas-cli/src/commands/branch/create.ts b/packages/eas-cli/src/commands/branch/create.ts
@@ -58,7 +58,7 @@ export default class BranchCreate extends EasCommand {
         type: 'text',
         name: 'name',
         message: 'Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(vcsClient),
+        initial: (await getDefaultBranchNameAsync(vcsClient)) ?? undefined,
         validate: value => (value ? true : validationMessage),
       }));
     }

diff --git a/packages/eas-cli/src/project/publish.ts b/packages/eas-cli/src/project/publish.ts
@@ -634,7 +634,13 @@ export async function getBranchNameForCommandAsync({
   }
 
   if (autoFlag) {
-    return await getDefaultBranchNameAsync(vcsClient);
+    const defaultBranchNameFromVcs = await getDefaultBranchNameAsync(vcsClient);
+    if (!defaultBranchNameFromVcs) {
+      throw new Error(
+        'Must supply --branch or --channel for branch name as auto-detection of branch name via --auto is not supported when no VCS is present.'
+      );
+    }
+    return defaultBranchNameFromVcs;
   } else if (nonInteractive) {
     throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode.');
   } else {
@@ -658,7 +664,7 @@ export async function getBranchNameForCommandAsync({
         type: 'text',
         name: 'name',
         message: 'No branches found. Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(vcsClient),
+        initial: (await getDefaultBranchNameAsync(vcsClient)) ?? undefined,
         validate: value => (value ? true : 'Branch name may not be empty.'),
       });
       branchName = name;