Skip to content

Commit

Permalink
fix: update dependencies
Browse files Browse the repository at this point in the history
Closes #882
Closes #878
  • Loading branch information
coderbyheart committed Aug 9, 2024
1 parent 10a8459 commit 196eeb8
Show file tree
Hide file tree
Showing 115 changed files with 490 additions and 458 deletions.
4 changes: 2 additions & 2 deletions Memfault/MemfaultReboots.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it } from 'node:test'
import assert from 'node:assert'
import { validateWithTypeBox } from '@hello.nrfcloud.com/proto'
import assert from 'node:assert'
import { describe, it } from 'node:test'
import { MemfaultReboots } from './MemfaultReboots.js'
import res from './reboots.json'

Expand Down
2 changes: 1 addition & 1 deletion Memfault/api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { validateWithTypeBox } from '@hello.nrfcloud.com/proto'
import { type Static } from '@sinclair/typebox'
import { MemfaultReboots } from './MemfaultReboots.js'
import { ValidationError } from '../util/ValidationError.js'
import { MemfaultReboots } from './MemfaultReboots.js'

export const v = validateWithTypeBox(MemfaultReboots)

Expand Down
2 changes: 1 addition & 1 deletion bridge/createCAVerificationCert.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { IoTClient } from '@aws-sdk/client-iot'
import { GetRegistrationCodeCommand } from '@aws-sdk/client-iot'
import run from '@bifravst/run'
import { randomUUID } from 'crypto'
import { unlink } from 'fs/promises'
import path from 'path'
import { type logFn } from '../cli/log.js'
import run from '@bifravst/run'
import { caLocation } from './caLocation.js'

