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

load config yaml manually, remove more references to static config #347

Merged
merged 9 commits into from
Aug 16, 2022

Conversation

jesopo
Copy link
Contributor

@jesopo jesopo commented Aug 10, 2022

No description provided.

@jesopo jesopo marked this pull request as draft August 10, 2022 13:16
@jesopo jesopo marked this pull request as ready for review August 10, 2022 14:37
@jesopo jesopo requested a review from Gnuxie August 10, 2022 14:47
Copy link
Contributor

@Gnuxie Gnuxie left a comment

Choose a reason for hiding this comment

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

just some nits, though this is nice.

this.timeout(5000)
LogService.debug('policyConsumptionTest', `Rules at end of test ${JSON.stringify(await currentRules(), null, 2)}`);
LogService.debug('policyConsumptionTest', `Rules at end of test ${JSON.stringify(await currentRules(
this.config.web.address, this.mjolnir.config.web.port
Copy link
Contributor

Choose a reason for hiding this comment

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

could we just give this helper a mjolnir instead? Makes sense because we're checking that Mjolnir's rule server

test/integration/utilsTest.ts Show resolved Hide resolved
@jesopo jesopo merged commit 4376679 into main Aug 16, 2022
Gnuxie added a commit that referenced this pull request Nov 21, 2022
Gnuxie added a commit that referenced this pull request Nov 22, 2022
Gnuxie added a commit that referenced this pull request Nov 22, 2022
This is what was used prior to #347.
It was a nice idea motivated to drop a dependency that was confusing.
It was just never followed through and was underestimated how much disruption it would cause.
It was also believed that the library would mean there could only ever be one global copy of the config,
It was followed up by:
#369
#357
#429
https://github.com/matrix-org/mjolnir/pull/397/files
#365

For simplicity sake I am reinstating the library.
The practice of loading default.yaml by default is also dangerous
and has led to issues multiple times in #mjolnir:matrix.org.
It is a sample and not a default.

In a following commit I will be adding the ability to specify the
config to use from the cli.
@Gnuxie Gnuxie mentioned this pull request Nov 22, 2022
Gnuxie added a commit that referenced this pull request Nov 23, 2022
* Use the npm package `config` to load the config.

This is what was used prior to #347.
It was a nice idea motivated to drop a dependency that was confusing.
It was just never followed through and was underestimated how much disruption it would cause.
It was also believed that the library would mean there could only ever be one global copy of the config,
It was followed up by:
#369
#357
#429
https://github.com/matrix-org/mjolnir/pull/397/files
#365

For simplicity sake I am reinstating the library.
The practice of loading default.yaml by default is also dangerous
and has led to issues multiple times in #mjolnir:matrix.org.
It is a sample and not a default.

In a following commit I will be adding the ability to specify the
config to use from the cli.

* Allow config to be specified with an explicit cli argument.

* Update doc to transition away from old config handling
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.

2 participants