mirror of
https://github.com/ZTatman/myst.git
synced 2026-11-22 12:57:58 +00:00
fix(verify): simplify missing config detection
- Use REQUIRED_KEYS directly instead of complex mapping lookup - KISS: simpler code that's easier to understand
This commit is contained in:
parent
9647f27db4
commit
18d3b175de
1 changed files with 30 additions and 23 deletions
|
|
@ -52,7 +52,7 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
|
|
||||||
for (const [envKey, configKey] of Object.entries(ENV_MAPPING)) {
|
for (const [envKey, configKey] of Object.entries(ENV_MAPPING)) {
|
||||||
const value = config[configKey];
|
const value = config[configKey];
|
||||||
addResult(`${envKey} set`, !!value, value ? "configured" : "missing");
|
addResult(`${configKey} set`, !!value, value ? "configured" : "missing");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.databaseUrl) {
|
if (config.databaseUrl) {
|
||||||
|
|
@ -64,23 +64,27 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
const forgejoConfigured =
|
const forgejoConfigured =
|
||||||
config.forgejoBaseUrl && config.forgejoPat && config.forgejoBotUsername;
|
config.forgejoBaseUrl && config.forgejoPat && config.forgejoBotUsername;
|
||||||
|
|
||||||
if (forgejoConfigured && config.forgejoBaseUrl && config.forgejoPat) {
|
if (forgejoConfigured) {
|
||||||
const reachability = await checkForgejoReachability(config.forgejoBaseUrl);
|
const forgejoBaseUrl = config.forgejoBaseUrl!;
|
||||||
|
const forgejoPat = config.forgejoPat!;
|
||||||
|
const forgejoBotUsername = config.forgejoBotUsername!;
|
||||||
|
|
||||||
|
const reachability = await checkForgejoReachability(forgejoBaseUrl);
|
||||||
results.push(reachability);
|
results.push(reachability);
|
||||||
|
|
||||||
if (reachability.success) {
|
if (reachability.success) {
|
||||||
const apiToken = await checkForgejoApi(
|
const apiToken = await checkForgejoApi(
|
||||||
config.forgejoBaseUrl,
|
forgejoBaseUrl,
|
||||||
config.forgejoPat,
|
forgejoPat,
|
||||||
diagnostic,
|
diagnostic,
|
||||||
);
|
);
|
||||||
results.push(apiToken);
|
results.push(apiToken);
|
||||||
|
|
||||||
if (apiToken.success && config.forgejoBotUsername) {
|
if (apiToken.success) {
|
||||||
const repoAccess = await checkRepoAccess(
|
const repoAccess = await checkRepoAccess(
|
||||||
config.forgejoBaseUrl,
|
forgejoBaseUrl,
|
||||||
config.forgejoPat,
|
forgejoPat,
|
||||||
config.forgejoBotUsername,
|
forgejoBotUsername,
|
||||||
);
|
);
|
||||||
results.push(repoAccess);
|
results.push(repoAccess);
|
||||||
}
|
}
|
||||||
|
|
@ -116,12 +120,7 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
|
|
||||||
for (const key of REQUIRED_KEYS) {
|
for (const key of REQUIRED_KEYS) {
|
||||||
if (!config[key]) {
|
if (!config[key]) {
|
||||||
const envKey = Object.entries({
|
missing.push(key.replace(/(?<=[a-z])(?=[A-Z])/g, "_").toUpperCase());
|
||||||
forgejoBaseUrl: "FORGEJO_BASE_URL",
|
|
||||||
forgejoBotUsername: "FORGEJO_BOT_USERNAME",
|
|
||||||
forgejoPat: "FORGEJO_PAT",
|
|
||||||
}).find(([, v]) => v === key)?.[0];
|
|
||||||
if (envKey) missing.push(envKey);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -133,11 +132,19 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// After this point, required keys are guaranteed to exist
|
||||||
|
if (!config.forgejoBaseUrl || !config.forgejoPat || !config.forgejoBotUsername) {
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const forgejoBaseUrl = config.forgejoBaseUrl;
|
||||||
|
const forgejoPat = config.forgejoPat;
|
||||||
|
const forgejoBotUsername = config.forgejoBotUsername;
|
||||||
|
|
||||||
s.start("Verifying Forgejo configuration");
|
s.start("Verifying Forgejo configuration");
|
||||||
|
|
||||||
const reachability = await checkForgejoReachability(
|
const reachability = await checkForgejoReachability(forgejoBaseUrl);
|
||||||
config.forgejoBaseUrl!,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!reachability.success) {
|
if (!reachability.success) {
|
||||||
s.stop(reachability.message);
|
s.stop(reachability.message);
|
||||||
|
|
@ -147,8 +154,8 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
}
|
}
|
||||||
|
|
||||||
const apiToken = await checkForgejoApi(
|
const apiToken = await checkForgejoApi(
|
||||||
config.forgejoBaseUrl!,
|
forgejoBaseUrl,
|
||||||
config.forgejoPat!,
|
forgejoPat,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!apiToken.success) {
|
if (!apiToken.success) {
|
||||||
|
|
@ -159,9 +166,9 @@ async function verifyCommand(opts: VerifyOptions): Promise<void> {
|
||||||
}
|
}
|
||||||
|
|
||||||
const repoAccess = await checkRepoAccess(
|
const repoAccess = await checkRepoAccess(
|
||||||
config.forgejoBaseUrl!,
|
forgejoBaseUrl,
|
||||||
config.forgejoPat!,
|
forgejoPat,
|
||||||
config.forgejoBotUsername!,
|
forgejoBotUsername,
|
||||||
);
|
);
|
||||||
|
|
||||||
s.stop("Verification complete");
|
s.stop("Verification complete");
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue