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

[BACK-43] jellyfish updates based on reuse of legacy _id for migration #203

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2d78b33
jellyfish updates based on reuse of legacy _id for migration
jh-bate May 29, 2024
1294057
remove unneeded change
jh-bate May 29, 2024
be453d0
add _deduplicator to output
jh-bate May 29, 2024
ef45bc2
change hash name
jh-bate Jul 31, 2024
4cb2262
debug for smbg Id
jh-bate Aug 5, 2024
da7def9
fix lint
jh-bate Aug 5, 2024
af8971d
debug
jh-bate Aug 5, 2024
f75e54b
debug
jh-bate Aug 6, 2024
f58a8e1
fix lint
jh-bate Aug 6, 2024
66aeb7d
more debug
jh-bate Aug 6, 2024
280ff66
debug comment
jh-bate Aug 6, 2024
4ba4266
remove debug
jh-bate Aug 14, 2024
f518ad2
minimal implementation of service switch based on userid
jh-bate Aug 15, 2024
b7b8c21
place holder list
jh-bate Aug 22, 2024
977460b
Merge branch 'master' into add-dedup-hash
jh-bate Aug 22, 2024
42fa67a
fix lint
jh-bate Sep 6, 2024
837ab58
remove debug
jh-bate Sep 6, 2024
b323d53
updates from review
jh-bate Sep 27, 2024
b965441
move config val to top-level
jh-bate Oct 3, 2024
ae05607
pull users ids from config
jh-bate Oct 9, 2024
5342fe9
update to match config changes
jh-bate Oct 15, 2024
4b9d7ea
read platform user ids from encrypted file
jh-bate Nov 7, 2024
ff284ff
Resolve latest vulnerabilities (#205)
darinkrauss Nov 7, 2024
3ef21b0
userid hash for platform users (#206)
jh-bate Nov 24, 2024
df3c5a4
initial load of QA3 test users
jh-bate Dec 18, 2024
05de034
empty user files per environment
jh-bate Dec 18, 2024
5aef248
add personal qa user id
jh-bate Dec 20, 2024
d893ea3
format list
jh-bate Dec 20, 2024
e7f0ec2
add new test user
jh-bate Jan 30, 2025
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
31 changes: 22 additions & 9 deletions env.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,34 +48,47 @@ module.exports = (function () {
maybeReplaceWithContentsOfFile(env.httpsConfig, 'pfx');
}
if (env.httpsPort != null && env.httpsConfig == null) {
throw new Error('No https config provided, please set HTTPS_CONFIG with at least the certificate to use.');
throw new Error(
'No https config provided, please set HTTPS_CONFIG with at least the certificate to use.'
);
}

if (env.httpPort == null && env.httpsPort == null) {
throw new Error('Must specify either PORT or HTTPS_PORT in your environment.');
throw new Error(
'Must specify either PORT or HTTPS_PORT in your environment.'
);
}

env.userApi = {
service: config.fromEnvironment('TIDEPOOL_AUTH_CLIENT_ADDRESS', 'shoreline:9107'),
service: config.fromEnvironment(
'TIDEPOOL_AUTH_CLIENT_ADDRESS',
'shoreline:9107'
),

// Name of this server to pass to user-api when getting a server token
serverName: config.fromEnvironment("SERVER_NAME", "jellyfish:default"),
serverName: config.fromEnvironment('SERVER_NAME', 'jellyfish:default'),

// The secret to use when getting a server token from user-api
serverSecret: config.fromEnvironment("TIDEPOOL_SERVER_SECRET")
serverSecret: config.fromEnvironment('TIDEPOOL_SERVER_SECRET'),
};

env.gatekeeper = {
service: config.fromEnvironment('TIDEPOOL_PERMISSION_CLIENT_ADDRESS', 'gatekeeper:9123')
service: config.fromEnvironment(
'TIDEPOOL_PERMISSION_CLIENT_ADDRESS',
'gatekeeper:9123'
),
};

env.seagull = {
service: config.fromEnvironment('TIDEPOOL_SEAGULL_CLIENT_ADDRESS', 'seagull:9120')
service: config.fromEnvironment(
'TIDEPOOL_SEAGULL_CLIENT_ADDRESS',
'seagull:9120'
),
};

env.mongo = {
connectionString: cs('data')
connectionString: cs('data'),
};

return env;
})();
Loading