Skip to content

Commit

Permalink
Merge pull request #210 from BenjiTheC/main
Browse files Browse the repository at this point in the history
Upgrade dependency versions to fix audit scanning
  • Loading branch information
BenjiTheC authored May 20, 2024
2 parents 2d96c7e + 3ea5837 commit 9fcfc95
Show file tree
Hide file tree
Showing 46 changed files with 3,830 additions and 5,772 deletions.
9,286 changes: 3,660 additions & 5,626 deletions source/common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/common/config/rush/repo-state.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
{
"pnpmShrinkwrapHash": "fa2b3bdcf3e13e230c0ca3e9c6f094f5f0042c31",
"pnpmShrinkwrapHash": "7351b2b152284c5aa01e1ade35536cc62bfff9ca",
"preferredVersionsHash": "14c05a7722342014cec64c4bef7d9bed0d0b7b7f"
}
16 changes: 8 additions & 8 deletions source/packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"integration-test": "APP_CONFIG_DIR=${PWD}/src/config cucumber-js"
},
"dependencies": {
"@aws-sdk/client-ec2": "~3.38.0",
"@aws-sdk/client-greengrassv2": "~3.38.0",
"@aws-sdk/client-s3": "~3.38.0",
"@aws-sdk/s3-request-presigner": "~3.38.0",
"@aws-sdk/client-cloudformation": "~3.38.0",
"@aws-sdk/client-ec2": "~3.575.0",
"@aws-sdk/client-greengrassv2": "3.575.0",
"@aws-sdk/client-s3": "3.575.0",
"@aws-sdk/s3-request-presigner": "~3.575.0",
"@aws-sdk/client-cloudformation": "~3.575.0",
"@awssolutions/cdf-assetlibrary-client": "workspace:^2.5.2",
"@awssolutions/cdf-assetlibraryhistory-client": "workspace:^2.5.2",
"@awssolutions/cdf-commandandcontrol-client": "workspace:^2.5.2",
Expand All @@ -32,15 +32,15 @@
"@awssolutions/simple-cdf-logger": "workspace:^2.5.2",
"@cucumber/cucumber": "7.3.2",
"atob": "2.1.2",
"aws-iot-device-sdk-v2": "1.6.5",
"aws-iot-device-sdk-v2": "1.19.5",
"aws-sdk": "2.1386.0",
"axios": "1.6.0",
"chai-string": "1.5.0",
"chai-uuid": "1.0.6",
"chai": "4.2.0",
"dotenv-flow": "3.2.0",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"inversify": "6.0.1",
"js-yaml": "4.1.0",
"json-stable-stringify": "1.0.1",
Expand All @@ -62,7 +62,7 @@
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
"@types/atob": "2.1.2",
"@types/chai-string": "1.4.2",
"@types/chai-string": "1.4.5",
"@types/chai-uuid": "^1.0.2",
"@types/chai": "4.2.14",
"@types/dotenv-flow": "3.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ import {
PatchService,
} from '@awssolutions/cdf-device-patcher-client';

