Merge branch 'develop' into issue-353/pie-chart-accessibility-cleanup

cisagov · Jun 20, 2024 · f301f4f · f301f4f
2 parents adfdc52 + 18acba4
commit f301f4f
Show file tree

Hide file tree

Showing 20 changed files with 1,942 additions and 723 deletions.
diff --git a/backend/Dockerfile.pe b/backend/Dockerfile.pe
@@ -26,9 +26,9 @@ RUN ./aws/install
 
 # Install pe-source module
 # Sync the latest from cf-staging branch
-RUN git clone -b AL-staging-SQS https://github.com/cisagov/pe-reports.git && \
-    cd pe-reports && \
-    git checkout 6405a2041656152b176b5fc9b3becb5dc11a5f3e && \
+RUN git clone -b crossfeed-SQS https://github.com/cisagov/ATC-Framework.git && \
+    cd ATC-Framework && \
+    git checkout a4036e94ad54876cb592fc966f57e7fd84750e9a && \
     pip install .
 
 RUN python -m spacy download en_core_web_lg

diff --git a/backend/Dockerfile.worker b/backend/Dockerfile.worker
@@ -58,9 +58,6 @@ RUN pip3.10 install --upgrade pip
 
 RUN apt remove dav1d && apt autoclean && apt autoremove
 
-# Install pe-source module
-# Sync the latest from cf-staging branch
-RUN git clone -b cf-source-staging https://github.com/cisagov/pe-reports.git && cd pe-reports && git checkout c9cbbd73b22ef38cabe1da6ba50aeb2dc0be4f99 && sed -i 's/"pandas == 1.1.5"/"pandas == 1.5.1"/g' setup.py && sed -i 's/psycopg2-binary == 2.9.3/psycopg2-binary == 2.9.5/g' setup.py && sed -i 's/psycopg2-binary == 2.9.3/psycopg2-binary == 2.9.5/g' setup_reports.py  && pip install .
 # Python dependencies
 
 COPY worker/requirements.txt worker/requirements.txt

diff --git a/backend/src/api/domains.ts b/backend/src/api/domains.ts
@@ -21,7 +21,7 @@ import {
 import S3Client from '../tasks/s3-client';
 import * as Papa from 'papaparse';
 
-const PAGE_SIZE = parseInt(process.env.PAGE_SIZE ?? '') || 25;
+const PAGE_SIZE = 15;
 
 class DomainFilters {
   @IsString()

diff --git a/backend/src/api/scans.ts b/backend/src/api/scans.ts
@@ -246,6 +246,15 @@ export const SCAN_SCHEMA: ScanSchema = {
     cpu: '1024',
     memory: '4096',
     description: 'Scrapes all webpages on a given domain, respecting robots.txt'
+  },
+  xpanseSync: {
+    type: 'fargate',
+    isPassive: true,
+    global: true,
+    description:
+      'Pull in xpanse vulnerability data from PEs Vulnerability database',
+    cpu: '1024',
+    memory: '8192'
   }
 };
 

diff --git a/backend/src/api/users.ts b/backend/src/api/users.ts
@@ -917,6 +917,10 @@ export const updateV2 = wrapHandler(async (event) => {
     return NotFound;
   }
 
+  if (body.state) {
+    body.regionId = REGION_STATE_MAP[body.state];
+  }
+
   // Update the user
   const updatedResp = await User.update(userId, body);