Skip to content

Cache schema validator for db config #2092

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 17, 2023
Merged

Cache schema validator for db config #2092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions extensions/ql-vscode/src/databases/config/db-config-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { readJsonSync } from "fs-extra";
import { resolve } from "path";
import Ajv from "ajv";
import Ajv, { ValidateFunction } from "ajv";
import { clearLocalDbConfig, DbConfig } from "./db-config";
import { findDuplicateStrings } from "../../pure/text-utils";
import {
Expand All @@ -9,22 +9,22 @@ import {
} from "../db-validation-errors";

export class DbConfigValidator {
private readonly schema: any;
private readonly validateSchemaFn: ValidateFunction;

constructor(extensionPath: string) {
const schemaPath = resolve(extensionPath, "databases-schema.json");
this.schema = readJsonSync(schemaPath);
const schema = readJsonSync(schemaPath);
const schemaValidator = new Ajv({ allErrors: true });
this.validateSchemaFn = schemaValidator.compile(schema);
}

public validate(dbConfig: DbConfig): DbConfigValidationError[] {
const ajv = new Ajv({ allErrors: true });

const localDbs = clearLocalDbConfig(dbConfig);

ajv.validate(this.schema, dbConfig);
this.validateSchemaFn(dbConfig);

if (ajv.errors) {
return ajv.errors.map((error) => ({
if (this.validateSchemaFn.errors) {
return this.validateSchemaFn.errors.map((error) => ({
kind: DbConfigValidationErrorKind.InvalidConfig,
message: `${error.instancePath} ${error.message}`,
}));
Expand Down