fix: update dependencies

Closes #363 Closes #362 Closes #361 Closes #360 Closes #353 Closes #351 Closes #350 Closes #347 Closes #346 Closes #345 Closes #344
hello-nrfcloud · Nov 24, 2024 · a3133b9 · a3133b9
1 parent 510a496
commit a3133b9
Show file tree

Hide file tree

Showing 11 changed files with 4,687 additions and 5,236 deletions.
diff --git a/cdk/BackendStack.ts b/cdk/BackendStack.ts
@@ -66,22 +66,22 @@ export class BackendStack extends Stack {
 			layerVersionName: `${Stack.of(this).stackName}-baseLayer`,
 			code: new LambdaSource(this, {
 				id: 'baseLayer',
-				zipFile: layer.layerZipFile,
+				zipFilePath: layer.layerZipFilePath,
 				hash: layer.hash,
 			}).code,
 			compatibleArchitectures: [Lambda.Architecture.ARM_64],
-			compatibleRuntimes: [Lambda.Runtime.NODEJS_20_X],
+			compatibleRuntimes: [Lambda.Runtime.NODEJS_22_X],
 		})
 
 		const jwtLayerVersion = new Lambda.LayerVersion(this, 'jwtLayer', {
 			layerVersionName: `${Stack.of(this).stackName}-jwtLayer`,
 			code: new LambdaSource(this, {
 				id: 'jwtLayer',
-				zipFile: jwtLayer.layerZipFile,
+				zipFilePath: jwtLayer.layerZipFilePath,
 				hash: jwtLayer.hash,
 			}).code,
 			compatibleArchitectures: [Lambda.Architecture.ARM_64],
-			compatibleRuntimes: [Lambda.Runtime.NODEJS_20_X],
+			compatibleRuntimes: [Lambda.Runtime.NODEJS_22_X],
 		})
 
 		const publicDevices = new PublicDevices(this)
