Update node dependencies 2024-09-27

agent/README.md

@@ -7,12 +7,12 @@ This allows us to run load tests using [pewpew](https://github.com/FamilySearch/
 ### Shared code
 Shared code for the agent and the controller are found in [ppaas-common](https://github.com/FamilySearch/pewpew/common)
 
-## Build
+## 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`.
 
+## Build
 ```bash
-
 $ npm i && npm run build
-
 ```
 
 ## Mac and Windows Testing
@@ -59,7 +59,6 @@ To start the server, run one of the following commands:
 ## npm run commands
 
 ```bash
-
 # You must set your aws credentials to start
 # start server
 $ npm start

agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fs/ppaas-agent",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Agent Service for running pewpew tests",
   "main": "dist/src/app.js",
   "scripts": {

common/README.md

@@ -2,7 +2,7 @@
 Common Code for the PewPew as a Service ([ppaas-agent](https://github.com/FamilySearch/pewpew/agent) and [ppaas-controller](https://github.com/FamilySearch/pewpew/controller))
 
 ## Purpose
-This allows us to run load tests using [pewpew](https://github.com/FamilySearch/pewpew) via a 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.
+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.
 
 ## Installation 
 ```sh
@@ -24,7 +24,7 @@ logger.log("Log to console", logger.LogLevel.ERROR);
 ```
 
 ## 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 `node setup.js`). 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`.
+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`.
 
 ## Build
 ```bash

common/integration/ec2.spec.ts

@@ -2,10 +2,6 @@ import { LogLevel, ec2, log } from "../src/index";
 import { expect } from "chai";
 
 describe("EC2 Integration", () => {
-  before (() => {
-    ec2.init();
-  });
-
   it("getInstanceId should get instanceId", (done: Mocha.Done) => {
     ec2.getInstanceId().then((result: string) => {
       log("getInstanceId", LogLevel.INFO, { result });

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fs/ppaas-common",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Common Code for the PewPewController and PewPewAgent",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -23,7 +23,7 @@
     "url": "git+https://github.com/FamilySearch/pewpew.git"
   },
   "engines": {
-    "node": ">=18.0.0 <21.0.0"
+    "node": ">=18.0.0 <23.0.0"
   },
   "nyc": {
     "exclude": "**/*.spec.ts"
@@ -32,7 +32,6 @@
     "@fs/config-wasm": "*"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.363.0",
     "@aws-sdk/client-s3": "^3.363.0",
     "@aws-sdk/client-sqs": "^3.363.0",
     "@aws-sdk/lib-storage": "^3.363.0",

common/src/util/ec2.ts

@@ -1,24 +1,9 @@
 import { LogLevel, log } from "./log";
-import {
-  EC2Client
-} from "@aws-sdk/client-ec2";
 import { exec as _exec } from "child_process";
 import { promisify } from "util";
 import { readFile } from "fs/promises";
 const exec = promisify(_exec);
 
-// Create these later so the profile can be set dynamically
-let ec2Client: EC2Client;
-
-// Init function to initialize these after we've started but on first access
-export function init (): void {
-  if (!ec2Client) {
-    ec2Client = new EC2Client({
-      region: "us-east-1"
-    });
-  }
-}
-
 export const INSTANCE_ID_FILE = "/var/lib/cloud/data/instance-id";
 export const INSTANCE_ID_REGEX = /^i-[0-9a-z]+$/;
 export const INSTANCE_FILE_REGEX = /^instance-id:\s*(i-[0-9a-z]+)$/;

controller/README.md

@@ -8,7 +8,7 @@ This allows us to run load tests using [pewpew](https://github.com/FamilySearch/
 Shared code for the agent and the controller are found in [ppaas-common](https://github.com/FamilySearch/pewpew/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 `node setup.js`). 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`.
+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`. 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`.
 
 ## Build
 ```bash
@@ -39,14 +39,14 @@ $ PORT=8081 npm run acceptance
 You also need to configure your Secrets Overrides. You have two options, get the real key from someone who has it, or generate your own key for testing/development but any files stored encrypted in s3 will only be accessible by you. For the OpenId secret, you will need the real one.
 
 ### Generate your own encryption key for testing
-1. If you haven't created a `.env.local` run `node setup.js`
+1. If you haven't created a `.env.local` run `cp -i .sample.env .env.local`
 2. Uncomment the `PEWPEW_ENCRYPT_KEY_OVERRIDE` from `.env.local`
 3. Run `openssl rand -hex 16` and copy the value into the quotes for `PEWPEW_ENCRYPT_KEY_OVERRIDE`. Should be something like `a5158c830ac558b21baddb79803105fb`.
 
 ### Add your own OpenId Secret
-1. If you haven't created a `.env.local` run `node setup.js`
-2. Uncomment the `SECRETS_OPENID_CLIENT_SECRET_NAME` from `.env.local`
-3. Enter the value for your secret into the quotes for `SECRETS_OPENID_CLIENT_SECRET_NAME`.
+1. If you haven't created a `.env.local` run `cp -i .sample.env .env.local`
+2. Uncomment the `PEWPEW_OPENID_SECRET_OVERRIDE` from `.env.local`
+3. Enter the value for your secret into the quotes for `PEWPEW_OPENID_SECRET_OVERRIDE`.
 
 ## Integration Tests
 ```bash
@@ -70,7 +70,7 @@ To start the server, run one of the following commands:
  Use http://localhost:8081/healthcheck/ after running the above command.
 
 ## Run the local server with authentication
-Running locally, only dev/integ/okta-np will let you redict back to localhost. Current users set up for dev/integration are ppaasadmin and ppaasuser with the usual test password. okta-np requires "Performance Test Non-Prod" permissions from the tools portal.
+Running locally, only dev/integ/okta-np will let you redict back to localhost.
 
 To start the server, run one of the following commands:
  ```bash
@@ -145,8 +145,8 @@ See [ServerFalt](https://serverfault.com/questions/536576/nginx-how-do-i-forward
 
 ```bash
 # Install nginx
-$ sudo apt-get update
-$ sudo apt-get install nginx
+$ sudo apt update
+$ sudo apt install nginx
 $ sudo vi /etc/nginx/sites-available/default
 ```
 
@@ -180,7 +180,7 @@ location /pewpew/load-test/ {
   proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
 }
 
-location /status/performance-test2/ {
+location /pewpew/performance-test2/ {
   proxy_pass      http://nodejs2/;
   proxy_set_header   Connection "";
   proxy_http_version 1.1;

controller/integration/files/rmsdeletestage20240617T193912876.info

@@ -1 +1 @@
-{"instanceId":"i-0ce84eb4256e6d420","hostname":"pewpewagent-devxl-app-36-236-143","ipAddress":"10.36.236.143","startTime":1718656021072,"endTime":1718657498160,"resultsFilename":["stats-rmsdeletestage20240617T193912876.json"],"status":"Finished","errors":["Received StopTest message from controller"],"version":"latest","queueName":"devxl","userId":"[email protected]"}
+{"instanceId":"i-0ce84eb4256e6d420","hostname":"pewpewagent-devxl-app-36-236-143","ipAddress":"10.36.236.143","startTime":1718656021072,"endTime":1718657498160,"resultsFilename":["stats-rmsdeletestage20240617T193912876.json"],"status":"Finished","errors":["Received StopTest message from controller"],"version":"latest","queueName":"devxl","userId":"pewpewuser"}