import { EC2Client, RunInstancesCommand, RunInstancesCommandInput } from '@aws-sdk/client-ec2';
import {
_InstanceType,
EC2Client,
RunInstancesCommand,
RunInstancesCommandInput,
} from '@aws-sdk/client-ec2';
import { logger } from '@awssolutions/simple-cdf-logger';
import { fail } from 'assert';
import fs from 'fs';
Expand Down Expand Up @@ -112,7 +117,7 @@ When(
const userData = fs.readFileSync(bootstrapScript, 'utf8');
const params: RunInstancesCommandInput = {
ImageId: process.env.DEVICE_PATCHER_EC2_IMAGEID,
InstanceType: process.env.DEVICE_PATCHER_EC2_INSTANCETYPE,
InstanceType: process.env.DEVICE_PATCHER_EC2_INSTANCETYPE as _InstanceType,
IamInstanceProfile: {
Name: process.env.DEVICE_PATCHER_EC2_IAMINSTANCEPROFILE,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
*********************************************************************************************************************/
import 'reflect-metadata';

import { EC2Client, RunInstancesCommand, RunInstancesCommandInput } from '@aws-sdk/client-ec2';
import {
EC2Client,
RunInstancesCommand,
RunInstancesCommandInput,
_InstanceType,
} from '@aws-sdk/client-ec2';
import {} from '@aws-sdk/client-greengrassv2';
import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
Expand Down Expand Up @@ -195,7 +200,8 @@ When(
const userData = fs.readFileSync(bootstrapScript, 'utf8');
const params: RunInstancesCommandInput = {
ImageId: process.env.GREENGRASS2PROVISIONING_EC2_IMAGEID,
InstanceType: process.env.GREENGRASS2PROVISIONING_EC2_INSTANCETYPE,
InstanceType: process.env
.GREENGRASS2PROVISIONING_EC2_INSTANCETYPE as _InstanceType,
IamInstanceProfile: {
Name: process.env.GREENGRASS2PROVISIONING_EC2_IAMINSTANCEPROFILE,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"@awssolutions/simple-cdf-logger": "workspace:^2.5.2",
"aws-sdk": "2.1386.0",
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify": "6.0.2",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand All @@ -34,7 +34,7 @@
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
"@typescript-eslint/eslint-plugin": "6.2.0",
"@types/http-errors": "~2.0.1",
"@types/http-errors": "~2.0.4",
"@types/query-string": "^6.3.0",
"@types/superagent": "4.1.15",
"eslint": "8.46.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"aws-sdk": "2.1386.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"http-errors": "~2.0.0",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.2.0",
"ow": "0.23.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"test": "rushx lint && jest --silent --passWithNoTests --maxWorkers=$JEST_MAX_WORKERS"
},
"dependencies": {
"@aws-sdk/credential-providers": "3.252.0",
"@aws-sdk/credential-providers": "3.575.0",
"aws4": "1.12.0",
"superagent": "7.1.1",
"url": "0.11.0"
},
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
"@typescript-eslint/eslint-plugin": "6.2.0",
"@types/aws4": "1.11.2",
"@types/aws4": "1.11.6",
"@types/jest": "26.0.23",
"@types/node": "^18.17.0",
"@types/superagent": "4.1.16",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"js-yaml": "4.1.0",
"jsonwebtoken": "9.0.0",
"logform": "2.4.2",
"nodemon": "2.0.20",
"nodemon": "3.1.0",
"nyc": "15.1.0",
"ow": "0.23.0",
"readable-stream": "3.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"@types/glob": "~8.0.1",
"@types/jest": "~29.4.0",
"@types/node": "~18.11.18",
"@types/yargs": "~17.0.20",
"@types/yargs": "~17.0.32",
"eslint": "8.46.0",
"glob": "~8.1.0",
"jest": "~29.4.1",
"shx": "0.3.3",
"ts-jest": "~29.0.5",
"typescript": "~4.9.4",
"yargs": "~17.6.2"
"yargs": "~17.7.2"
}
}
4 changes: 2 additions & 2 deletions source/packages/libraries/core/event-publisher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "rushx lint && jest --silent --passWithNoTests --maxWorkers=$JEST_MAX_WORKERS"
},
"dependencies": {
"@aws-sdk/client-eventbridge": "3.38.0",
"@aws-sdk/client-eventbridge": "3.575.0",
"@awssolutions/cdf-lambda-invoke": "workspace:^2.5.2",
"@awssolutions/cdf-logger": "workspace:^2.5.2",
"@awssolutions/simple-cdf-logger": "workspace:^2.5.2",
Expand All @@ -24,7 +24,7 @@
"superagent": "7.1.1",
"winston": "3.3.3",
"winston-transport": "4.4.0",
"@aws-sdk/client-iot": "~3.37.0"
"@aws-sdk/client-iot": "3.575.0"
},
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "rushx lint && jest --silent --passWithNoTests --maxWorkers=$JEST_MAX_WORKERS"
},
"dependencies": {
"express": "4.18.2"
"express": "4.19.2"
},
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
Expand All @@ -30,7 +30,7 @@
"jest": "26.6.3",
"ts-jest": "26.5.6",
"typescript": "4.2.4",
"@types/express": "4.17.16"
"@types/express": "4.17.21"
},
"jest": {
"globals": {},
Expand Down
4 changes: 2 additions & 2 deletions source/packages/libraries/core/lambda-invoke/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@awssolutions/simple-cdf-logger": "workspace:^2.5.2",
"aws-sdk": "2.1386.0",
"http-errors": "1.8.0",
"inversify": "6.0.1",
"inversify": "6.0.2",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"reflect-metadata": "0.1.13",
Expand Down
4 changes: 2 additions & 2 deletions source/packages/libraries/core/lambda-zip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"devDependencies": {
"typescript": "~4.9.4",
"@types/archiver": "~5.3.1",
"yargs": "~17.6.2",
"@types/yargs": "~17.0.20",
"yargs": "~17.7.2",
"@types/yargs": "~17.0.32",
"glob": "~8.1.0",
"@types/glob": "~8.0.1",
"jest": "~29.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "rushx lint && jest --silent --passWithNoTests --maxWorkers=$JEST_MAX_WORKERS"
},
"dependencies": {
"@aws-sdk/client-iot": "~3.37.0",
"@aws-sdk/client-iot": "3.575.0",
"@awssolutions/cdf-assetlibrary-client": "workspace:^2.5.2",
"@awssolutions/cdf-lambda-invoke": "workspace:^2.5.2",
"@awssolutions/cdf-logger": "workspace:^2.5.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@
"test": "rushx lint && jest --silent --passWithNoTests"
},
"dependencies": {
"aws-iot-device-sdk": "2.2.8",
"aws-iot-device-sdk": "2.2.13",
"dayjs": "1.10.5",
"deep-equal": "2.0.5",
"deepmerge": "4.2.2",
"inversify": "5.1.1",
"js-yaml": "4.1.0",
"logform": "2.4.2",
"ow": "0.23.0",
"pem": "1.14.4",
"pem": "1.14.8",
"readable-stream": "3.6.0",
"reflect-metadata": "0.1.13",
"shortid": "2.2.16",
"winston": "3.3.3",
"winston-transport": "4.4.0",
"yargs": "~17.6.2",
"yargs": "~17.7.2",
"mustache": "4.2.0",
"dotenv-flow": "~3.2.0"
},
"devDependencies": {
"@awssolutions/eslint-config-custom": "workspace:~0.0.0",
"@types/aws-iot-device-sdk": "2.2.2",
"@types/aws-iot-device-sdk": "2.2.8",
"@types/jest": "26.0.23",
"@types/js-yaml": "3.12.5",
"@types/mustache": "4.1.1",
"@types/pem": "1.9.5",
"@types/shortid": "0.0.29",
"@types/yargs": "~17.0.20",
"@types/yargs": "~17.0.32",
"@typescript-eslint/eslint-plugin": "6.2.0",
"eslint": "8.46.0",
"jest": "26.6.3",
Expand All @@ -47,7 +47,7 @@
"jest-mock": "26.6.2",
"jest-mock-extended": "1.0.14",
"jest-resolve": "26.6.2",
"nodemon": "2.0.20",
"nodemon": "3.1.0",
"nyc": "15.1.0",
"shx": "0.3.3",
"ts-jest": "26.5.6",
Expand Down
8 changes: 4 additions & 4 deletions source/packages/services/assetlibrary-export/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@types/body-parser": "1.19.2",
"@types/cors": "2.8.8",
"@types/dotenv-flow": "~3.2.0",
"@types/express": "4.17.16",
"@types/express": "4.17.21",
"@types/express-serve-static-core": "4.17.16",
"@types/express-version-request": "1.7.1",
"@types/jest": "26.0.18",
Expand All @@ -63,7 +63,7 @@
"gremlin": "3.4.8",
"inversify": "6.0.1",
"inversify-binding-decorators": "4.0.0",
"inversify-express-utils": "6.4.3",
"inversify-express-utils": "6.4.6",
"jest": "26.6.3",
"jest-create-mock-instance": "1.1.0",
"jest-express": "1.12.0",
Expand All @@ -75,10 +75,10 @@
"jsonwebtoken": "9.0.0",
"lodash": "4.17.21",
"logform": "2.4.2",
"luxon": "2.3.0",
"luxon": "3.4.4",
"mime": "1.6.0",
"moment": "2.29.4",
"nodemon": "2.0.20",
"nodemon": "3.1.0",
"nyc": "15.1.0",
"ow": "0.15.0",
"p-limit": "3.1.0",
Expand Down
Loading

0 comments on commit 9fcfc95

Please sign in to comment.