From 9be167cb93bd87e882dc57871e2f25de53fc4788 Mon Sep 17 00:00:00 2001 From: Matthew <106278637+Matthew-Grayson@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:30:48 -0500 Subject: [PATCH 01/14] 2118 au 05 audit process migrate logs to s3 buckets (#2226) * Modify the assume_role_policy. --- infrastructure/cloudtrail.tf | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/infrastructure/cloudtrail.tf b/infrastructure/cloudtrail.tf index cafe65e88..b215cb9f0 100644 --- a/infrastructure/cloudtrail.tf +++ b/infrastructure/cloudtrail.tf @@ -72,7 +72,23 @@ resource "aws_s3_bucket_policy" "cloudtrail_bucket" { resource "aws_iam_role" "cloudtrail_role" { name = var.cloudtrail_role_name - assume_role_policy = aws_s3_bucket_policy.cloudtrail_bucket.policy + assume_role_policy = < Date: Thu, 7 Sep 2023 16:19:00 -0400 Subject: [PATCH 02/14] 2118 au 05 audit process migrate logs to s3 buckets (#2227) * Add cloudwatch and s3 policy for cloudtrail * fix formatting --------- Co-authored-by: Grayson, Matthew Co-authored-by: Matthew <106278637+Matthew-Grayson@users.noreply.github.com> --- infrastructure/cloudtrail.tf | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/infrastructure/cloudtrail.tf b/infrastructure/cloudtrail.tf index b215cb9f0..c67cbbc13 100644 --- a/infrastructure/cloudtrail.tf +++ b/infrastructure/cloudtrail.tf @@ -101,4 +101,56 @@ data "template_file" "cloudtrail_bucket_policy" { bucketName = var.cloudtrail_bucket_name accountId = data.aws_caller_identity.current.account_id } +} + +# Attach policies to the IAM role allowing access to the S3 bucket and Cloudwatch +resource "aws_iam_policy" "cloudtrail_policy" { + name = "crossfeed-cloudtrail-s3-${var.stage}" + description = "Policy for CloudTrail to write logs to S3" + + policy = jsonencode({ + Version = "2012-10-17", + Statement = [{ + Action = [ + "s3:PutObject", + "s3:GetBucketAcl", + "s3:ListBucket" + ], + Effect = "Allow", + Resource = [ + aws_s3_bucket.cloudtrail_bucket.arn, + "${aws_s3_bucket.cloudtrail_bucket.arn}/*" + ] + }] + }) +} + +resource "aws_iam_policy" "cloudtrail_cloudwatch_policy" { + name = "crossfeed-cloudtrail-cloudwatch-${var.stage}" + description = "Policy for CloudTrail to log to CloudWatch Logs" + + policy = jsonencode({ + Version = "2012-10-17", + Statement = [{ + Action = [ + "logs:CreateLogGroup", + "logs:CreateLogStream", + "logs:PutLogEvents" + ], + Effect = "Allow", + Resource = "arn:aws:logs:*" + }] + }) +} + + +# Attach the IAM policies to the IAM role +resource "aws_iam_role_policy_attachment" "cloudtrail_attachment" { + policy_arn = aws_iam_policy.cloudtrail_policy.arn + role = aws_iam_role.cloudtrail_role.name +} + +resource "aws_iam_role_policy_attachment" "cloudtrail_cloudwatch_attachment" { + policy_arn = aws_iam_policy.cloudtrail_cloudwatch_policy.arn + role = aws_iam_role.cloudtrail_role.name } \ No newline at end of file From 631ff778302dac46c2b34beee5c65a095f58cb2f Mon Sep 17 00:00:00 2001 From: aloftus23 <79927030+aloftus23@users.noreply.github.com> Date: Thu, 7 Sep 2023 16:39:03 -0400 Subject: [PATCH 03/14] 2118 au 05 audit process migrate logs to s3 buckets (#2228) * Fix iam_ploicy to use iam_role_policy --------- Co-authored-by: Grayson, Matthew Co-authored-by: Matthew <106278637+Matthew-Grayson@users.noreply.github.com> --- infrastructure/cloudtrail.tf | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/infrastructure/cloudtrail.tf b/infrastructure/cloudtrail.tf index c67cbbc13..acfdbcbb2 100644 --- a/infrastructure/cloudtrail.tf +++ b/infrastructure/cloudtrail.tf @@ -104,10 +104,9 @@ data "template_file" "cloudtrail_bucket_policy" { } # Attach policies to the IAM role allowing access to the S3 bucket and Cloudwatch -resource "aws_iam_policy" "cloudtrail_policy" { - name = "crossfeed-cloudtrail-s3-${var.stage}" - description = "Policy for CloudTrail to write logs to S3" - +resource "aws_iam_role_policy" "cloudtrail_policy" { + name_prefix = "crossfeed-cloudtrail-s3-${var.stage}" + role = aws_iam_role.cloudtrail_role.id policy = jsonencode({ Version = "2012-10-17", Statement = [{ @@ -125,10 +124,9 @@ resource "aws_iam_policy" "cloudtrail_policy" { }) } -resource "aws_iam_policy" "cloudtrail_cloudwatch_policy" { - name = "crossfeed-cloudtrail-cloudwatch-${var.stage}" - description = "Policy for CloudTrail to log to CloudWatch Logs" - +resource "aws_iam_role_policy" "cloudtrail_cloudwatch_policy" { + name_prefix = "crossfeed-cloudtrail-cloudwatch-${var.stage}" + role = aws_iam_role.cloudtrail_role.id policy = jsonencode({ Version = "2012-10-17", Statement = [{ @@ -141,16 +139,4 @@ resource "aws_iam_policy" "cloudtrail_cloudwatch_policy" { Resource = "arn:aws:logs:*" }] }) -} - - -# Attach the IAM policies to the IAM role -resource "aws_iam_role_policy_attachment" "cloudtrail_attachment" { - policy_arn = aws_iam_policy.cloudtrail_policy.arn - role = aws_iam_role.cloudtrail_role.name -} - -resource "aws_iam_role_policy_attachment" "cloudtrail_cloudwatch_attachment" { - policy_arn = aws_iam_policy.cloudtrail_cloudwatch_policy.arn - role = aws_iam_role.cloudtrail_role.name } \ No newline at end of file From ea5144192667369d4bc0ae81d4ba159a252860b6 Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:29:03 -0400 Subject: [PATCH 04/14] Updated header for hiding reports page commented out line 250-255 to hide page. --- frontend/src/components/Header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 603360916..6a4643b1a 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,12 +247,12 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, - { + /* { title: 'Reports', path: '/reports', users: ALL_USERS, exact: true - }, + },*/ { title: 'Scans', path: '/scans', From d927fb05c2eeb05fd905eb783e1dde9bffa15e5b Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 13:47:28 -0400 Subject: [PATCH 05/14] Updated header --- frontend/src/components/Header.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 6a4643b1a..b80c0d45f 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,7 +247,12 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, +<<<<<<< Updated upstream /* { +======= + + { +>>>>>>> Stashed changes title: 'Reports', path: '/reports', users: ALL_USERS, From 01120dae3ff547349f644e451010b99243a534bb Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:05:02 -0400 Subject: [PATCH 06/14] updated 2237 ticket for hiding reports page --- frontend/src/components/Header.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index b80c0d45f..53fcc7ae1 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,17 +247,16 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, -<<<<<<< Updated upstream - /* { -======= - + + /* + hiding reprts page until finished { ->>>>>>> Stashed changes title: 'Reports', path: '/reports', users: ALL_USERS, exact: true },*/ + { title: 'Scans', path: '/scans', From a5c7dbd7a9a03abc3c53f6b9d41b07240e370e28 Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:26:36 -0400 Subject: [PATCH 07/14] updated header (prettier) --- frontend/src/components/Header.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 53fcc7ae1..0f5fc195e 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -247,7 +247,7 @@ const HeaderNoCtx: React.FC = (props) => { exact: false }, { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, - + /* hiding reprts page until finished { @@ -256,7 +256,7 @@ const HeaderNoCtx: React.FC = (props) => { users: ALL_USERS, exact: true },*/ - + { title: 'Scans', path: '/scans', @@ -423,10 +423,11 @@ const HeaderNoCtx: React.FC = (props) => { ) { return options; } - return options.filter((option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) + return options.filter( + (option) => + option?.name + .toLowerCase() + .includes(state.inputValue.toLowerCase()) ); }} disableClearable From 21af5aa82919f15d64fd17d1fd8a0800294bd57a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:38:11 -0500 Subject: [PATCH 08/14] Bump universal-cookie from 4.0.4 to 6.1.1 in /frontend (#2235) Bumps [universal-cookie](https://github.com/bendotcodes/cookies) from 4.0.4 to 6.1.1. - [Release notes](https://github.com/bendotcodes/cookies/releases) - [Changelog](https://github.com/bendotcodes/cookies/blob/main/LEGACY-CHANGELOG.md) - [Commits](https://github.com/bendotcodes/cookies/compare/v4.0.4...v6.1.1) --- updated-dependencies: - dependency-name: universal-cookie dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 54 ++++++++++++++++++++++++-------------- frontend/package.json | 2 +- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 61f884128..c641345c2 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -48,7 +48,7 @@ "react-simple-maps": "^3.0.0", "react-table": "^7.8.0", "resolve-url-loader": "^5.0.0", - "universal-cookie": "^4.0.4", + "universal-cookie": "^6.1.1", "uswds": "^2.13.3", "web-vitals": "^2.1.4" }, @@ -260,11 +260,33 @@ "zen-observable-ts": "0.8.19" } }, + "node_modules/@aws-amplify/core/node_modules/@types/cookie": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz", + "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==" + }, + "node_modules/@aws-amplify/core/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/@aws-amplify/core/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, + "node_modules/@aws-amplify/core/node_modules/universal-cookie": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz", + "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==", + "dependencies": { + "@types/cookie": "^0.3.3", + "cookie": "^0.4.0" + } + }, "node_modules/@aws-amplify/datastore": { "version": "4.7.4", "resolved": "https://registry.npmjs.org/@aws-amplify/datastore/-/datastore-4.7.4.tgz", @@ -12380,9 +12402,9 @@ } }, "node_modules/@types/cookie": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz", - "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.2.tgz", + "integrity": "sha512-DBpRoJGKJZn7RY92dPrgoMew8xCWc2P71beqsjyhEI/Ds9mOyVmBwtekyfhpwFIVt1WrxTonFifiOZ62V8CnNA==" }, "node_modules/@types/d3-color": { "version": "2.0.3", @@ -15328,9 +15350,9 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "engines": { "node": ">= 0.6" } @@ -17663,14 +17685,6 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, - "node_modules/express/node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -32664,12 +32678,12 @@ } }, "node_modules/universal-cookie": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.4.tgz", - "integrity": "sha512-lbRVHoOMtItjWbM7TwDLdl8wug7izB0tq3/YVKhT/ahB4VDvWMyvnADfnJI8y6fSvsjh51Ix7lTGC6Tn4rMPhw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-6.1.1.tgz", + "integrity": "sha512-33S9x3CpdUnnjwTNs2Fgc41WGve2tdLtvaK2kPSbZRc5pGpz2vQFbRWMxlATsxNNe/Cy8SzmnmbuBM85jpZPtA==", "dependencies": { - "@types/cookie": "^0.3.3", - "cookie": "^0.4.0" + "@types/cookie": "^0.5.1", + "cookie": "^0.5.0" } }, "node_modules/universalify": { diff --git a/frontend/package.json b/frontend/package.json index 53ccbd899..50a4de771 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -46,7 +46,7 @@ "react-simple-maps": "^3.0.0", "react-table": "^7.8.0", "resolve-url-loader": "^5.0.0", - "universal-cookie": "^4.0.4", + "universal-cookie": "^6.1.1", "uswds": "^2.13.3", "web-vitals": "^2.1.4" }, From 9d6d5cf7590ac831994edf5ec3d2953644f49460 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 13:12:53 -0500 Subject: [PATCH 09/14] Fix linting errors. --- frontend/src/components/Header.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 0f5fc195e..be28f3807 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -423,11 +423,10 @@ const HeaderNoCtx: React.FC = (props) => { ) { return options; } - return options.filter( - (option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) + return options.filter((option) => + option?.name + .toLowerCase() + .includes(state.inputValue.toLowerCase()) ); }} disableClearable From 2c82f64fc5a33da1cd582df6384e89bd133281c9 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 15:43:18 -0500 Subject: [PATCH 10/14] Update snapshot to address 'header matches snapshot' test failure. --- .../__tests__/__snapshots__/header.spec.tsx.snap | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap index fc7e22fb6..c888d9875 100644 --- a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap +++ b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap @@ -60,17 +60,6 @@ exports[`Header component matches snapshot 1`] = ` Feeds -
- - Reports - -
Date: Mon, 18 Sep 2023 15:46:15 -0500 Subject: [PATCH 11/14] Mark pendingDomains as optional to address type error in testOrganization declaration. --- frontend/src/types/organization.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/types/organization.ts b/frontend/src/types/organization.ts index cf484f838..fe3f893a3 100644 --- a/frontend/src/types/organization.ts +++ b/frontend/src/types/organization.ts @@ -14,7 +14,7 @@ export interface Organization { tags: OrganizationTag[]; parent: Organization | null; children: Organization[]; - pendingDomains: PendingDomain[]; + pendingDomains?: PendingDomain[]; } export interface PendingDomain { From f4b933f7bbed206d4b1db494967537a76fb52130 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Mon, 18 Sep 2023 16:06:28 -0500 Subject: [PATCH 12/14] Add pendingDomains to testOrganization; revert pendingDomains to being required in frontend/src/types/organization.ts. --- frontend/src/test-utils/organization.ts | 3 ++- frontend/src/types/organization.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/test-utils/organization.ts b/frontend/src/test-utils/organization.ts index fc58c03e0..60042b454 100644 --- a/frontend/src/test-utils/organization.ts +++ b/frontend/src/test-utils/organization.ts @@ -9,5 +9,6 @@ export const testOrganization = { granularScans: [], tags: [], parent: null, - children: [] + children: [], + pendingDomains: [] }; diff --git a/frontend/src/types/organization.ts b/frontend/src/types/organization.ts index fe3f893a3..cf484f838 100644 --- a/frontend/src/types/organization.ts +++ b/frontend/src/types/organization.ts @@ -14,7 +14,7 @@ export interface Organization { tags: OrganizationTag[]; parent: Organization | null; children: Organization[]; - pendingDomains?: PendingDomain[]; + pendingDomains: PendingDomain[]; } export interface PendingDomain { From 9445de856db9f6d297dff4c400b93694758e9c22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 12:46:46 -0500 Subject: [PATCH 13/14] Bump @types/node from 18.17.12 to 20.6.2 in /backend (#2243) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.17.12 to 20.6.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthew <106278637+Matthew-Grayson@users.noreply.github.com> --- backend/package-lock.json | 14 ++++++++++---- backend/package.json | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 0c85ed64d..09a25d480 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -52,7 +52,7 @@ "@types/aws-lambda": "^8.10.62", "@types/dockerode": "^3.3.19", "@types/jest": "^27", - "@types/node": "^18.11", + "@types/node": "^20.6", "@types/node-fetch": "^2.6.4", "@types/nodemailer": "^6.4.0", "@types/papaparse": "^5.3.0", @@ -4514,9 +4514,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.17.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz", - "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==" + "version": "20.6.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz", + "integrity": "sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==" }, "node_modules/@types/node-fetch": { "version": "2.6.4", @@ -4609,6 +4609,12 @@ "@types/node": "^18.11.18" } }, + "node_modules/@types/ssh2/node_modules/@types/node": { + "version": "18.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz", + "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==", + "dev": true + }, "node_modules/@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", diff --git a/backend/package.json b/backend/package.json index b1529f0df..6b2c0ee97 100644 --- a/backend/package.json +++ b/backend/package.json @@ -50,7 +50,7 @@ "@types/aws-lambda": "^8.10.62", "@types/dockerode": "^3.3.19", "@types/jest": "^27", - "@types/node": "^18.11", + "@types/node": "^20.6", "@types/node-fetch": "^2.6.4", "@types/nodemailer": "^6.4.0", "@types/papaparse": "^5.3.0", From d5d74bbd916603f34f4d60fef7c8fe52cbb36a62 Mon Sep 17 00:00:00 2001 From: courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:05:52 -0400 Subject: [PATCH 14/14] Update frontend/src/components/Header.tsx updating typo Co-authored-by: Ashwin Ramaswami --- frontend/src/components/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index be28f3807..badcb8f06 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -249,7 +249,7 @@ const HeaderNoCtx: React.FC = (props) => { { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false }, /* - hiding reprts page until finished + Hiding Reports page until finished { title: 'Reports', path: '/reports',