Merge pull request #966 from GSA/snyk-2023-06-20

Snyk Updates + Monitor `harvester run` command
GSA · Jun 20, 2023 · b7644b9 · b7644b9
2 parents 78a71a3 + 9225062
commit b7644b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/ckan_auto.yml b/.github/workflows/ckan_auto.yml
@@ -43,7 +43,6 @@ jobs:
           #   - Run on [catalog-gather] app
           #  schedule: harvesting update
           #   - Only run on [development, staging, prod]
-          #   - Monitor: false
           #  schedule: stuck jobs check
           #   - Only run on [staging, prod]
           #   - Create Error issue: if >0 stuck jobs, automated_ckan_error.md
@@ -66,7 +65,6 @@ jobs:
                          {"issue_template": ".github/automated_ckan_error.md"},
                          {"monitor": true},
                          {"schedule": "${{env.SCHEDULE_HARVESTING}}", "command": "ckan harvester run"},
-                         {"schedule": "${{env.SCHEDULE_HARVESTING}}", "monitor": false},
                          {"schedule": "${{env.SCHEDULE_TRACKING}}", "command": "ckan geodatagov tracking-update"},
                          {"schedule": "${{env.SCHEDULE_TRACKING}}", "error_seconds": 12600},
                          {"schedule": "${{env.SCHEDULE_TRACKING}}", "info_issue": true},

diff --git a/ckan/.snyk b/ckan/.snyk
@@ -22,20 +22,20 @@ ignore:
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4217
-        expires: 2023-05-20T16:20:58.017Z
+        expires: 2023-07-31T16:20:58.017Z
         created: 2023-02-15T16:20:58.023Z
   SNYK-PYTHON-WERKZEUG-3319935:
     - '*':
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4217
-        expires: 2023-05-20T16:20:58.017Z
+        expires: 2023-07-31T16:20:58.017Z
         created: 2023-02-15T16:20:58.023Z
   SNYK-PYTHON-FLASK-5490129:
     - '*':
         reason: >-
           Upgrade path is complex, Issue tracked in github:
           https://github.com/GSA/data.gov/issues/4303
-        expires: 2023-06-08T16:20:58.017Z
+        expires: 2023-07-31T16:20:58.017Z
         created: 2023-05-08T16:20:58.023Z
 patch: {}
diff --git a/ckan/requirements.in b/ckan/requirements.in
@@ -90,7 +90,6 @@ pytz==2016.7
 PyUtilib==5.7.1
 pyyaml==5.4
 repoze.who==2.3
-requests==2.25.0
 Routes==1.13
 rq==1.0
 simplejson==3.18.0 # ckan 2.9.5 requires 3.10.0 only
@@ -114,5 +113,6 @@ gevent>=21.8.0
 # New Relic
 newrelic
 certifi>=2022.12.7
-cryptography>=39.0.1
+cryptography>=41.0.0
 redis>=4.5.4
+requests==2.31.0
diff --git a/ckan/requirements.txt b/ckan/requirements.txt
@@ -25,7 +25,7 @@ ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@c2b12a94430
 -e git+https://github.com/ckan/ckanext-spatial.git@17d5a341cf8f40b35b25df91a18ce72c31195ba3#egg=ckanext_spatial
 ckantoolkit==0.0.7
 click==7.1.2
-cryptography==40.0.2
+cryptography==41.0.0
 defusedxml==0.7.1
 dominate==2.4.0
 elementpath==4.1.2
@@ -71,7 +71,7 @@ progressbar2==3.53.3
 psycopg2==2.8.6
 pycparser==2.21
 PyJWT==2.4.0
-pyOpenSSL==23.1.1
+pyOpenSSL==23.2.0
 pyparsing==3.0.9
 pyproj==2.6.1
 pysaml2==7.0.1
@@ -88,7 +88,7 @@ rdflib==4.2.2
 redis==4.5.4
 repoze.lru==0.7
 repoze.who==2.3
-requests==2.25.0
+requests==2.31.0
 rfc3987==1.3.8
 Routes==1.13
 rq==1.0