fix: include dependencies for the OpenSSL lambda

Author: coderbyheart

cdk/resources/containers/buildOpenSSLLambdaImage.ts

@@ -4,6 +4,7 @@ import {
 	type ImageChecker,
 } from '@bifravst/aws-cdk-ecr-helpers/image'
 import { hashFolder } from '@bifravst/aws-cdk-ecr-helpers/hashFolder'
+import { hashFile } from '@bifravst/aws-cdk-ecr-helpers/hashFile'
 import fs from 'node:fs/promises'
 import run from '@bifravst/run'
 import os from 'node:os'
@@ -12,7 +13,10 @@ import { checkSumOfStrings } from '@bifravst/aws-cdk-lambda-helpers/util'
 import type { logFn } from '../../../cli/log.js'
 import { ContainerRepositoryId } from '../../../aws/ecr.js'
 import { fileURLToPath } from 'node:url'
-const __dirname = fileURLToPath(new URL('.', import.meta.url))
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+import pJSON from '../../../package.json'
 
 export const buildOpenSSLLambdaImage = async (
 	builder: ImageBuilder,
@@ -27,7 +31,12 @@ export const buildOpenSSLLambdaImage = async (
 		'lambda/openSSL.ts',
 	)
 
-	const tag = checkSumOfStrings([await hashFolder(dockerFilePath), hash])
+	const tag = checkSumOfStrings([
+		await hashFolder(dockerFilePath),
+		hash,
+		await hashFile(path.join(__dirname, '..', '..', '..', 'package.json')),
+		await hashFile(__filename),
+	])
 
 	if (
 		await checker({
@@ -47,6 +56,17 @@ export const buildOpenSSLLambdaImage = async (
 		log: { debug, stderr: debug, stdout: debug },
 	})
 
+	await run({
+		command: 'npm',
+		args: [
+			'i',
+			`@hello.nrfcloud.com/certificate-helpers@${pJSON.dependencies['@hello.nrfcloud.com/certificate-helpers']}`,
+			`@bifravst/run@${pJSON.devDependencies['@bifravst/run']}`,
+		],
+		log: { debug, stderr: debug, stdout: debug },
+		cwd: path.join(distDir, 'lambda'),
+	})
+
 	await builder({
 		id: ContainerRepositoryId.OpenSSLLambda,
 		tag,

lambda/createCredentials.ts

@@ -108,15 +108,15 @@ const h = async (
 		).Payload?.transformToString() ?? '',
 	)
 
-	const registrationArgs = {
+	const deviceDetails = {
 		deviceId,
 		subType: 'map-custom',
 		tags: ['map-custom'],
 		certPem: certificate,
 	}
-	console.debug(`Registering`, JSON.stringify(registrationArgs))
+	console.debug(`Registering`, JSON.stringify(deviceDetails))
 
-	const registration = await client.register([registrationArgs])
+	const registration = await client.register([deviceDetails])
 
 	if ('error' in registration) {
 		console.error(

package-lock.json

@@ -32,16 +32,16 @@
     "@aws-sdk/client-ecr": "3.621.0",
     "@aws-sdk/client-iot-data-plane": "3.621.0",
     "@aws-sdk/client-route-53": "3.621.0",
-    "@bifravst/aws-cdk-ecr-helpers": "1.2.29",
+    "@bifravst/aws-cdk-ecr-helpers": "1.3.0",
     "@bifravst/aws-cdk-lambda-helpers": "1.9.12",
     "@bifravst/aws-ssm-settings-helpers": "1.2.4",
     "@bifravst/bdd-markdown": "8.2.6",
     "@bifravst/ci": "2.0.2",
     "@bifravst/cloudformation-helpers": "9.1.1",
     "@bifravst/eslint-config-typescript": "6.1.13",
-    "@bifravst/http-api-mock": "2.0.62",
+    "@bifravst/http-api-mock": "2.0.63",
     "@bifravst/prettier-config": "1.0.4",
-    "@bifravst/run": "1.2.0",
+    "@bifravst/run": "^1.2.0",
     "@commitlint/config-conventional": "19.2.2",
     "@hello.nrfcloud.com/bdd-markdown-steps": "2.6.19",
     "@swc/cli": "0.4.0",
@@ -107,7 +107,7 @@
     "@bifravst/from-env": "3.0.2",
     "@bifravst/random-words": "8.0.2",
     "@bifravst/timestream-helpers": "6.0.3",
-    "@hello.nrfcloud.com/certificate-helpers": "1.0.0",
+    "@hello.nrfcloud.com/certificate-helpers": "^1.0.0",
     "@hello.nrfcloud.com/lambda-helpers": "1.3.17",
     "@hello.nrfcloud.com/nrfcloud-api-helpers": "5.3.21",
     "@hello.nrfcloud.com/proto": "14.2.5",