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.

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

Jump to bottom

ci: Add test support for external database adapter #8883

Merged
merged 11 commits into from
May 14, 2024
Merged

ci: Add test support for external database adapter #8883

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
824bf1a
Add databaseAdapter support for tests, REDACT databaseAdapter info wh…
ddrechse Jan 10, 2024
36a7fea
Merge branch 'alpha' into realDBAdapterLoader
mtrezza Jan 14, 2024
e60f416
Simplify
ddrechse Jan 17, 2024
bcccf2c
Merge branch 'realDBAdapterLoader' of github.com:ddrechse/parse-serve…
ddrechse Jan 17, 2024
48e23fc
Merge branch 'alpha' into realDBAdapterLoader
mtrezza Jan 17, 2024
3fa085e
Merge branch 'alpha' into realDBAdapterLoader
mtrezza Jan 17, 2024
4923443
Merge branch 'alpha' into realDBAdapterLoader
mtrezza Apr 5, 2024
0462693
Merge branch 'alpha' into realDBAdapterLoader
mtrezza Apr 26, 2024
426510c
Add databaseAdapter test
ddrechse May 14, 2024
f2a858d
Merge branch 'realDBAdapterLoader' of github.com:ddrechse/parse-serve…
ddrechse May 14, 2024
f6f317b
refactor
mtrezza May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion spec/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ process.noDeprecation = true;
const cache = require('../lib/cache').default;
const defaults = require('../lib/defaults').default;
const ParseServer = require('../lib/index').ParseServer;
const loadAdapter = require('../lib/Adapters/AdapterLoader').loadAdapter;
const path = require('path');
const TestUtils = require('../lib/TestUtils');
const GridFSBucketAdapter = require('../lib/Adapters/Files/GridFSBucketAdapter')
Expand All @@ -53,7 +54,10 @@ let databaseAdapter;
let databaseURI;
// need to bind for mocking mocha

if (process.env.PARSE_SERVER_TEST_DB === 'postgres') {
if (process.env.PARSE_SERVER_DATABASE_ADAPTER) {
databaseAdapter = JSON.parse(process.env.PARSE_SERVER_DATABASE_ADAPTER);
databaseAdapter = loadAdapter(databaseAdapter);
} else if (process.env.PARSE_SERVER_TEST_DB === 'postgres') {
databaseURI = process.env.PARSE_SERVER_TEST_DATABASE_URI || postgresURI;
databaseAdapter = new PostgresStorageAdapter({
uri: databaseURI,
Expand Down
7 changes: 1 addition & 6 deletions src/cli/utils/runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
return;
}
// Keys that may include sensitive information that will be redacted in logs
const keysToRedact = [
'databaseURI',
'masterKey',
'maintenanceKey',
'push',
];
const keysToRedact = ['databaseAdapter', 'databaseURI', 'masterKey', 'maintenanceKey', 'push'];

Check warning on line 8 in src/cli/utils/runner.js

View check run for this annotation

Codecov / codecov/patch

src/cli/utils/runner.js#L8 

Added line #L8 was not covered by tests
mtrezza marked this conversation as resolved.
Show resolved Hide resolved
for (const key in options) {
let value = options[key];
if (keysToRedact.includes(key)) {
Expand Down