Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RND-645] upgrade Meadowlark libraries with pending vulnerabilities #305

Merged
merged 10 commits into from
Oct 11, 2023
Merged

[RND-645] upgrade Meadowlark libraries with pending vulnerabilities #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
886fef3
Update minor versions
andonyns Oct 5, 2023
64cb857
Update metaed import
andonyns Oct 5, 2023
f251dc7
Remove e2e dependency that are no longer in use
andonyns Oct 5, 2023
8e047fb
Moving dependencies to dev dependencies
andonyns Oct 5, 2023
50f98cd
update prettier
andonyns Oct 5, 2023
0edadc6
Remove ts-invariant from packages where it's not being used
andonyns Oct 5, 2023
7ea6e80
Linting adjustments after updating prettier
andonyns Oct 5, 2023
b062d3c
Update node version on Dockerfile
andonyns Oct 6, 2023
0022675
Fix env example to avoid comment from being read in code
andonyns Oct 6, 2023
34bb392
Rollback meadowlark packages update
andonyns Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Meadowlark-js/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ OAUTH_SIGNING_KEY="<run `openssl rand -base64 256` to create a key>"

MONGODB_MAX_NUMBER_OF_RETRIES=1


#
# The settings below are typically good enough to get started
#
Expand Down
2 changes: 1 addition & 1 deletion Meadowlark-js/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# This file builds a Meadowlark Ed-Fi API from source code.

FROM node:16.17.0-bullseye-slim@sha256:fa84c820c0a1106e170137241a66583f80c899d9b4483e4d2d8a1a9e413c2978 as base
FROM node:18.18.0-bullseye-slim@sha256:9027d0d778368a3091ee36b0bfdc98ebf3d7815ee4e2811b05cc40ec2a0adf4e as base
RUN apt-get update && \
apt-get upgrade -y && \
# dumb-init is useful for running node properly (not as PID 1)
Expand Down
4 changes: 2 additions & 2 deletions Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"dependencies": {
"@edfi/meadowlark-core": "^v0.3.6-pre-36",
"@edfi/meadowlark-utilities": "^v0.3.6-pre-36",
"@elastic/elasticsearch": "^8.9.0",
"@elastic/elasticsearch": "^8.10.0",
"@elastic/transport": "^8.3.4"
},
"devDependencies": {
"@elastic/elasticsearch-mock": "^2.0.0",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^5.0.1",
"rimraf": "^5.0.5",
"testcontainers": "^10.2.1"
}
}
7 changes: 3 additions & 4 deletions Meadowlark-js/backends/meadowlark-mongodb-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
"@edfi/meadowlark-core": "^v0.3.6-pre-36",
"@edfi/meadowlark-utilities": "^v0.3.6-pre-36",
"async-retry": "^1.3.3",
"mongodb": "^5.8.1",
"ramda": "0.29.0",
"ts-invariant": "^0.10.3"
"mongodb": "^5.9.0",
"ramda": "0.29.1"
},
"devDependencies": {
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^5.0.1"
"rimraf": "^5.0.5"
}
}
4 changes: 2 additions & 2 deletions Meadowlark-js/backends/meadowlark-opensearch-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"dependencies": {
"@edfi/meadowlark-core": "^v0.3.6-pre-36",
"@edfi/meadowlark-utilities": "^v0.3.6-pre-36",
"@opensearch-project/opensearch": "^2.3.1"
"@opensearch-project/opensearch": "^2.4.0"
},
"devDependencies": {
"@short.io/opensearch-mock": "^0.3.1",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^5.0.1",
"rimraf": "^5.0.5",
"testcontainers": "^10.2.1"
}
}
14 changes: 7 additions & 7 deletions Meadowlark-js/backends/meadowlark-postgresql-backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
"build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
},
"dependencies": {
"@edfi/meadowlark-authz-server": "^0.3.6-pre-36",
"@edfi/meadowlark-authz-server": "^v0.3.6-pre-36",
"@edfi/meadowlark-core": "^v0.3.6-pre-36",
"@edfi/meadowlark-utilities": "^v0.3.6-pre-36",
"pg": "^8.11.1",
"pg": "^8.11.3",
"pg-format": "^1.0.4",
"ramda": "0.29.0",
"ts-invariant": "^0.10.3"
"ramda": "0.29.1"

},
"devDependencies": {
"@testcontainers/postgresql": "^10.2.1",
"@types/pg": "^8.10.2",
"@types/pg-format": "^1.0.2",
"@types/pg": "^8.10.3",
"@types/pg-format": "^1.0.3",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^5.0.1",
"rimraf": "^5.0.5",
"testcontainers": "^10.2.1"
}
}
5 changes: 2 additions & 3 deletions .../meadowlark-postgresql-backend/src/repository/authorization/GetAllAuthorizationClients.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ export async function getAllAuthorizationClientDocuments(
client: PoolClient,
): Promise<GetAllAuthorizationClientsResult> {
try {
const getAllAuthorizationClientsResult: GetAllAuthorizationClientsResult = await getAuthorizationClientDocumentList(
client,
);
const getAllAuthorizationClientsResult: GetAllAuthorizationClientsResult =
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was requested by eslint because of the version update

await getAuthorizationClientDocumentList(client);

return getAllAuthorizationClientsResult;
} catch (e) {
Expand Down
Loading