Update Dependencies 2024-05-29 (#223)

* Updated version and dependencies - Updated Storybook and Axios versions * Simplified _document for styled-components * Added code to upload pewpew for the agent tests if it's not already there. * Updated PR flows to add Node v22 testing * Removed reference to IMDSv1 command since we're not using it
FamilySearch · May 29, 2024 · 236ff43 · 236ff43
1 parent 0221bff
commit 236ff43
Show file tree

Hide file tree

Showing 15 changed files with 3,835 additions and 2,513 deletions.
diff --git a/.github/workflows/pr-guide.yml b/.github/workflows/pr-guide.yml
@@ -14,7 +14,7 @@ jobs:
     name: Build guide
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pr-ppaas.yml b/.github/workflows/pr-ppaas.yml
@@ -20,7 +20,7 @@ jobs:
     name: Build project
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
       fail-fast: false
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/pr-rust.yml b/.github/workflows/pr-rust.yml
@@ -112,7 +112,7 @@ jobs:
     strategy:
       matrix:
         wasm-dirctory: [config-wasm, hdr-histogram-wasm]
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     runs-on: ubuntu-latest
     env:
       WASM_FILE: ${{ matrix.wasm-dirctory }}_bg.wasm

diff --git a/agent/.github/workflows/pr.yml b/agent/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build project
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     runs-on: ubuntu-latest
     # env:
     #   USE_XVFB: true

diff --git a/agent/createtest/pewpewtest.spec.ts b/agent/createtest/pewpewtest.spec.ts
@@ -1,6 +1,7 @@
 import {
   LogLevel,
   MessageType,
+  PEWPEW_BINARY_FOLDER,
   PEWPEW_VERSION_LATEST,
   PpaasS3File,
   PpaasS3Message,
@@ -18,6 +19,7 @@ import {
   util
 } from "@fs/ppaas-common";
 import { PewPewTest, getEndTime } from "../src/pewpewtest";
+import { PEWPEW_PATH } from "../src/tests";
 import { basename } from "path";
 import { expect } from "chai";
 import { getHostname } from "../src/util/util";
@@ -34,10 +36,23 @@ describe("PewPewTest Create Test", () => {
   let ipAddress: string;
   let hostname: string;
 
-  before(() => {
+  before(async () => {
     sqs.init();
     log("smoke queue url=" + [...sqs.QUEUE_URL_TEST], LogLevel.DEBUG);
 
+    const filepath = PEWPEW_PATH;
+    const s3Folder = `${PEWPEW_BINARY_FOLDER}/${PEWPEW_VERSION_LATEST}`;
+    const pewpewNotInS3 = (await s3.listFiles({ s3Folder, extension: filepath })).length === 0;
+    log("pewpewNotInS3: " + pewpewNotInS3, pewpewNotInS3 ? LogLevel.WARN : LogLevel.DEBUG);
+    if (pewpewNotInS3) {
+      await s3.uploadFile({
+        filepath: PEWPEW_PATH,
+        s3Folder: `${PEWPEW_BINARY_FOLDER}/${PEWPEW_VERSION_LATEST}`,
+        publicRead: false,
+        contentType: "application/octet-stream"
+      });
+    }
+
     // Prepopulate PpaasTestStatus and make sure all expected data is still there after run
     expectedTestStatusMessage = {
       instanceId: "bogus",

diff --git a/agent/package.json b/agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fs/ppaas-agent",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Agent Service for running pewpew tests",
   "main": "dist/src/app.js",
   "scripts": {
@@ -53,7 +53,7 @@
     "@types/semver": "^7.5.0",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
-    "axios": "~1.6.0",
+    "axios": "~1.7.0",
     "chai": "^4.3.7",
     "eslint": "^8.40.0",
     "mocha": "^10.2.0",

diff --git a/agent/src/tests.ts b/agent/src/tests.ts
@@ -22,7 +22,7 @@ logger.config.LogFileName = "ppaas-agent";
 const UNIT_TEST_FOLDER = process.env.UNIT_TEST_FOLDER || "test";
 const yamlFile = "basicwithenv.yaml";
 const version = PEWPEW_VERSION_LATEST;
-const PEWPEW_PATH = process.env.PEWPEW_PATH || pathJoin(UNIT_TEST_FOLDER, util.PEWPEW_BINARY_EXECUTABLE);
+export const PEWPEW_PATH = process.env.PEWPEW_PATH || pathJoin(UNIT_TEST_FOLDER, util.PEWPEW_BINARY_EXECUTABLE);
 const buildTestContents = `
 vars:
   rampTime: 10s

diff --git a/common/.github/workflows/pr.yml b/common/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build project
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
     runs-on: ubuntu-latest
     # env:
     #   USE_XVFB: true

diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fs/ppaas-common",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Common Code for the PewPewController and PewPewAgent",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

diff --git a/common/src/util/ec2.ts b/common/src/util/ec2.ts
@@ -54,6 +54,5 @@ export async function getInstanceId (): Promise<string> {
   } catch (error: unknown) {
     log(`Could not load instanceId command "${INSTANCE_ID_COMMAND}"`, LogLevel.WARN, error);
   }
-  // curl http://169.254.169.254/latest/meta-data/instance-id
   throw new Error("Could not load instanceId");
 }
diff --git a/controller/.github/workflows/pr.yml b/controller/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
     name: Build project
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
       fail-fast: false
     runs-on: ubuntu-latest
 

diff --git a/controller/package.json b/controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fs/ppaas-controller",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Controller Service for running pewpew tests",
   "private": true,
   "scripts": {
@@ -48,7 +48,7 @@
     "@fullcalendar/interaction": "~6.1.9",
     "@fullcalendar/react": "~6.1.9",
     "@fullcalendar/timegrid": "~6.1.9",
-    "axios": "~1.6.0",
+    "axios": "~1.7.0",
     "bunyan": "~1.8.0",
     "chart.js": "~4.4.0",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -79,11 +79,11 @@
     "@aws-sdk/client-sqs": "^3.363.0",
     "@aws-sdk/util-stream-node": "^3.363.0",
     "@next/eslint-plugin-next": "~14.2.0",
-    "@storybook/addon-actions": "~8.0.0",
-    "@storybook/addon-links": "~8.0.0",
-    "@storybook/nextjs": "~8.0.0",
-    "@storybook/preview-api": "^8.0.0",
-    "@storybook/react": "~8.0.0",
+    "@storybook/addon-actions": "~8.1.0",
+    "@storybook/addon-links": "~8.1.0",
+    "@storybook/nextjs": "~8.1.0",
+    "@storybook/preview-api": "~8.1.0",
+    "@storybook/react": "~8.1.0",
     "@testing-library/react": "^14.0.0",
     "@types/bunyan": "~1.8.8",
     "@types/chai": "^4.3.5",
@@ -119,7 +119,7 @@
     "nyc": "^15.1.0",
     "postcss": "^8.4.24",
     "set-value": "^4.1.0",
-    "storybook": "~8.0.0",
+    "storybook": "~8.1.0",
     "trim": "^1.0.1",
     "typescript": "^5.3.0"
   }

diff --git a/controller/pages/_document.tsx b/controller/pages/_document.tsx
@@ -1,6 +1,5 @@
-import Document, { DocumentContext, DocumentInitialProps, Head, Html, Main, NextScript } from "next/document";
-import React from "react";
-import { RenderPage } from "next/dist/shared/lib/utils";
+import type  { DocumentContext, DocumentInitialProps } from "next/document";
+import Document from "next/document";
 import { ServerStyleSheet } from "styled-components";
 
 /**
@@ -12,9 +11,11 @@ import { ServerStyleSheet } from "styled-components";
 class CustomDocument extends Document {
   // We can't remove this getInitialProps call yet. If we do, we get a flicker on server side loads
   // while it client-side loads our styles. Watching https://github.com/vercel/next.js/discussions/22065
+  // Other options available with app directory instead of pages
+  // https://github.com/vercel/next.js/blob/canary/examples/with-styled-components/pages/_document.tsx
   public static async getInitialProps (ctx: DocumentContext): Promise<DocumentInitialProps> {
     const sheet: ServerStyleSheet = new ServerStyleSheet();
-    const originalRenderPage: RenderPage = ctx.renderPage;
+    const originalRenderPage = ctx.renderPage;
 
     try {
       ctx.renderPage = () =>
@@ -25,31 +26,12 @@ class CustomDocument extends Document {
       const initialProps = await Document.getInitialProps(ctx);
       return {
         ...initialProps,
-        styles: [(
-          <>
-            {initialProps.styles}
-            {sheet.getStyleElement()}
-          </>
-        )]
+        styles: [initialProps.styles, sheet.getStyleElement()]
       };
     } finally {
       sheet.seal();
     }
   }
-
-  public render () {
-    return (
-      <Html lang="en">
-        <Head>
-          {this.props.styles}
-        </Head>
-        <body>
-          <Main />
-          <NextScript />
-        </body>
-      </Html>
-    );
-  }
 }
 
 export default CustomDocument;