From a2930392f61ca25f2d03d0b2ca9e355615980cb8 Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Mon, 10 Apr 2023 09:42:25 -0400 Subject: [PATCH 1/4] update: werkzeug exception expiration The upgrade path requires CKAN 2.10 which is in the works, so stop failing snyk scan for this reason --- ckan/.snyk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/.snyk b/ckan/.snyk index 923c3240..119353bb 100644 --- a/ckan/.snyk +++ b/ckan/.snyk @@ -22,14 +22,14 @@ ignore: reason: >- Upgrade path is complex, Issue tracked in github: https://github.com/GSA/data.gov/issues/4217 - expires: 2023-03-30T16:20:58.017Z + expires: 2023-04-30T16: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-03-30T16:20:58.017Z + expires: 2023-04-30T16:20:58.017Z created: 2023-02-15T16:20:58.023Z SNYK-PYTHON-OWSLIB-3356626: - '*': From 0c4cb3d53a1cae3dfa2cd1cdc660061da5ba92c2 Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Tue, 11 Apr 2023 08:43:01 -0400 Subject: [PATCH 2/4] update: extend owslib vulnerability as well We are still working on the solution... https://github.com/GSA/data.gov/issues/4231 --- ckan/.snyk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/.snyk b/ckan/.snyk index 119353bb..71002bc0 100644 --- a/ckan/.snyk +++ b/ckan/.snyk @@ -36,6 +36,6 @@ ignore: reason: >- Upgrade path is complex, Issue tracked in github: https://github.com/GSA/data.gov/issues/4231 - expires: 2023-04-10T16:20:58.017Z + expires: 2023-04-30T16:20:58.017Z created: 2023-03-13T16:20:58.023Z patch: {} From cd3eef1451b3040b6e9020d6340c747d725ebcd0 Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Tue, 11 Apr 2023 08:45:20 -0400 Subject: [PATCH 3/4] TEMP: comment out CSW test This is an ongoing issue and it is unnecessarily holding up our pipeline... https://github.com/GSA/data.gov/issues/4231 --- e2e/cypress/integration/000_harvest.cy.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/e2e/cypress/integration/000_harvest.cy.js b/e2e/cypress/integration/000_harvest.cy.js index 98c6f37f..97e37c90 100644 --- a/e2e/cypress/integration/000_harvest.cy.js +++ b/e2e/cypress/integration/000_harvest.cy.js @@ -142,8 +142,9 @@ describe('Harvest', { testIsolation: false }, () => { cy.location('pathname').should('eq', '/harvest/' + cswHarvestSourceName); }); - it('Start CSW Harvest Job', () => { - cy.start_harvest_job(cswHarvestSourceName); - cy.check_dataset_harvested(5); - }); + // TODO: re-enable once CSW is fixed + // it('Start CSW Harvest Job', () => { + // cy.start_harvest_job(cswHarvestSourceName); + // cy.check_dataset_harvested(5); + // }); }); From a998d31211c8446c2e9ca766e09228029f4e42f2 Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Tue, 11 Apr 2023 15:30:56 -0400 Subject: [PATCH 4/4] revert: temp comment out --- e2e/cypress/integration/000_harvest.cy.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/e2e/cypress/integration/000_harvest.cy.js b/e2e/cypress/integration/000_harvest.cy.js index 97e37c90..98c6f37f 100644 --- a/e2e/cypress/integration/000_harvest.cy.js +++ b/e2e/cypress/integration/000_harvest.cy.js @@ -142,9 +142,8 @@ describe('Harvest', { testIsolation: false }, () => { cy.location('pathname').should('eq', '/harvest/' + cswHarvestSourceName); }); - // TODO: re-enable once CSW is fixed - // it('Start CSW Harvest Job', () => { - // cy.start_harvest_job(cswHarvestSourceName); - // cy.check_dataset_harvested(5); - // }); + it('Start CSW Harvest Job', () => { + cy.start_harvest_job(cswHarvestSourceName); + cy.check_dataset_harvested(5); + }); });