[eas-cli][eas-update] Add rollback disambiguation command

CHANGELOG.md

@@ -8,6 +8,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add rollback disambiguation command. ([#2004](https://github.com/expo/eas-cli/pull/2004) by [@wschurman](https://github.com/wschurman))
+
 ### 🐛 Bug fixes
 
 ### 🧹 Chores

packages/eas-cli/src/commands/update/__tests__/republish.test.ts

@@ -57,12 +57,6 @@ jest.mock('../../../fetch');
 describe(UpdateRepublish.name, () => {
   afterEach(() => vol.reset());
 
-  it('errors without --channel, --branch, or --group', async () => {
-    await expect(new UpdateRepublish([], commandOptions).run()).rejects.toThrow(
-      '--channel, --branch, or --group must be specified'
-    );
-  });
-
   it('errors when providing both --group and --branch', async () => {
     const flags = ['--group=1234', '--branch=main'];
 

packages/eas-cli/src/commands/update/republish.ts

@@ -1,6 +1,8 @@
 import { Platform } from '@expo/config';
 import { Flags } from '@oclif/core';
 
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
@@ -151,9 +153,6 @@ export default class UpdateRepublish extends EasCommand {
     if (nonInteractive && !groupId) {
       throw new Error('Only --group can be used in non-interactive mode');
     }
-    if (!groupId && !(branchName || channelName)) {
-      throw new Error(`--channel, --branch, or --group must be specified`);
-    }
 
     const platform =
       rawFlags.platform === 'all' ? defaultRepublishPlatforms : ([rawFlags.platform] as Platform[]);
@@ -190,6 +189,10 @@ async function getOrAskUpdatesAsync(
     }));
   }
 
+  if (flags.nonInteractive) {
+    throw new Error('Must supply --group when in non-interactive mode');
+  }
+
   if (flags.branchName) {
     return await askUpdatesFromBranchNameAsync(graphqlClient, {
       ...flags,
@@ -206,7 +209,55 @@ async function getOrAskUpdatesAsync(
     });
   }
 
-  throw new Error('--channel, --branch, or --group is required');
+  const { choice } = await promptAsync({
+    type: 'select',
+    message: 'Find update by branch or channel?',
+    name: 'choice',
+    choices: [
+      { title: 'Branch', value: 'branch' },
+      { title: 'Channel', value: 'channel' },
+    ],
+  });
+
+  if (choice === 'channel') {
+    const { name } = await selectChannelOnAppAsync(graphqlClient, {
+      projectId,
+      selectionPromptTitle: 'Select a channel to view',
+      paginatedQueryOptions: {
+        json: flags.json,
+        nonInteractive: flags.nonInteractive,
+        offset: 0,
+      },
+    });
+
+    return await askUpdatesFromChannelNameAsync(graphqlClient, {
+      ...flags,
+      channelName: name,
+      projectId,
+    });
+  } else if (choice === 'branch') {
+    const { name } = await selectBranchOnAppAsync(graphqlClient, {
+      projectId,
+      promptTitle: 'Select branch from which to choose update',
+      displayTextForListItem: updateBranch => ({
+        title: updateBranch.name,
+      }),
+      // discard limit and offset because this query is not their intended target
+      paginatedQueryOptions: {
+        json: flags.json,
+        nonInteractive: flags.nonInteractive,
+        offset: 0,
+      },
+    });
+
+    return await askUpdatesFromBranchNameAsync(graphqlClient, {
+      ...flags,
+      branchName: name,
+      projectId,
+    });
+  } else {
+    throw new Error('Must choose update via channel or branch');
+  }
 }
 
 /** Ask the user which update needs to be republished by branch name, this requires interactive mode */
@@ -219,10 +270,6 @@ async function askUpdatesFromBranchNameAsync(
     nonInteractive,
   }: { projectId: string; branchName: string; json: boolean; nonInteractive: boolean }
 ): Promise<UpdateToRepublish[]> {
-  if (nonInteractive) {
-    throw new Error('Must supply --group when in non-interactive mode');
-  }
-
   const updateGroup = await selectUpdateGroupOnBranchAsync(graphqlClient, {
     projectId,
     branchName,
@@ -246,10 +293,6 @@ async function askUpdatesFromChannelNameAsync(
     nonInteractive,
   }: { projectId: string; channelName: string; json: boolean; nonInteractive: boolean }
 ): Promise<UpdateToRepublish[]> {
-  if (nonInteractive) {
-    throw new Error('Must supply --group when in non-interactive mode');
-  }
-
   const branchName = await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName);
 
   return await askUpdatesFromBranchNameAsync(graphqlClient, {

packages/eas-cli/src/commands/update/rollback.ts

@@ -0,0 +1,42 @@
+import { Flags } from '@oclif/core';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { promptAsync } from '../../prompts';
+import UpdateRepublish from './republish';
+import UpdateRollBackToEmbedded from './roll-back-to-embedded';
+
+export default class UpdateRollback extends EasCommand {
+  static override description = 'roll back to an embedded update or an existing update';
+
+  static override hidden = true;
+
+  static override flags = {
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(UpdateRollback);
+
+    const { choice } = await promptAsync({
+      type: 'select',
+      message: 'Which type of update would you like to roll back to?',
+      name: 'choice',
+      choices: [
+        { title: 'Published Update', value: 'published' },
+        { title: 'Embedded Update', value: 'embedded' },
+      ],
+    });
+
+    const privateKeyPathArg = flags['private-key-path']
+      ? ['--private-key-path', flags['private-key-path']]
+      : [];
+    if (choice === 'published') {
+      await UpdateRepublish.run(privateKeyPathArg);
+    } else {
+      await UpdateRollBackToEmbedded.run(privateKeyPathArg);
+    }
+  }
+}