-
Notifications
You must be signed in to change notification settings - Fork 30
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
Restructure configuration to prevent conflicts with other OTA applications #1071
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c6c3365
Remove obsolete code duplication
Ndpnt b83bebc
Load dotenv first, without requiring manual import
Ndpnt bf77c2d
Nest configs under `@opentermsarchive/engine` key
Ndpnt 866ee1e
Prefix environment variables with OTA scope
Ndpnt 48a5b43
Allow trailing/leading slashes in base path config
Ndpnt f86cec2
Rename `api` into `collection-api`
Ndpnt d5df8fc
Enforce user-defined configs by removing defaults
Ndpnt f52d272
Add changelog entry
Ndpnt 1decf56
Update Node in CI
Ndpnt fcfd4ac
Update express and swagger-ui
Ndpnt ec185c0
Update changelog to conform to the style guide
Ndpnt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| SENDINBLUE_API_KEY='xkeysib-3f51c…' | ||
| SMTP_PASSWORD='password' | ||
| GITHUB_TOKEN=ghp_XXXXXXXXX | ||
| OTA_ENGINE_SENDINBLUE_API_KEY='xkeysib-3f51c…' | ||
| OTA_ENGINE_SMTP_PASSWORD='password' | ||
| OTA_ENGINE_GITHUB_TOKEN=ghp_XXXXXXXXX | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| import 'dotenv/config'; | ||
|
|
||
| import path from 'path'; | ||
| import { fileURLToPath } from 'url'; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| { | ||
| "services": { | ||
| "declarationsPath": "./demo-declarations/declarations" | ||
| "@opentermsarchive/engine": { | ||
| "services": { | ||
| "declarationsPath": "./demo-declarations/declarations" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,63 @@ | ||
| { | ||
| "services": { | ||
| "declarationsPath": "./declarations" | ||
| }, | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "type": "git", | ||
| "git": { | ||
| "path": "./data/versions", | ||
| "publish": false, | ||
| "snapshotIdentiferTemplate": "./data/snapshots/%SNAPSHOT_ID", | ||
| "author": { | ||
| "name": "Open Terms Archive Bot", | ||
| "email": "[email protected]" | ||
| "@opentermsarchive/engine": { | ||
| "services": { | ||
| "declarationsPath": "./declarations" | ||
| }, | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "type": "git", | ||
| "git": { | ||
| "path": "./data/versions", | ||
| "publish": false, | ||
| "snapshotIdentiferTemplate": "./data/snapshots/%SNAPSHOT_ID", | ||
| "author": { | ||
| "name": "Open Terms Archive Bot", | ||
| "email": "[email protected]" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "type": "git", | ||
| "git": { | ||
| "path": "./data/snapshots", | ||
| "publish": false, | ||
| "author": { | ||
| "name": "Open Terms Archive Bot", | ||
| "email": "[email protected]" | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "type": "git", | ||
| "git": { | ||
| "path": "./data/snapshots", | ||
| "publish": false, | ||
| "author": { | ||
| "name": "Open Terms Archive Bot", | ||
| "email": "[email protected]" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive", | ||
| "collection": "snapshots" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive", | ||
| "collection": "snapshots" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "fetcher": { | ||
| "waitForElementsTimeout": 10000, | ||
| "navigationTimeout": 30000, | ||
| "language": "en" | ||
| }, | ||
| "logger": { | ||
| "smtp": { | ||
| "host": "smtp-relay.sendinblue.com", | ||
| "username": "[email protected]" | ||
| }, | ||
| "sendMailOnError": false | ||
| }, | ||
| "notifier": { | ||
| "sendInBlue": { | ||
| "updatesListId": 850, | ||
| "updateTemplateId": 7 | ||
| "fetcher": { | ||
| "waitForElementsTimeout": 10000, | ||
| "navigationTimeout": 30000, | ||
| "language": "en" | ||
| }, | ||
| "logger": { | ||
| "smtp": { | ||
| "host": "smtp-relay.sendinblue.com", | ||
| "username": "[email protected]" | ||
| }, | ||
| "sendMailOnError": false | ||
| }, | ||
| "notifier": { | ||
| "sendInBlue": { | ||
| "updatesListId": 850, | ||
| "updateTemplateId": 7 | ||
| } | ||
| }, | ||
| "dataset": { | ||
| "title": "sandbox", | ||
| "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox" | ||
| } | ||
| }, | ||
| "dataset": { | ||
| "title": "sandbox", | ||
| "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox" | ||
| }, | ||
| "api": { | ||
| "port": 3000, | ||
| "basePath": "/api" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,29 @@ | ||
| { | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "../versions", | ||
| "publish": true | ||
| "@opentermsarchive/engine": { | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "../versions", | ||
| "publish": true | ||
| } | ||
| } | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "../snapshots", | ||
| "publish": true | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "../snapshots", | ||
| "publish": true | ||
| } | ||
| "logger": { | ||
| "sendMailOnError": { | ||
| "to": "[email protected]", | ||
| "from": "[email protected]", | ||
| "sendWarnings": false | ||
| } | ||
| } | ||
| }, | ||
| "logger": { | ||
| "sendMailOnError": { | ||
| "to": "[email protected]", | ||
| "from": "[email protected]", | ||
| "sendWarnings": false | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,55 @@ | ||
| { | ||
| "services": { | ||
| "declarationsPath": "./test/services" | ||
| }, | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "./test/data/versions", | ||
| "publish": false, | ||
| "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/sandbox-snapshots/commit/%SNAPSHOT_ID", | ||
| "author": { | ||
| "name": "Open Terms Archive Testing Bot", | ||
| "email": "[email protected]" | ||
| "@opentermsarchive/engine": { | ||
| "services": { | ||
| "declarationsPath": "./test/services" | ||
| }, | ||
| "recorder": { | ||
| "versions": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "./test/data/versions", | ||
| "publish": false, | ||
| "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/sandbox-snapshots/commit/%SNAPSHOT_ID", | ||
| "author": { | ||
| "name": "Open Terms Archive Testing Bot", | ||
| "email": "[email protected]" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive-test", | ||
| "collection": "versions" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive-test", | ||
| "collection": "versions" | ||
| } | ||
| } | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "./test/data/snapshots", | ||
| "publish": false, | ||
| "author": { | ||
| "name": "Open Terms Archive Testing Bot", | ||
| "email": "[email protected]" | ||
| }, | ||
| "snapshots": { | ||
| "storage": { | ||
| "git": { | ||
| "path": "./test/data/snapshots", | ||
| "publish": false, | ||
| "author": { | ||
| "name": "Open Terms Archive Testing Bot", | ||
| "email": "[email protected]" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive-test", | ||
| "collection": "snapshots" | ||
| } | ||
| }, | ||
| "mongo": { | ||
| "connectionURI": "mongodb://127.0.0.1:27017", | ||
| "database": "open-terms-archive-test", | ||
| "collection": "snapshots" | ||
| } | ||
| } | ||
| }, | ||
| "fetcher": { | ||
| "waitForElementsTimeout": 1000 | ||
| }, | ||
| "dataset": { | ||
| "title": "sandbox", | ||
| "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox-versions" | ||
| }, | ||
| "collection-api": { | ||
| "port": 3000, | ||
| "basePath": "/collection-api" | ||
| } | ||
| }, | ||
| "fetcher": { | ||
| "waitForElementsTimeout": 1000 | ||
| }, | ||
| "dataset": { | ||
| "title": "sandbox", | ||
| "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox-versions" | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's best to avoid using the abbreviation
OTA.