Skip to content

Commit

Permalink
Update node dependencies 2024-11-01 (#256)
Browse files Browse the repository at this point in the history
* Updated version and lock file

* Updated storybook, cookie, and react-datepicker

* Fixed link in README

* Fixed log message

* Removed uneeeded dependencies and updated lock file

* Added cargo install to pr script
  • Loading branch information
tkmcmaster authored Nov 5, 2024
1 parent 57bac3a commit bef513e
Show file tree
Hide file tree
Showing 10 changed files with 20,037 additions and 2,713 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
node_modules
.nyc_output/
coverage/
mutants.out/
/controller/aws*.sh
testmerge.json
.env.local*
Expand Down
2 changes: 1 addition & 1 deletion agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PewPew as a Service Agent Machine that runs PewPew Tests using Node.js + Typescr
This allows us to run load tests using [pewpew](https://github.com/FamilySearch/pewpew) in AWS without having to manually create an ec2 instance. By putting the test files in s3 and putting a message on an SQS queue, an EC2 instance will be spun up to run the test, then shutdown when complete.

### Shared code
Shared code for the agent and the controller are found in [ppaas-common](https://github.com/FamilySearch/pewpew/common)
Shared code for the agent and the controller are found in [ppaas-common](https://github.com/FamilySearch/pewpew/tree/master/common)

## Environment Config
For your full deployment you should have environment variables injected into CloudFormation to set up the S3 bucket and SQS queues. For local development, copy the `.sample-env` file to `.env.local` (or run `cp -i .sample.env .env.local`). Then modify the .env.local file to point to your S3 bucket and your SQS queues. You can also override the default AWS profile for your local testing via the `AWS_PROFILE` variable if you are not using `default`.
Expand Down
2 changes: 1 addition & 1 deletion agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-agent",
"version": "3.3.2",
"version": "3.3.3",
"description": "Agent Service for running pewpew tests",
"main": "dist/src/app.js",
"scripts": {
Expand Down
3 changes: 1 addition & 2 deletions common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-common",
"version": "3.3.2",
"version": "3.3.3",
"description": "Common Code for the PewPewController and PewPewAgent",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
Expand Down Expand Up @@ -45,7 +45,6 @@
"@fs/config-wasm": "*",
"@types/bunyan": "~1.8.8",
"@types/chai": "^4.3.5",
"@types/express": "^4.17.17",
"@types/mocha": "^10.0.0",
"@types/node": "^22.0.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
Expand Down
19 changes: 9 additions & 10 deletions controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-controller",
"version": "3.3.2",
"version": "3.3.3",
"description": "Controller Service for running pewpew tests",
"private": true,
"scripts": {
Expand Down Expand Up @@ -54,9 +54,8 @@
"bunyan": "~1.8.0",
"chart.js": "~4.4.0",
"chartjs-adapter-date-fns": "^3.0.0",
"cookie": "^0.6.0",
"cookie": "^1.0.0",
"date-fns": "~3.6.0",
"express": "^4.18.2",
"file-saver": "^2.0.5",
"formidable": "~3.5.0",
"js-cookie": "^3.0.5",
Expand All @@ -67,7 +66,7 @@
"rc-progress": "^4.0.0",
"react": "^18.2.0",
"react-accessible-accordion": "^5.0.0",
"react-datepicker": "~7.4.0",
"react-datepicker": "~7.5.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-transition-group": "^4.4.5",
Expand All @@ -83,11 +82,11 @@
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.8.0",
"@next/eslint-plugin-next": "~14.2.0",
"@storybook/addon-actions": "~8.3.0",
"@storybook/addon-links": "~8.3.0",
"@storybook/nextjs": "~8.3.0",
"@storybook/preview-api": "~8.3.0",
"@storybook/react": "~8.3.0",
"@storybook/addon-actions": "~8.4.0",
"@storybook/addon-links": "~8.4.0",
"@storybook/nextjs": "~8.4.0",
"@storybook/preview-api": "~8.4.0",
"@storybook/react": "~8.4.0",
"@testing-library/dom": "^10.2.0",
"@testing-library/react": "^16.0.0",
"@types/bunyan": "~1.8.8",
Expand Down Expand Up @@ -123,7 +122,7 @@
"nyc": "^17.0.0",
"postcss": "^8.4.24",
"set-value": "^4.1.0",
"storybook": "~8.3.0",
"storybook": "~8.4.0",
"trim": "^1.0.1",
"typescript": "^5.3.0"
}
Expand Down
4 changes: 2 additions & 2 deletions controller/pages/api/util/secrets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export async function deleteSecret (secretKeyName: string, force?: boolean): Pro
}

export async function getSecretValue (secretKeyName: string): Promise<string> {
log(`getKey(${secretKeyName})`, LogLevel.DEBUG);
log(`getSecretValue(${secretKeyName})`, LogLevel.DEBUG);
try {
// Try secrets manager first
init();
Expand Down Expand Up @@ -285,7 +285,7 @@ export async function decryptFile (encryptedFilePath: string, decryptedFilePath?
decryptedFileContents = await readFile(decryptedFilePath, "utf8");
log("Using the fallback " + decryptedFilePath, LogLevel.WARN);
} catch (error) {
log(`Could load ${decryptedFilePath}, encryptionKey === undefined && IS_RUNNING_IN_AWS === false`, LogLevel.ERROR, error);
log(`Could not load ${decryptedFilePath}, encryptionKey === undefined && IS_RUNNING_IN_AWS === false`, LogLevel.ERROR, error);
log(`Please see the README for setting up a Secrets Key override file or create the ${decryptedFilePath} from the template`, LogLevel.ERROR);
}
}
Expand Down
Loading

0 comments on commit bef513e

Please sign in to comment.