Skip to content

Commit

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

* Updated Nyc coverage to latest

* Updated React-datepicker to latest

* Updated testing-library-react to the latest version

* Added logging of additional variables including injected ones
  • Loading branch information
tkmcmaster authored Jul 1, 2024
1 parent 10e59a4 commit 4875e63
Show file tree
Hide file tree
Showing 7 changed files with 3,969 additions and 7,014 deletions.
4 changes: 2 additions & 2 deletions agent/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-agent",
"version": "3.2.2",
"version": "3.2.3",
"description": "Agent Service for running pewpew tests",
"main": "dist/src/app.js",
"scripts": {
Expand Down Expand Up @@ -57,7 +57,7 @@
"chai": "^4.3.7",
"eslint": "^8.40.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"nyc": "^17.0.0",
"typescript": "^5.3.0"
}
}
4 changes: 2 additions & 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.2.2",
"version": "3.2.3",
"description": "Common Code for the PewPewController and PewPewAgent",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
Expand Down Expand Up @@ -55,7 +55,7 @@
"dotenv-flow": "^4.0.1",
"eslint": "^8.40.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"nyc": "^17.0.0",
"typescript": "^5.3.0"
}
}
17 changes: 17 additions & 0 deletions common/src/util/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,28 @@ export function getLogger (): Logger {
});
logger.warn({ message: `Logging Level set to ${config.LoggingLevel} for app-${config.LogFileName}.json` });
logger.warn({ message: `Console Logging Level set to ${config.LoggingLevelConsole}` });
// Get the injected S3 and SQS environment variables starting with PEWPEWCONTROLLER or PEWPEWAGENT
const injectedVariables = Object.fromEntries(
Object.entries(process.env).filter(
([varaibleName, _]) => varaibleName && varaibleName.startsWith("PEWPEW")
)
);
logger.info({ message: "Environment Variables",
...injectedVariables,
APPLICATION_NAME: process.env.APPLICATION_NAME,
SYSTEM_NAME: process.env.SYSTEM_NAME,
SERVICE_NAME: process.env.SERVICE_NAME,
NODE_ENV: process.env.NODE_ENV,
AUTH_MODE: process.env.AUTH_MODE,
CONTROLLER_ENV: process.env.CONTROLLER_ENV,
CONTROLLER_ENV_S3: process.env.CONTROLLER_ENV_S3,
AGENT_ENV: process.env.AGENT_ENV,
AGENT_DESC: process.env.AGENT_DESC,
KEYSPACE_PREFIX_OVERRIDE: process.env.KEYSPACE_PREFIX_OVERRIDE,
BASE_PATH: process.env.BASE_PATH,
DELETE_OLD_FILES_DAYS: process.env.DELETE_OLD_FILES_DAYS,
RUN_HISTORICAL_SEARCH: process.env.RUN_HISTORICAL_SEARCH,
RUN_HISTORICAL_DELETE: process.env.RUN_HISTORICAL_DELETE,
variables: Object.keys(process.env).filter((variableName: string) => variableName && !variableName.startsWith("npm"))
});
}
Expand Down
4 changes: 2 additions & 2 deletions controller/components/StartTestForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ export const StartTestForm = ({
</LabelDiv>
<ContentDiv><DatePicker
selected={state.scheduleDate}
onChange={(scheduleDate: Date) => setState({ scheduleDate })}
onChange={(scheduleDate: Date | null) => { if (scheduleDate) { setState({ scheduleDate }); }}}
showTimeSelect
timeFormat="HH:mm"
timeIntervals={15}
Expand All @@ -635,7 +635,7 @@ export const StartTestForm = ({
<LabelDiv><label> End Date </label></LabelDiv>
<ContentDiv><DatePicker
selected={state.endDate}
onChange={(endDate: Date) => setState({ endDate })}
onChange={(endDate: Date | null) => { if (endDate) { setState({ endDate }); }}}
showTimeSelect
timeFormat="HH:mm"
timeIntervals={15}
Expand Down
10 changes: 5 additions & 5 deletions controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/ppaas-controller",
"version": "3.2.2",
"version": "3.2.3",
"description": "Controller Service for running pewpew tests",
"private": true,
"scripts": {
Expand Down Expand Up @@ -65,7 +65,7 @@
"rc-progress": "^4.0.0",
"react": "^18.2.0",
"react-accessible-accordion": "^5.0.0",
"react-datepicker": "~6.9.0",
"react-datepicker": "~7.2.0",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-transition-group": "^4.4.5",
Expand All @@ -84,7 +84,8 @@
"@storybook/nextjs": "~8.1.0",
"@storybook/preview-api": "~8.1.0",
"@storybook/react": "~8.1.0",
"@testing-library/react": "^14.0.0",
"@testing-library/dom": "^10.2.0",
"@testing-library/react": "^16.0.0",
"@types/bunyan": "~1.8.8",
"@types/chai": "^4.3.5",
"@types/file-saver": "^2.0.5",
Expand All @@ -95,7 +96,6 @@
"@types/mocha": "^10.0.0",
"@types/node": "^20.0.0",
"@types/react": "^18.2.12",
"@types/react-datepicker": "^6.0.0",
"@types/react-dom": "^18.2.5",
"@types/react-transition-group": "^4.4.6",
"@types/semver": "^7.5.0",
Expand All @@ -116,7 +116,7 @@
"jsdom": ">=23.0.0",
"jsdom-global": "^3.0.2",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"nyc": "^17.0.0",
"postcss": "^8.4.24",
"set-value": "^4.1.0",
"storybook": "~8.1.0",
Expand Down
Loading

0 comments on commit 4875e63

Please sign in to comment.