From c68088631eabe253f9972f0284de8ea883daf82c Mon Sep 17 00:00:00 2001 From: Mark McCracken Date: Wed, 14 Dec 2022 14:54:16 +0000 Subject: [PATCH 1/4] Added strict out of sync flag --- .github/workflows/sbt-node-snyk.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/sbt-node-snyk.yml b/.github/workflows/sbt-node-snyk.yml index f97a562..76c4c24 100644 --- a/.github/workflows/sbt-node-snyk.yml +++ b/.github/workflows/sbt-node-snyk.yml @@ -22,6 +22,11 @@ on: DEBUG: type: string required: false + STRICT_OUT_OF_SYNC: + type: boolean + required: false + default: true + description: flag for snyk to ignore any differences between package.json and package-lock.json that can't be resolved by just re-installing packages. EXCLUDE: type: string required: false @@ -137,6 +142,7 @@ jobs: --all-projects \ --org="${{ inputs.ORG }}" \ --exclude="${{ inputs.EXCLUDE }}" \ + --strict-out-of-sync={{ inputs.STRICT_OUT_OF_SYNC }} \ --project-tags=commit=${GITHUB_SHA} -- env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} From 15ee6d8544f9ac8858bff295cd72eb4e21625ac0 Mon Sep 17 00:00:00 2001 From: Mark McCracken Date: Wed, 14 Dec 2022 15:00:52 +0000 Subject: [PATCH 2/4] add-strict-out-of-sync to PRs --- .github/workflows/sbt-node-snyk-pr.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sbt-node-snyk-pr.yml b/.github/workflows/sbt-node-snyk-pr.yml index 350468c..2ea40a0 100644 --- a/.github/workflows/sbt-node-snyk-pr.yml +++ b/.github/workflows/sbt-node-snyk-pr.yml @@ -22,6 +22,11 @@ on: DEBUG: type: string required: false + STRICT_OUT_OF_SYNC: + type: boolean + required: false + default: true + description: flag for snyk to ignore any differences between package.json and package-lock.json that can't be resolved by just re-installing packages. SEVERITY_THRESHOLD: type: string required: false @@ -127,7 +132,8 @@ jobs: --severity-threshold=${SEVERITY_THRESHOLD:-high} \ --all-projects \ --org="${{ inputs.ORG }}" \ - --exclude="${{ inputs.EXCLUDE }}" + --exclude="${{ inputs.EXCLUDE }}" \ + --strict-out-of-sync={{ inputs.STRICT_OUT_OF_SYNC }} env: SEVERITY_THRESHOLD: ${{ inputs.SEVERITY_THRESHOLD }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} From ca18c82590d414ef824a97e7d38063101f2a0e54 Mon Sep 17 00:00:00 2001 From: Mark McCracken Date: Wed, 14 Dec 2022 15:22:06 +0000 Subject: [PATCH 3/4] move-strict-out-of-sync-higher --- .github/workflows/sbt-node-snyk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sbt-node-snyk.yml b/.github/workflows/sbt-node-snyk.yml index 76c4c24..5526bd3 100644 --- a/.github/workflows/sbt-node-snyk.yml +++ b/.github/workflows/sbt-node-snyk.yml @@ -141,8 +141,8 @@ jobs: ${PRUNE_OPTION} \ --all-projects \ --org="${{ inputs.ORG }}" \ + --strict-out-of-sync="{{ inputs.STRICT_OUT_OF_SYNC }}" \ --exclude="${{ inputs.EXCLUDE }}" \ - --strict-out-of-sync={{ inputs.STRICT_OUT_OF_SYNC }} \ --project-tags=commit=${GITHUB_SHA} -- env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} From 6c1661bd7699b985c3398fd4c76823fa412da4a4 Mon Sep 17 00:00:00 2001 From: Mark McCracken Date: Wed, 14 Dec 2022 15:29:15 +0000 Subject: [PATCH 4/4] add missing $ --- .github/workflows/sbt-node-snyk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sbt-node-snyk.yml b/.github/workflows/sbt-node-snyk.yml index 5526bd3..6a0fe1f 100644 --- a/.github/workflows/sbt-node-snyk.yml +++ b/.github/workflows/sbt-node-snyk.yml @@ -141,7 +141,7 @@ jobs: ${PRUNE_OPTION} \ --all-projects \ --org="${{ inputs.ORG }}" \ - --strict-out-of-sync="{{ inputs.STRICT_OUT_OF_SYNC }}" \ + --strict-out-of-sync=${{ inputs.STRICT_OUT_OF_SYNC }} \ --exclude="${{ inputs.EXCLUDE }}" \ --project-tags=commit=${GITHUB_SHA} -- env: