Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-24 23:21:57 -05:00
Code Issues Activity

Provide a better error for when the app token is missing in CI (#10918)

Browse source
This commit is contained in:
Matthew Phillips 2024-04-30 16:22:26 -04:00 • committed by GitHub
parent fd7a9ed337
commit ca605f4dd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/happy-pumpkins-rescue.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---
Provide a better error message when app token is missing in CI

1
packages/db/package.json
View file

@ -72,6 +72,7 @@
"dependencies": { "dependencies": {
"@libsql/client": "^0.6.0", "@libsql/client": "^0.6.0",
"async-listen": "^3.0.1", "async-listen": "^3.0.1",
"ci-info": "^4.0.0",
"deep-diff": "^1.0.2", "deep-diff": "^1.0.2",
"drizzle-orm": "^0.30.9", "drizzle-orm": "^0.30.9",
"github-slugger": "^2.0.0", "github-slugger": "^2.0.0",

4
packages/db/src/core/errors.ts
View file

@ -1,5 +1,9 @@
import { bold, cyan, red } from 'kleur/colors'; import { bold, cyan, red } from 'kleur/colors';
export const MISSING_SESSION_ID_CI_ERROR = `${red('▶ ASTRO_STUDIO_APP_TOKEN required')}
To authenticate with Astro Studio add the token to your CI's environment variables.\n`;
export const MISSING_SESSION_ID_ERROR = `${red('▶ Login required!')} export const MISSING_SESSION_ID_ERROR = `${red('▶ Login required!')}
To authenticate with Astro Studio, run To authenticate with Astro Studio, run

14
packages/db/src/core/tokens.ts
View file

@ -5,8 +5,9 @@ import { pathToFileURL } from 'node:url';
import { green } from 'kleur/colors'; import { green } from 'kleur/colors';
import ora from 'ora'; import ora from 'ora';
import { safeFetch } from '../runtime/utils.js'; import { safeFetch } from '../runtime/utils.js';
import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_ERROR } from './errors.js'; import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_CI_ERROR, MISSING_SESSION_ID_ERROR } from './errors.js';
import { getAstroStudioEnv, getAstroStudioUrl } from './utils.js'; import { getAstroStudioEnv, getAstroStudioUrl } from './utils.js';
import ci from 'ci-info';
export const SESSION_LOGIN_FILE = pathToFileURL(join(homedir(), '.astro', 'session-token')); export const SESSION_LOGIN_FILE = pathToFileURL(join(homedir(), '.astro', 'session-token'));
export const PROJECT_ID_FILE = pathToFileURL(join(process.cwd(), '.astro', 'link')); export const PROJECT_ID_FILE = pathToFileURL(join(process.cwd(), '.astro', 'link'));
@ -182,12 +183,17 @@ export async function getManagedAppTokenOrExit(token?: string): Promise<ManagedA
} }
const sessionToken = await getSessionIdFromFile(); const sessionToken = await getSessionIdFromFile();
if (!sessionToken) { if (!sessionToken) {
// eslint-disable-next-line no-console if(ci.isCI) {
console.error(MISSING_SESSION_ID_ERROR); // eslint-disable-next-line no-console
console.error(MISSING_SESSION_ID_CI_ERROR);
} else {
// eslint-disable-next-line no-console
console.error(MISSING_SESSION_ID_ERROR);
}
process.exit(1); process.exit(1);
} }
const projectId = await getProjectIdFromFile(); const projectId = await getProjectIdFromFile();
if (!sessionToken || !projectId) { if (!projectId) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error(MISSING_PROJECT_ID_ERROR); console.error(MISSING_PROJECT_ID_ERROR);
process.exit(1); process.exit(1);

3
pnpm-lock.yaml generated
View file

@ -3874,6 +3874,9 @@ importers:
async-listen: async-listen:
specifier: ^3.0.1 specifier: ^3.0.1
version: 3.0.1 version: 3.0.1
ci-info:
specifier: ^4.0.0
version: 4.0.0
deep-diff: deep-diff:
specifier: ^1.0.2 specifier: ^1.0.2
version: 1.0.2 version: 1.0.2