export const createCAVerificationCert = async ({
Expand Down
2 changes: 1 addition & 1 deletion bridge/ensureCA.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IoTClient } from '@aws-sdk/client-iot'
import run from '@bifravst/run'
import { mkdir, stat } from 'node:fs/promises'
import type { logFn } from '../cli/log.js'
import run from '@bifravst/run'
import { ulid } from '../util/ulid.js'
import { caLocation, type CAFiles } from './caLocation.js'
import { createCAVerificationCert } from './createCAVerificationCert.js'
Expand Down
2 changes: 1 addition & 1 deletion bridge/ensureMQTTBridgeCredentials.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IoTClient } from '@aws-sdk/client-iot'
import run from '@bifravst/run'
import { mkdir, stat } from 'node:fs/promises'
import type { logFn } from '../cli/log.js'
import run from '@bifravst/run'
import { ulid } from '../util/ulid.js'
import { ensureCA } from './ensureCA.js'
import {
Expand Down
16 changes: 8 additions & 8 deletions cdk/BackendStack.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { repositoryName } from '@bifravst/aws-cdk-ecr-helpers/repository'
import { LambdaSource } from '@bifravst/aws-cdk-lambda-helpers/cdk'
import type { PackedLayer } from '@bifravst/aws-cdk-lambda-helpers/layer'
import { LwM2MObjectID } from '@hello.nrfcloud.com/proto-map/lwm2m'
import type { App } from 'aws-cdk-lib'
import {
CfnOutput,
Expand All @@ -15,8 +16,11 @@ import { type CAFiles } from '../bridge/caLocation.js'
import type { CertificateFiles } from '../bridge/mqttBridgeCertificateLocation.js'
import type { BackendLambdas } from './packBackendLambdas.js'
import { API } from './resources/API.js'
import {
APICustomDomain,
type CustomDomain,
} from './resources/APICustomDomain.js'
import { APIHealthCheck } from './resources/APIHealthCheck.js'
import { UpdateDeviceState } from './resources/UpdateDeviceState.js'
import { ContinuousDeployment } from './resources/ContinuousDeployment.js'
import { ConvertNrfCloudDeviceMessages } from './resources/ConvertNrfCloudDeviceMessages.js'
import { DeviceFOTA } from './resources/DeviceFOTA.js'
Expand All @@ -30,21 +34,17 @@ import { HealthCheckCoAP } from './resources/HealthCheckCoAP.js'
import { HealthCheckMqtt } from './resources/HealthCheckMqtt.js'
import { Integration } from './resources/Integration.js'
import { LwM2MObjectsHistory } from './resources/LwM2MObjectsHistory.js'
import { MemfaultReboots } from './resources/MemfaultReboots.js'
import { Monitoring } from './resources/Monitoring.js'
import { SenMLImportLogs } from './resources/SenMLImportLogs.js'
import { CoAPSenMLtoLwM2M } from './resources/SenMLtoLwM2M.js'
import { UpdateDevice } from './resources/UpdateDevice.js'
import { UpdateDeviceState } from './resources/UpdateDeviceState.js'
import { WebsocketAPI } from './resources/WebsocketAPI.js'
import { WebsocketConnectionsTable } from './resources/WebsocketConnectionsTable.js'
import { WebsocketEventBus } from './resources/WebsocketEventBus.js'
import { KPIs } from './resources/kpis/KPIs.js'
import { STACK_NAME } from './stackConfig.js'
import {
APICustomDomain,
type CustomDomain,
} from './resources/APICustomDomain.js'
import { MemfaultReboots } from './resources/MemfaultReboots.js'
import { LwM2MObjectID } from '@hello.nrfcloud.com/proto-map/lwm2m'
import { UpdateDevice } from './resources/UpdateDevice.js'

export class BackendStack extends Stack {
public constructor(
Expand Down
12 changes: 6 additions & 6 deletions cdk/backend.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import { ACMClient } from '@aws-sdk/client-acm'
import { IAMClient } from '@aws-sdk/client-iam'
import { IoTClient } from '@aws-sdk/client-iot'
import { SSMClient } from '@aws-sdk/client-ssm'
import { STS } from '@aws-sdk/client-sts'
import { ensureGitHubOIDCProvider } from '@bifravst/ci'
import { fromEnv } from '@bifravst/from-env'
import { getAllAccounts } from '@hello.nrfcloud.com/nrfcloud-api-helpers/settings'
import { mkdir } from 'node:fs/promises'
import path from 'node:path'
import { getCertificateForDomain } from '../aws/acm.js'
import { env } from '../aws/env.js'
import { getIoTEndpoint } from '../aws/getIoTEndpoint.js'
import { caLocation } from '../bridge/caLocation.js'
import { ensureCA } from '../bridge/ensureCA.js'
import { ensureMQTTBridgeCredentials } from '../bridge/ensureMQTTBridgeCredentials.js'
import { mqttBridgeCertificateLocation } from '../bridge/mqttBridgeCertificateLocation.js'
import { debug, type logFn } from '../cli/log.js'
import pJSON from '../package.json'
import { getAllAccounts } from '@hello.nrfcloud.com/nrfcloud-api-helpers/settings'
import { ScopeContexts, type ScopeContext } from '../settings/scope.js'
import { BackendApp } from './BackendApp.js'
import { ensureGitHubOIDCProvider } from '@bifravst/ci'
import { restoreCertificateFromSSM } from './helpers/certificates/restoreCertificateFromSSM.js'
import { storeCertificateInSSM } from './helpers/certificates/storeCertificateInSSM.js'
import { env } from '../aws/env.js'
import { pack as packBaseLayer } from './layers/baseLayer.js'
import { pack as packCDKLayer } from './layers/cdkLayer.js'
import { pack as packHealthCheckLayer } from './layers/healthCheckLayer.js'
import { pack as packJWTLayer } from './layers/jwtLayer.js'
import { packBackendLambdas } from './packBackendLambdas.js'
import { STACK_NAME } from './stackConfig.js'
import { ScopeContexts, type ScopeContext } from '../settings/scope.js'
import { getCertificateForDomain } from '../aws/acm.js'
import { ACMClient } from '@aws-sdk/client-acm'

const repoUrl = new URL(pJSON.repository.url)
const repository = {
Expand Down
6 changes: 3 additions & 3 deletions cdk/helpers/certificates/readFilesFromMap.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { describe, it } from 'node:test'
import assert from 'node:assert/strict'
import path from 'node:path'
import os from 'node:os'
import fs from 'node:fs/promises'
import os from 'node:os'
import path from 'node:path'
import { describe, it } from 'node:test'
import { readFilesFromMap } from './readFilesFromMap.js'

void describe('readFilesFromMap()', () => {
Expand Down
16 changes: 8 additions & 8 deletions cdk/helpers/certificates/restoreCertificateFromSSM.spec.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { describe, it, mock } from 'node:test'
import assert from 'node:assert/strict'
import {
ParameterType,
type GetParametersByPathCommandOutput,
} from '@aws-sdk/client-ssm'
import { restoreCertificateFromSSM } from './restoreCertificateFromSSM.js'
import { caLocation } from '../../../bridge/caLocation.js'
import path from 'node:path'
import os from 'node:os'
import assert from 'node:assert/strict'
import fs from 'node:fs/promises'
import { readFilesFromMap } from './readFilesFromMap.js'
import os from 'node:os'
import path from 'node:path'
import { describe, it, mock } from 'node:test'
import { arrayContaining, check, objectMatching } from 'tsmatchers'
import { assertCall } from '../../../util/test/assertCall.js'
import { caLocation } from '../../../bridge/caLocation.js'
import { ScopeContexts } from '../../../settings/scope.js'
import { assertCall } from '../../../util/test/assertCall.js'
import { readFilesFromMap } from './readFilesFromMap.js'
import { restoreCertificateFromSSM } from './restoreCertificateFromSSM.js'

void describe('restoreCertificateFromSSM()', () => {
void it('should query SSM for stored certificates, but not restored if value is not present', async () => {
Expand Down
4 changes: 2 additions & 2 deletions cdk/helpers/certificates/restoreCertificateFromSSM.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { SSMClient } from '@aws-sdk/client-ssm'
import { type logFn } from '../../../cli/log.js'
import { writeFilesFromMap } from './writeFilesFromMap.js'
import { maybe } from '@bifravst/aws-ssm-settings-helpers'
import { type logFn } from '../../../cli/log.js'
import { type ScopeContext } from '../../../settings/scope.js'
import { writeFilesFromMap } from './writeFilesFromMap.js'

export const restoreCertificateFromSSM =
({ ssm, stackName }: { ssm: SSMClient; stackName: string }) =>
Expand Down
14 changes: 7 additions & 7 deletions cdk/helpers/certificates/storeCertificateInSSM.spec.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { describe, it, mock } from 'node:test'
import assert from 'node:assert/strict'
import { ParameterType, type SSMClient } from '@aws-sdk/client-ssm'
import { caLocation } from '../../../bridge/caLocation.js'
import path from 'node:path'
import os from 'node:os'
import assert from 'node:assert/strict'
import fs from 'node:fs/promises'
import { writeFilesFromMap } from './writeFilesFromMap.js'
import { storeCertificateInSSM } from './storeCertificateInSSM.js'
import os from 'node:os'
import path from 'node:path'
import { describe, it, mock } from 'node:test'
import { arrayContaining, check, objectMatching } from 'tsmatchers'
import { caLocation } from '../../../bridge/caLocation.js'
import { ScopeContexts } from '../../../settings/scope.js'
import { storeCertificateInSSM } from './storeCertificateInSSM.js'
import { writeFilesFromMap } from './writeFilesFromMap.js'

void describe('storeCertificateInSSM()', () => {
void it('should store a certificate map in SSM', async () => {
Expand Down
4 changes: 2 additions & 2 deletions cdk/helpers/certificates/storeCertificateInSSM.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { SSMClient } from '@aws-sdk/client-ssm'
import { type logFn } from '../../../cli/log.js'
import { readFilesFromMap } from './readFilesFromMap.js'
import { put } from '@bifravst/aws-ssm-settings-helpers'
import { type logFn } from '../../../cli/log.js'
import { type ScopeContext } from '../../../settings/scope.js'
import { readFilesFromMap } from './readFilesFromMap.js'

export const storeCertificateInSSM =
({ ssm, stackName }: { ssm: SSMClient; stackName: string }) =>
Expand Down
6 changes: 3 additions & 3 deletions cdk/helpers/certificates/writeFilesFromMap.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { describe, it } from 'node:test'
import assert from 'node:assert/strict'
import path from 'node:path'
import os from 'node:os'
import fs from 'node:fs/promises'
import os from 'node:os'
import path from 'node:path'
import { describe, it } from 'node:test'
import { writeFilesFromMap } from './writeFilesFromMap.js'

void describe('writeFilesFromMap()', () => {
Expand Down
4 changes: 2 additions & 2 deletions cdk/helpers/lambda/packGo.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { PackedLambda } from '@bifravst/aws-cdk-lambda-helpers'
import { checkSumOfFiles } from '@bifravst/aws-cdk-lambda-helpers/util'
import run from '@bifravst/run'
import { createWriteStream } from 'node:fs'
import { readdir, readFile } from 'node:fs/promises'
import { join } from 'node:path'
import yazl from 'yazl'
import { createWriteStream } from 'node:fs'
import run from '@bifravst/run'

const zipBinary = async (binary: Buffer, outfile: string): Promise<void> => {
const zipFile = new yazl.ZipFile()
Expand Down
8 changes: 4 additions & 4 deletions cdk/resources/APICustomDomain.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Construct } from 'constructs'
import { PackedLambdaFn } from '@bifravst/aws-cdk-lambda-helpers/cdk'
import {
CustomResource,
aws_apigatewayv2 as HttpApi,
aws_iam as IAM,
ResolutionTypeHint,
type aws_lambda as Lambda,
aws_iam as IAM,
} from 'aws-cdk-lib'
import type { API } from './API.js'
import { Construct } from 'constructs'
import type { BackendLambdas } from '../packBackendLambdas.js'
import { PackedLambdaFn } from '@bifravst/aws-cdk-lambda-helpers/cdk'
import type { API } from './API.js'

export type CustomDomain = {
domainName: string
Expand Down
2 changes: 1 addition & 1 deletion cdk/resources/DeviceFOTA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import {
aws_lambda_event_sources as EventSources,
aws_events_targets as EventTargets,
aws_events as Events,
aws_iam as IAM,
aws_lambda as Lambda,
RemovalPolicy,
aws_sqs as SQS,
aws_iam as IAM,
} from 'aws-cdk-lib'
import { Construct } from 'constructs'
import type { BackendLambdas } from '../packBackendLambdas.js'
Expand Down
2 changes: 1 addition & 1 deletion cdk/resources/DeviceLastSeen.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { IoTActionRole } from '@bifravst/aws-cdk-lambda-helpers/cdk'
import {
aws_dynamodb as DynamoDB,
aws_iot as IoT,
RemovalPolicy,
} from 'aws-cdk-lib'
import { Construct } from 'constructs'
import { IoTActionRole } from '@bifravst/aws-cdk-lambda-helpers/cdk'

/**
* Record the timestamp when the device was last seen
Expand Down
6 changes: 3 additions & 3 deletions cdk/resources/DeviceLocationHistory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ import type { aws_lambda as Lambda } from 'aws-cdk-lib'
import {
Duration,
aws_dynamodb as DynamoDB,
aws_events_targets as EventTargets,
aws_events as Events,
aws_lambda_event_sources as EventSources,
RemovalPolicy,
aws_events_targets as EventTargets,
aws_iam as IAM,
RemovalPolicy,
aws_sqs as SQS,
} from 'aws-cdk-lib'
import { Construct } from 'constructs'
import type { BackendLambdas } from '../packBackendLambdas.js'
import type { DeviceStorage } from './DeviceStorage.js'
import type { WebsocketConnectionsTable } from './WebsocketConnectionsTable.js'
import type { WebsocketEventBus } from './WebsocketEventBus.js'
import type { DeviceStorage } from './DeviceStorage.js'

/**
* Makes the device location history available to the frontend
Expand Down
2 changes: 1 addition & 1 deletion cdk/resources/DeviceShadow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
} from 'aws-cdk-lib'
import { Construct } from 'constructs'
import type { BackendLambdas } from '../packBackendLambdas.js'
import type { DeviceStorage } from './DeviceStorage.js'
import type { WebsocketConnectionsTable } from './WebsocketConnectionsTable.js'
import type { WebsocketEventBus } from './WebsocketEventBus.js'
import type { DeviceStorage } from './DeviceStorage.js'

/**
* Updates the LwM2M shadow for each device from nRF Cloud
Expand Down
12 changes: 6 additions & 6 deletions cdk/resources/Integration.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
import { settingsPath } from '@bifravst/aws-ssm-settings-helpers'
import {
NRFCLOUD_ACCOUNT_SCOPE,
nrfCloudAccount,
type Settings as nRFCloudSettings,
} from '@hello.nrfcloud.com/nrfcloud-api-helpers/settings'
import {
Duration,
aws_ec2 as EC2,
Expand All @@ -13,12 +19,6 @@ import { Construct } from 'constructs'
import { readFileSync } from 'node:fs'
import { type CAFiles } from '../../bridge/caLocation.js'
import type { CertificateFiles } from '../../bridge/mqttBridgeCertificateLocation.js'
import {
NRFCLOUD_ACCOUNT_SCOPE,
type Settings as nRFCloudSettings,
} from '@hello.nrfcloud.com/nrfcloud-api-helpers/settings'
import { nrfCloudAccount } from '@hello.nrfcloud.com/nrfcloud-api-helpers/settings'
import { settingsPath } from '@bifravst/aws-ssm-settings-helpers'
import { ScopeContexts } from '../../settings/scope.js'

export class Integration extends Construct {
Expand Down
2 changes: 1 addition & 1 deletion cdk/resources/SenMLtoLwM2M.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import {
} from 'aws-cdk-lib'
import { Construct } from 'constructs'
import type { BackendLambdas } from '../packBackendLambdas.js'
import type { WebsocketEventBus } from './WebsocketEventBus.js'
import type { DeviceLastSeen } from './DeviceLastSeen.js'
import type { WebsocketEventBus } from './WebsocketEventBus.js'

/**
* Resources needed to convert LwM2M updates sent by devices via CoAP to nRF Cloud to the format that hello.nrfcloud.com expects
Expand Down
8 changes: 4 additions & 4 deletions cdk/resources/containers/buildMQTTBridgeImage.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import path from 'node:path'
import { hashFolder } from '@bifravst/aws-cdk-ecr-helpers/hashFolder'
import {
type ImageBuilder,
type ImageChecker,
} from '@bifravst/aws-cdk-ecr-helpers/image'
import { type logFn } from '../../../cli/log.js'
import { getMosquittoLatestTag } from '../../../docker/getMosquittoLatestTag.js'
import { checkSumOfStrings } from '@bifravst/aws-cdk-lambda-helpers/util'
import { hashFolder } from '@bifravst/aws-cdk-ecr-helpers/hashFolder'
import path from 'node:path'
import { ContainerRepositoryId } from '../../../aws/ecr.js'
import { type logFn } from '../../../cli/log.js'
import { getMosquittoLatestTag } from '../../../docker/getMosquittoLatestTag.js'

export const buildMQTTBridgeImage = async (
builder: ImageBuilder,
Expand Down
Loading

0 comments on commit 196eeb8

Please sign in to comment.