[eas-cli] Automatically migrate build credentials to EAS

packages/eas-cli/src/credentials/android/actions/BuildCredentialsUtils.ts

@@ -3,10 +3,9 @@ import { nanoid } from 'nanoid';
 import ora from 'ora';
 
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
-import Log from '../../../log';
 import { getApplicationId } from '../../../project/android/applicationId';
 import { getProjectAccountName, getProjectConfigDescription } from '../../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../../prompts';
+import { promptAsync } from '../../../prompts';
 import { findAccountByName } from '../../../user/Account';
 import { Context } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
@@ -34,62 +33,57 @@ export async function promptUserAndCopyLegacyCredentialsAsync(
   ctx: Context,
   app: AppLookupParams
 ): Promise<void> {
-  assert(
-    !ctx.nonInteractive,
-    'Copying over Expo Classic credentials cannot be run in non-interactive mode'
-  );
   assert(
     await canCopyLegacyCredentialsAsync(ctx, app),
-    'User not eligible to copy Expo Classic credentials to EAS'
+    'User not eligible to copy classic build credentials to EAS'
   );
-  const shouldCopy = await confirmAsync({
-    message: `We've detected credentials from Expo Classic (expo-cli). Would you like to copy them over to Expo Application Services (EAS)?`,
-  });
-  if (!shouldCopy) {
-    return;
-  }
 
-  Log.log('Copying credentials...');
-  const spinner = ora().start();
+  const spinner = ora('Classic credentials detected, copying to EAS...').start();
 
-  const legacyAppCredentials = await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(
-    app
-  );
-  if (!legacyAppCredentials) {
-    return;
-  }
+  try {
+    const legacyAppCredentials = await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(
+      app
+    );
+    if (!legacyAppCredentials) {
+      return;
+    }
 
-  const appCredentials = await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
-    app
-  );
-  const legacyFcm = legacyAppCredentials.androidFcm;
-  if (legacyFcm) {
-    const clonedFcm = await ctx.android.createFcmAsync(
-      app.account,
-      legacyFcm.credential,
-      legacyFcm.version
+    const appCredentials = await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
+      app
     );
-    await ctx.android.updateAndroidAppCredentialsAsync(appCredentials, {
-      androidFcmId: clonedFcm.id,
-    });
-  }
+    const legacyFcm = legacyAppCredentials.androidFcm;
+    if (legacyFcm) {
+      const clonedFcm = await ctx.android.createFcmAsync(
+        app.account,
+        legacyFcm.credential,
+        legacyFcm.version
+      );
+      await ctx.android.updateAndroidAppCredentialsAsync(appCredentials, {
+        androidFcmId: clonedFcm.id,
+      });
+    }
 
-  const legacyBuildCredentials = await ctx.android.getLegacyAndroidAppBuildCredentialsAsync(app);
-  const legacyKeystore = legacyBuildCredentials?.androidKeystore ?? null;
-
-  if (legacyKeystore) {
-    const clonedKeystore = await ctx.android.createKeystoreAsync(app.account, {
-      keystore: legacyKeystore.keystore,
-      keystorePassword: legacyKeystore.keystorePassword,
-      keyAlias: legacyKeystore.keyAlias,
-      keyPassword: legacyKeystore.keyPassword ?? undefined,
-      type: legacyKeystore.type,
-    });
-    await createOrUpdateDefaultAndroidAppBuildCredentialsAsync(ctx, app, {
-      androidKeystoreId: clonedKeystore.id,
-    });
+    const legacyBuildCredentials = await ctx.android.getLegacyAndroidAppBuildCredentialsAsync(app);
+    const legacyKeystore = legacyBuildCredentials?.androidKeystore ?? null;
+
+    if (legacyKeystore) {
+      const clonedKeystore = await ctx.android.createKeystoreAsync(app.account, {
+        keystore: legacyKeystore.keystore,
+        keystorePassword: legacyKeystore.keystorePassword,
+        keyAlias: legacyKeystore.keyAlias,
+        keyPassword: legacyKeystore.keyPassword ?? undefined,
+        type: legacyKeystore.type,
+      });
+      await createOrUpdateDefaultAndroidAppBuildCredentialsAsync(ctx, app, {
+        androidKeystoreId: clonedKeystore.id,
+      });
+    }
+  } catch (e) {
+    spinner.fail(`Unable to migrate credentials to EAS.`);
+    throw e;
   }
-  spinner.succeed('Credentials successfully copied');
+
+  spinner.succeed('Credentials copied to EAS.');
 }
 
 export function getAppLookupParamsFromContext(ctx: Context): AppLookupParams {
@@ -135,9 +129,8 @@ export async function createOrUpdateDefaultAndroidAppBuildCredentialsAsync(
       { androidKeystoreId }
     );
   }
-  const providedName = await promptForNameAsync();
   return await ctx.android.createAndroidAppBuildCredentialsAsync(appLookupParams, {
-    name: providedName,
+    name: generateRandomName(),
     isDefault: true,
     androidKeystoreId,
   });

packages/eas-cli/src/credentials/android/actions/SetupBuildCredentials.ts

@@ -1,4 +1,5 @@
 import nullthrows from 'nullthrows';
+import ora from 'ora';
 
 import {
   AndroidAppBuildCredentialsFragment,
@@ -94,9 +95,9 @@ export class SetupBuildCredentials {
     );
     const defaultKeystore = defaultBuildCredentials?.androidKeystore ?? null;
     if (defaultKeystore) {
-      Log.log(
+      ora(
         `Using Keystore from configuration: ${nullthrows(defaultBuildCredentials).name} (default)`
-      );
+      ).succeed();
       return defaultBuildCredentials;
     }
     return null;
@@ -118,11 +119,11 @@ export class SetupBuildCredentials {
     const keystore = maybeBuildCredentials?.androidKeystore ?? null;
     if (keystore) {
       const buildCredentials = nullthrows(maybeBuildCredentials);
-      Log.log(
+      ora(
         `Using Keystore from configuration: ${buildCredentials.name}${
           buildCredentials.isDefault ? ' (default)' : ''
         }`
-      );
+      ).succeed();
       return buildCredentials;
     }
     Log.log(