Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extracts config.json into its own module #1061

Merged
merged 19 commits into from
Jul 8, 2024
Merged

Extracts config.json into its own module #1061

merged 19 commits into from
Jul 8, 2024

Conversation

Spoffy
Copy link
Contributor

@Spoffy Spoffy commented Jun 21, 2024

This adds a config file that's loaded very early on during startup.

It enables us to save/load settings from within Grist's admin panel, that affect the startup of the FlexServer.

The config file loading:

  • Is type-safe,
  • Validates the config file on startup
  • Provides a path to upgrade to future versions.

It should be extensible from other versions of Grist (such as desktop), by overriding getGlobalConfig in stubs.


Some minor refactors needed to occur to make this possible. This includes:

  • Extracting config loading into its own module (out of FlexServer).
  • Cleaning up the loadConfig function in FlexServer into loadLoginSystem (which is what its main purpose was before).

@SleepyLeslie SleepyLeslie self-assigned this Jun 24, 2024
app/server/devServerMain.ts Outdated Show resolved Hide resolved
@Spoffy Spoffy marked this pull request as ready for review June 25, 2024 13:52
@@ -8,6 +8,7 @@
import {FlexServer, FlexServerOptions} from 'app/server/lib/FlexServer';
import {GristLoginSystem} from 'app/server/lib/GristServer';
import log from 'app/server/lib/log';
import { getGlobalConfig } from "app/server/lib/globalConfig";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to stop nagging about this now, but, it would be great to copy local style when you can (in this case, imports in alphabetical order, and single quotes, and no spaces near {})

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bah, sorry - I'll get better at checking this myself during PR. I keep missing it when the IDE auto-adds an import. 😬

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be sorted 👍

*/
export async function getGlobalConfig(): Promise<IGristCoreConfig> {
if (!cachedGlobalConfig) {
log.info(`Loading config file from ${globalConfigPath}`);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Checking for config file in rather than Loading just to be noncommittal about whether one actually exists?

stubs/app/server/lib/globalConfig.ts Show resolved Hide resolved
app/server/lib/config.ts Show resolved Hide resolved
@Spoffy Spoffy requested a review from jordigh June 25, 2024 19:26
@@ -0,0 +1,107 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { ConfigAccessors, createConfigValue, Deps, FileConfig } from "app/server/lib/config";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put the imports in alphabetical order, and keep the quoting locally consistent. If you know I'm going to review, it can be a good idea to pre-review your own code for my import foibles: alphabetical, and consistent.

Copy link
Contributor Author

@Spoffy Spoffy Jun 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can do! I'm stuck in bad habits, too used to having a linter around that auto-formats all this! 😆

let configObject = { ...input };

if (checkers.IGristCoreConfigFileV0.test(configObject)) {
configObject = upgradeV0toV1(configObject);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migrations! Didn't think of that. Might have been an argument for trying a little harder to stick with the home db, which has a fully worked out migration system, and which can work across different servers without consistency problems. This is an expensive boolean store when you factor in the costs of future devs wrapping their heads around it. Again the hope will be we don't need to work on it much.

Copy link
Member

@paulfitz paulfitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spoke with Jordi, and ok to land this once you are happy with it.

@Spoffy Spoffy merged commit 6908807 into main Jul 8, 2024
12 checks passed
@Spoffy Spoffy deleted the spoffy/elevate-config branch July 8, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants