Preserve legacy settings across same-profile upgrades

This commit is contained in:
vorotamoroz
2026-07-22 06:21:54 +00:00
parent c669f64933
commit aad0e56f09
22 changed files with 2258 additions and 167 deletions
+20 -13
View File
@@ -287,19 +287,7 @@ export async function configureObjectStorage(
settings: ObjectStorageConfig & { bucketPrefix: string },
overrides: Record<string, unknown> = {}
): Promise<ConfiguredSettings> {
const nextSettings = {
remoteType: "MINIO",
endpoint: settings.endpoint,
accessKey: settings.accessKey,
secretKey: settings.secretKey,
bucket: settings.bucket,
region: settings.region,
forcePathStyle: settings.forcePathStyle,
bucketPrefix: settings.bucketPrefix,
bucketCustomHeaders: "",
...E2E_PREFERRED_SETTINGS,
...overrides,
};
const nextSettings = createE2eObjectStoragePluginData(settings, overrides);
return await evalObsidianJson<ConfiguredSettings>(
cliBinary,
[
@@ -328,6 +316,25 @@ export async function configureObjectStorage(
);
}
export function createE2eObjectStoragePluginData(
settings: ObjectStorageConfig & { bucketPrefix: string },
overrides: Record<string, unknown> = {}
): Record<string, unknown> {
return {
remoteType: "MINIO",
endpoint: settings.endpoint,
accessKey: settings.accessKey,
secretKey: settings.secretKey,
bucket: settings.bucket,
region: settings.region,
forcePathStyle: settings.forcePathStyle,
bucketPrefix: settings.bucketPrefix,
bucketCustomHeaders: "",
...E2E_PREFERRED_SETTINGS,
...overrides,
};
}
export async function waitForLiveSyncCoreReady(
cliBinary: string,
env: NodeJS.ProcessEnv,