Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

Commit

Permalink
fix(AWSSM): treat value as object iff the es specifies .property (#74)
Browse files Browse the repository at this point in the history
See #73 for
discussion.
  • Loading branch information
silasbw committed Jun 3, 2019
1 parent 5da11a0 commit 1d5a9dd
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
10 changes: 9 additions & 1 deletion lib/backends/kv-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,16 @@ class KVBackend extends AbstractBackend {
const value = await this._get({ secretKey: secretProperty.key })

if ('property' in secretProperty) {
return value[secretProperty.property]
let parsedValue
try {
parsedValue = JSON.parse(value)
} catch (err) {
this._logger.warn(`Failed to JSON.parse '${value}':`, err)
return
}
return parsedValue[secretProperty.property]
}

return value
}))
}
Expand Down
15 changes: 14 additions & 1 deletion lib/backends/kv-backend.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ describe('SecretsManagerBackend', () => {
beforeEach(() => {
loggerMock = sinon.mock()
loggerMock.info = sinon.stub()
loggerMock.warn = sinon.stub()

kvBackend = new KVBackend({
logger: loggerMock
Expand All @@ -26,7 +27,7 @@ describe('SecretsManagerBackend', () => {
})

it('handles secrets values that are objects', async () => {
kvBackend._get.onFirstCall().resolves({ foo: 'bar' })
kvBackend._get.onFirstCall().resolves('{"foo":"bar"}')
const secretPropertyValues = await kvBackend._fetchSecretPropertyValues({
externalData: [{
key: 'mocked-key',
Expand All @@ -37,6 +38,18 @@ describe('SecretsManagerBackend', () => {
expect(secretPropertyValues).to.deep.equal(['bar'])
})

it('handles invalid JSON objects', async () => {
kvBackend._get.onFirstCall().resolves('{')
const secretPropertyValues = await kvBackend._fetchSecretPropertyValues({
externalData: [{
key: 'mocked-key',
name: 'mocked-name',
property: 'foo'
}]
})
expect(secretPropertyValues).to.deep.equal([undefined])
})

it('fetches secret property values', async () => {
kvBackend._get.onFirstCall().resolves('fakePropertyValue1')
kvBackend._get.onSecondCall().resolves('fakePropertyValue2')
Expand Down
7 changes: 1 addition & 6 deletions lib/backends/secrets-manager-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ class SecretsManagerBackend extends KVBackend {
.getSecretValue({ SecretId: secretKey })
.promise()

const secretValue = data.SecretString
try {
return JSON.parse(secretValue)
} catch (err) {
return secretValue
}
return data.SecretString
}
}

Expand Down

0 comments on commit 1d5a9dd

Please sign in to comment.