@@ -112,11 +112,11 @@ export class BackendStack extends Stack {
 			const cdkLayerVersion = new Lambda.LayerVersion(this, 'cdkLayer', {
 				code: new LambdaSource(this, {
 					id: 'cdkLayer',
-					zipFile: cdkLayer.layerZipFile,
+					zipFilePath: cdkLayer.layerZipFilePath,
 					hash: cdkLayer.hash,
 				}).code,
 				compatibleArchitectures: [Lambda.Architecture.ARM_64],
-				compatibleRuntimes: [Lambda.Runtime.NODEJS_20_X],
+				compatibleRuntimes: [Lambda.Runtime.NODEJS_22_X],
 			})
 			const domain = new CustomDomain(this, {
 				api,

diff --git a/cdk/backend.ts b/cdk/backend.ts
@@ -3,7 +3,7 @@ import { IAMClient } from '@aws-sdk/client-iam'
 import { ensureGitHubOIDCProvider } from '@bifravst/ci'
 import { fromEnv } from '@bifravst/from-env'
 import { getCertificateArnForDomain } from '../aws/acm.js'
-import pJSON from '../package.json'
+import pJSON from '../package.json' assert { type: 'json' }
 import { BackendApp } from './BackendApp.js'
 import { pack as packBaseLayer } from './baseLayer.js'
 import { pack as packCDKLayer } from './cdkLayer.js'

diff --git a/cdk/baseLayer.ts b/cdk/baseLayer.ts
@@ -2,7 +2,7 @@ import {
 	packLayer,
 	type PackedLayer,
 } from '@bifravst/aws-cdk-lambda-helpers/layer'
-import type pJson from '../package.json'
+import pJson from '../package.json' assert { type: 'json' }
 
 const dependencies: Array<keyof (typeof pJson)['dependencies']> = [
 	'@bifravst/from-env',

diff --git a/cdk/cdkLayer.ts b/cdk/cdkLayer.ts
@@ -2,7 +2,7 @@ import {
 	packLayer,
 	type PackedLayer,
 } from '@bifravst/aws-cdk-lambda-helpers/layer'
-import type pJson from '../package.json'
+import pJson from '../package.json' assert { type: 'json' }
 
 const dependencies: Array<keyof (typeof pJson)['devDependencies']> = [
 	'cfn-response',

diff --git a/cdk/jwtLayer.ts b/cdk/jwtLayer.ts
@@ -2,7 +2,7 @@ import {
 	packLayer,
 	type PackedLayer,
 } from '@bifravst/aws-cdk-lambda-helpers/layer'
-import type pJson from '../package.json'
+import pJson from '../package.json' assert { type: 'json' }
 
 const dependencies: Array<keyof (typeof pJson)['dependencies']> = [
 	'jsonwebtoken',

diff --git a/cdk/packBackendLambdas.ts b/cdk/packBackendLambdas.ts
@@ -19,7 +19,8 @@ export type BackendLambdas = {
 	notifyAboutExpiringDevices: PackedLambda
 }
 
-const pack = async (id: string) => packLambdaFromPath(id, `lambda/${id}.ts`)
+const pack = async (id: string) =>
+	packLambdaFromPath({ id, sourceFilePath: `lambda/${id}.ts` })
 
 export const packBackendLambdas = async (): Promise<BackendLambdas> => ({
 	shareDevice: await pack('shareDevice'),
@@ -31,10 +32,10 @@ export const packBackendLambdas = async (): Promise<BackendLambdas> => ({
 	extendDeviceSharing: await pack('extendDeviceSharing'),
 	openSSL: await pack('openSSL'),
 	apiHealthCheck: await pack('apiHealthCheck'),
-	createCNAMERecord: await packLambdaFromPath(
-		'createCNAMERecord',
-		'cdk/resources/api/createCNAMERecord.ts',
-	),
+	createCNAMERecord: await packLambdaFromPath({
+		id: 'createCNAMERecord',
+		sourceFilePath: 'cdk/resources/api/createCNAMERecord.ts',
+	}),
 	jwks: await pack('jwks'),
 	deviceJwt: await pack('deviceJwt'),
 	requestToken: await pack('requestToken'),

diff --git a/cdk/resources/api/HealthCheck.ts b/cdk/resources/api/HealthCheck.ts
@@ -23,10 +23,10 @@ export class ApiHealthCheck extends Construct {
 		this.fn = new Lambda.Function(this, 'fn', {
 			handler: lambdaSources.apiHealthCheck.handler,
 			architecture: Lambda.Architecture.ARM_64,
-			runtime: Lambda.Runtime.NODEJS_20_X,
+			runtime: Lambda.Runtime.NODEJS_22_X,
 			timeout: Duration.seconds(1),
 			memorySize: 1792,
-			code: Lambda.Code.fromAsset(lambdaSources.apiHealthCheck.zipFile),
+			code: Lambda.Code.fromAsset(lambdaSources.apiHealthCheck.zipFilePath),
 			description: 'Simple health-check resource.',
 			layers: [baseLayer],
 			environment: {

diff --git a/cdk/resources/containers/buildOpenSSLLambdaImage.ts b/cdk/resources/containers/buildOpenSSLLambdaImage.ts
@@ -16,7 +16,7 @@ import type { logFn } from '../../../cli/log.js'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
-import pJSON from '../../../package.json'
+import pJSON from '../../../package.json' assert { type: 'json' }
 
 export const buildOpenSSLLambdaImage = async (
 	builder: ImageBuilder,
@@ -26,10 +26,10 @@ export const buildOpenSSLLambdaImage = async (
 ): Promise<string> => {
 	const dockerFilePath = path.join(__dirname, 'openssl-lambda')
 
-	const { zipFile, hash } = await packLambdaFromPath(
-		'openSSL',
-		'lambda/openSSL.ts',
-	)
+	const { zipFilePath, hash } = await packLambdaFromPath({
+		id: 'openSSL',
+		sourceFilePath: 'lambda/openSSL.ts',
+	})
 
 	const tag = checkSumOfStrings([
 		await hashFolder(dockerFilePath),
@@ -52,7 +52,7 @@ export const buildOpenSSLLambdaImage = async (
 
 	await run({
 		command: 'unzip',
-		args: ['-o', zipFile, '-d', path.join(distDir, 'lambda')],
+		args: ['-o', zipFilePath, '-d', path.join(distDir, 'lambda')],
 		log: { debug, stderr: debug, stdout: debug },
 	})
 

diff --git a/cli/cli.ts b/cli/cli.ts
@@ -10,7 +10,7 @@ import { program } from 'commander'
 import { env } from '../aws/env.js'
 import type { StackOutputs } from '../cdk/BackendStack.js'
 import { STACK_NAME } from '../cdk/stackConfig.js'
-import psjon from '../package.json'
+import psjon from '../package.json' assert { type: 'json' }
 import type { CommandDefinition } from './commands/CommandDefinition.js'
 import { buildContainersCommand } from './commands/build-container.js'
 import { configureHelloCommand } from './commands/configure-hello.js'