Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config/production.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=

NYPL_CORE_VERSION=v2.24
NYPL_CORE_VERSION=v2.25

LOG_LEVEL=info
FEATURES=on-site-edd
Expand Down
4 changes: 2 additions & 2 deletions config/qa.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ NYPL_OAUTH_URL=https://isso.nypl.org/
ENCRYPTED_NYPL_OAUTH_ID=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAGswaQYJKoZIhvcNAQcGoFwwWgIBADBVBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDMLKVUQA58B6vprNcAIBEIAoaz0lI9EL2M9NyTuEwT8JDmPBt6aXfMiFs027DEuwsCN0wS0qWeFL1g==
ENCRYPTED_NYPL_OAUTH_SECRET=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAIcwgYQGCSqGSIb3DQEHBqB3MHUCAQAwcAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyWz91LOP2YP5fg0q0CARCAQ9inO9SV1M8R0Pkkx84r7UdwlU1FxfXvIjk/z6Qs81KBAVELhby2iD5LawQyDrR9tjhuMbotS6QnydwwMR/p8+qJXHI=

NYPL_CORE_VERSION=v2.24
NYPL_CORE_VERSION=v2.25

LOG_LEVEL=info
LOG_LEVEL=debug
FEATURES=on-site-edd

SEARCH_ITEMS_SIZE=3
Expand Down
2 changes: 2 additions & 0 deletions lib/kms-helper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { KMSClient, DecryptCommand } = require('@aws-sdk/client-kms')
const logger = require('./logger')

let awsCredentials

Expand All @@ -16,6 +17,7 @@ async function decrypt (encrypted) {
// Use credentials if given (local invocations). Otherwise rely on
// environment (deployed code):
if (awsCredentials) {
logger.debug('KMS decrypt using local AWS credentials')
config.credentials = awsCredentials
}
const client = new KMSClient(config)
Expand Down
2 changes: 1 addition & 1 deletion lib/load-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module.exports.decryptEncryptedConfig = () => {
const keyWithoutPrefix = key.replace(/^ENCRYPTED_/, '')
const decrypted = await decrypt(process.env[key])
.catch((e) => {
logger.error(`Load-config: Failed to decrypt ${key}`)
logger.error(`Load-config: Failed to decrypt ${key}: ${e}`)
})
logger.debug(`Load-config: Decrypted ${key}`)
process.env[keyWithoutPrefix] = decrypted
Expand Down
Loading