[cli] Fix bugs around --configure and saving the wrong deployment name (#35753)

The previous code was only respecting `--configure=new`, not `--configure=existing` or `--configure` (I'll look into adding a test).

There was also a bug where `npx convex dev` with a prod deployment stored in `CONVEX_DEPLOYMENT` would update the `CONVEX_DEPLOYMENT` to `dev:<name of prod deployment>` (but would still push to the right deployment)

GitOrigin-RevId: a2367f2b4fdca4517a0e466d61e11c90f27c2891

Author: sshader

npm-packages/convex/src/cli/configure.ts

@@ -112,6 +112,56 @@ export async function deploymentCredentialsOrConfigure(
       teamSlug: string | null;
     } | null;
   }
+> {
+  const selectedDeployment = await _deploymentCredentialsOrConfigure(
+    ctx,
+    deploymentSelection,
+    chosenConfiguration,
+    cmdOptions,
+    partitionId,
+  );
+
+  if (selectedDeployment.deploymentFields !== null) {
+    await updateEnvAndConfigForDeploymentSelection(
+      ctx,
+      {
+        url: selectedDeployment.url,
+        deploymentName: selectedDeployment.deploymentFields.deploymentName,
+        teamSlug: selectedDeployment.deploymentFields.teamSlug,
+        projectSlug: selectedDeployment.deploymentFields.projectSlug,
+        deploymentType: selectedDeployment.deploymentFields
+          .deploymentType as DeploymentType,
+      },
+      deploymentNameFromSelection(deploymentSelection),
+    );
+  } else {
+    await handleManuallySetUrlAndAdminKey(ctx, {
+      url: selectedDeployment.url,
+      adminKey: selectedDeployment.adminKey,
+    });
+  }
+  return {
+    url: selectedDeployment.url,
+    adminKey: selectedDeployment.adminKey,
+    deploymentFields: selectedDeployment.deploymentFields,
+  };
+}
+
+export async function _deploymentCredentialsOrConfigure(
+  ctx: Context,
+  deploymentSelection: DeploymentSelection,
+  chosenConfiguration: ChosenConfiguration,
+  cmdOptions: ConfigureCmdOptions,
+  partitionId?: number | undefined,
+): Promise<
+  DeploymentCredentials & {
+    deploymentFields: {
+      deploymentName: DeploymentName;
+      deploymentType: string;
+      projectSlug: string | null;
+      teamSlug: string | null;
+    } | null;
+  }
 > {
   const config = readGlobalConfig(ctx);
   const globallyForceCloud = !!config?.optOutOfLocalDevDeploymentsUntilBetaOver;
@@ -174,12 +224,7 @@ export async function deploymentCredentialsOrConfigure(
         overrideAuthUsername: cmdOptions.overrideAuthUsername,
         overrideAuthPassword: cmdOptions.overrideAuthPassword,
       });
-      const accessResult = await checkAccessToSelectedProject(
-        ctx,
-        deploymentSelection.targetProject,
-      );
-      if (accessResult.kind === "noAccess") {
-        logMessage(ctx, "You don't have access to the selected project.");
+      if (chosenConfiguration !== null) {
         const result = await handleChooseProject(
           ctx,
           chosenConfiguration,
@@ -191,7 +236,13 @@ export async function deploymentCredentialsOrConfigure(
         );
         return result;
       }
-      if (chosenConfiguration === "new") {
+
+      const accessResult = await checkAccessToSelectedProject(
+        ctx,
+        deploymentSelection.targetProject,
+      );
+      if (accessResult.kind === "noAccess") {
+        logMessage(ctx, "You don't have access to the selected project.");
         const result = await handleChooseProject(
           ctx,
           chosenConfiguration,
@@ -211,33 +262,17 @@ export async function deploymentCredentialsOrConfigure(
         // We'll start running it below
         { ensureLocalRunning: false },
       );
-
-      if (selectedDeployment.deploymentFields !== null) {
-        await updateEnvAndConfigForDeploymentSelection(
-          ctx,
-          {
-            url: selectedDeployment.url,
-            deploymentName: selectedDeployment.deploymentFields.deploymentName,
-            teamSlug: selectedDeployment.deploymentFields.teamSlug,
-            projectSlug: selectedDeployment.deploymentFields.projectSlug,
-            deploymentType: selectedDeployment.deploymentFields
-              .deploymentType as DeploymentType,
-          },
-          deploymentNameFromSelection(deploymentSelection),
-        );
-        if (
-          selectedDeployment.deploymentFields !== null &&
-          selectedDeployment.deploymentFields.deploymentType === "local"
-        ) {
-          await handleLocalDeployment(ctx, {
-            teamSlug: selectedDeployment.deploymentFields.teamSlug!,
-            projectSlug: selectedDeployment.deploymentFields.projectSlug!,
-            forceUpgrade: cmdOptions.localOptions.forceUpgrade,
-            ports: cmdOptions.localOptions.ports,
-            backendVersion: cmdOptions.localOptions.backendVersion,
-          });
-        }
-        return selectedDeployment;
+      if (
+        selectedDeployment.deploymentFields !== null &&
+        selectedDeployment.deploymentFields.deploymentType === "local"
+      ) {
+        await handleLocalDeployment(ctx, {
+          teamSlug: selectedDeployment.deploymentFields.teamSlug!,
+          projectSlug: selectedDeployment.deploymentFields.projectSlug!,
+          forceUpgrade: cmdOptions.localOptions.forceUpgrade,
+          ports: cmdOptions.localOptions.ports,
+          backendVersion: cmdOptions.localOptions.backendVersion,
+        });
       }
       return {
         url: selectedDeployment.url,
@@ -299,17 +334,6 @@ async function handleChooseProject(
     deploymentOptions,
     partitionId: args.partitionId,
   });
-  await updateEnvAndConfigForDeploymentSelection(
-    ctx,
-    {
-      url,
-      deploymentName,
-      teamSlug: project.teamSlug,
-      projectSlug: project.projectSlug,
-      deploymentType: deploymentOptions.kind,
-    },
-    null,
-  );
   return {
     url,
     adminKey,

npm-packages/convex/src/cli/lib/api.ts

@@ -378,7 +378,7 @@ async function fetchExistingDevDeploymentCredentialsOrCrash(
       undefined,
     );
   return {
-    deploymentName,
+    deploymentName: credentials.deploymentName,
     adminKey: credentials.adminKey,
     url: credentials.deploymentUrl,
     deploymentType: "dev",
@@ -413,16 +413,10 @@ async function handleOwnDev(
           deploymentType: "local",
         };
       }
-      // Note -- this returns the deployment with that name iff it's a dev deployment,
-      // but it does not actually check that the deployment belongs to the current member.
-      const credentials = await fetchExistingDevDeploymentCredentialsOrCrash(
+      return await fetchExistingDevDeploymentCredentialsOrCrash(
         ctx,
         projectSelection.deploymentName,
       );
-      return {
-        ...credentials,
-        deploymentName: projectSelection.deploymentName,
-      };
     }
     case "teamAndProjectSlugs":
     case "projectDeployKey": {