Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-04-14 23:51:49 -05:00
Code Issues Activity

Prevent errors in finding workspaceId from interrupting link prompts (#10681)

Browse source
This commit is contained in:
Matthew Phillips 2024-04-04 15:13:46 -04:00 • committed by GitHub
parent 9a1aee80a5
commit 4bf8bd3848
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/khaki-turkeys-sip.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---
Prevent errors in finding workspaceId from interrupting link prompts

25
packages/db/src/core/cli/commands/link/index.ts
View file

@ -16,18 +16,20 @@ export async function cmd() {
console.error(MISSING_SESSION_ID_ERROR);
process.exit(1);
}
const getWorkspaceIdAsync = getWorkspaceId();
const getWorkspaceIdAsync = getWorkspaceId().catch(err => {
return err as Error;
});
await promptBegin();
const isLinkExisting = await promptLinkExisting();
if (isLinkExisting) {
const workspaceId = await getWorkspaceIdAsync;
const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
const existingProjectData = await promptExistingProjectName({ workspaceId });
return await linkProject(existingProjectData.id);
}
const isLinkNew = await promptLinkNew();
if (isLinkNew) {
const workspaceId = await getWorkspaceIdAsync;
const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
const newProjectName = await promptNewProjectName();
const newProjectRegion = await promptNewProjectRegion();
const spinner = ora('Creating new project...').start();
@ -64,26 +66,31 @@ async function getWorkspaceId(): Promise<string> {
(res) => {
// Unauthorized
if (res.status === 401) {
console.error(
throw new Error(
`${bgRed('Unauthorized')}\n\n Are you logged in?\n Run ${cyan(
'astro db login'
)} to authenticate and then try linking again.\n\n`
);
process.exit(1);
}
console.error(`Failed to fetch user workspace: ${res.status} ${res.statusText}`);
process.exit(1);
throw new Error(`Failed to fetch user workspace: ${res.status} ${res.statusText}`);
}
);
const { data, success } = (await response.json()) as Result<{ id: string }[]>;
if (!success) {
console.error(`Failed to fetch user's workspace.`);
process.exit(1);
throw new Error(`Failed to fetch user's workspace.`);
}
return data[0].id;
}
function unwrapWorkspaceId(workspaceId: string | Error): string {
if(typeof workspaceId !== 'string') {
console.error(workspaceId.message);
process.exit(1);
}
return workspaceId;
}
export async function createNewProject({
workspaceId,
name,