Jannik/PaperClipAI
1
0 Fork 0
mirror of https://github.com/paperclipai/paperclip.git synced 2026-11-09 07:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into codex/sleep-05-merge-confirmations

Browse Source 
* origin/master:
  fix(config): require shared storage for managed cloud (#18350)
This commit is contained in:
Dotta committed 2026-10-30 16:49:20 -05:00
2 parents 7edb163a80 198218bf55
commit 6e8fd558bc
14 files changed
+519 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/src/services/cloud-runtime-config-snapshot.ts
+1 -1
View File
@@ -25,7 +25,7 @@ export const cloudRuntimeConfigSchema = z.object({
backup: databaseBackupConfigSchema.strict(),
storage: storageConfigSchema.extend({
localDisk: storageLocalDiskConfigSchema.strict(),
s3: storageS3ConfigSchema.extend({ endpoint: publicUrl.optional() }).strict(),
s3: storageS3ConfigSchema.extend({ bucket: z.string().trim().min(1), endpoint: publicUrl.optional() }).strict(),
}).strict(),
secrets: secretsConfigSchema.extend({
localEncrypted: secretsLocalEncryptedConfigSchema.strict(),
server/src/services/cloud-runtime-config.ts
+9
View File
@@ -5,6 +5,8 @@ import { eq } from "drizzle-orm";
import { instanceSettings, type Db } from "@paperclipai/db";
import { paperclipConfigSchema } from "@paperclipai/shared";
import { resolvePaperclipConfigPathForInstance } from "@paperclipai/shared/home-paths";
import { validateManagedCloudStoragePrerequisites } from "../managed-cloud-prerequisites.js";
import { loadStorageConfig } from "../storage/config.js";
import { isCloudManagedInstance, type CloudInstanceEnv } from "./cloud-instance.js";
import {
parseStoredCloudRuntimeConfig,
@@ -83,11 +85,18 @@ export async function readLegacyCloudRuntimeConfig(env: CloudInstanceEnv = proce
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw new Error("Legacy Cloud runtime configuration could not be read safely");
return null;
}
// Refuse an unconfigured legacy bucket before shared-schema defaults can
// turn its omission into an apparently explicit canonical database value.
const legacyStorage = (raw as { storage?: { provider?: unknown; s3?: { bucket?: unknown } } } | null)?.storage;
if (typeof legacyStorage?.s3?.bucket !== "string" || !legacyStorage.s3.bucket.trim()) {
throw new Error("Legacy Cloud runtime configuration requires an explicit nonblank storage.s3.bucket");
}
const parsed = paperclipConfigSchema.safeParse(raw);
if (!parsed.success) throw new Error("Legacy Cloud runtime configuration is invalid");
if (parsed.data.llm?.provider === "openai" && parsed.data.llm.apiKey?.trim() && !env.OPENAI_API_KEY?.trim()) {
throw new Error("Move the legacy OpenAI API key to OPENAI_API_KEY before initializing Cloud runtime configuration");
}
validateManagedCloudStoragePrerequisites(loadStorageConfig(parsed.data, env), env);
return projectCloudRuntimeConfig(parsed.data);
}