Skip to content

fix: catch error if ssm extension is not ready #58

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

Merged
merged 2 commits into from
Jun 29, 2023
Merged

fix: catch error if ssm extension is not ready #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90b9544
fix: read from ssm when it is not ready
pudkrong Jun 28, 2023
1b51815
Merge branch 'saga' into fix-read-nrf-cloud-key-from-ssm
coderbyheart Jun 29, 2023
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
20 changes: 10 additions & 10 deletions lambda/fetchDeviceShadow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { proto } from '@hello.nrfcloud.com/proto/hello'
import { getShadowUpdateTime } from '@hello.nrfcloud.com/proto/nrfCloud'
import middy from '@middy/core'
import { fromEnv } from '@nordicsemiconductor/from-env'
import { chunk } from 'lodash-es'
import { chunk, once } from 'lodash-es'
import pLimit from 'p-limit'
import { deviceShadowFetcher } from '../nrfcloud/getDeviceShadowFromnRFCloud.js'
import { defaultApiEndpoint } from '../nrfcloud/settings.js'
Expand Down Expand Up @@ -56,7 +56,7 @@ const connectionsRepo = connectionsRepository(
db,
websocketDeviceConnectionsTableName,
)
const deviceShadowPromise = (async () => {
const deviceShadowPromise = once(async () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This effectively does the same thing as before. It ensures that deviceShadowPromise only exists once. It will stay in a rejected stated if parameters cannot be fetched.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right. Now I see. It does fix the problem, because the lambda is invoked only in the handler.

const [apiKey, apiEndpoint] = await getNRFCloudSSMParameters(stackName, [
'apiKey',
'apiEndpoint',
Expand All @@ -68,17 +68,17 @@ const deviceShadowPromise = (async () => {
apiEndpoint !== undefined ? new URL(apiEndpoint) : defaultApiEndpoint,
apiKey,
})
})()
})

const h = async (): Promise<void> => {
const deviceShadow = await deviceShadowPromise
const lockAcquired = await lock.acquiredLock(lockName, lockTTLSeconds)
if (lockAcquired === false) {
log.info(`Other process is still running, then ignore`)
return
}

try {
const lockAcquired = await lock.acquiredLock(lockName, lockTTLSeconds)
if (lockAcquired === false) {
log.info(`Other process is still running, then ignore`)
return
}

const deviceShadow = await deviceShadowPromise()
const connections = await connectionsRepo.getAll()
log.info(`Found ${connections.length} active connections`)
metrics.addMetric('connections', MetricUnits.Count, connections.length)
Expand Down