From 1052de88d0619a635c04aa3388ebf5a50fbcec32 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Wed, 13 Dec 2023 14:15:37 -0600 Subject: [PATCH 1/8] OKTA-657845: Add Snyk software dependency scan --- .circleci/config.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6fa35d579..918e4c488 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,19 @@ jobs: parallelism: 3 steps: *build_steps + snyk-scan: + docker: + - image: cimg/openjdk:17.0.6-node + steps: + - checkout + - run: ./mvnw -ntp clean install -Pci -Dmaven.test.skip.exec=true + - general-platform-helpers/step-load-dependencies + - general-platform-helpers/step-run-snyk-monitor: + scan-all-projects: false + skip-unresolved: false + run-on-non-main: true + additional-arguments: "--maven-aggregate-project" + workflows: "Circle CI Tests": jobs: @@ -63,9 +76,18 @@ workflows: # See OKTA-624750 semgrep: jobs: + - jdk17 - platform-orb/job-semgrep-prepare: name: semgrep-prepare - platform-orb/job-semgrep-scan: name: "Scan with Semgrep" requires: - - semgrep-prepare \ No newline at end of file + - semgrep-prepare + - general-platform-helpers/job-snyk-prepare: + name: prepare-snyk + requires: + - jdk17 + - snyk-scan: + name: execute-snyk + requires: + - prepare-snyk From fbd5a9a86f5639b2a2fda76e3b2b866d41f70c33 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Wed, 13 Dec 2023 14:18:45 -0600 Subject: [PATCH 2/8] minor update --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 918e4c488..d375cd4cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,13 @@ version: 2.1 orbs: - platform-orb: okta/general-platform-helpers@1.8 + general-platform-helpers: okta/general-platform-helpers@1.8 aliases: - &build_steps - checkout - - platform-orb/step-load-dependencies + - general-platform-helpers/step-load-dependencies - run: java -version - run: ./mvnw clean install -Dlicense.skip=true -Pci - run: @@ -61,7 +61,7 @@ jobs: workflows: "Circle CI Tests": jobs: - - platform-orb/job-secrets-obtain: + - general-platform-helpers/job-secrets-obtain: name: cache-secrets secret-key: "OKTA_CLIENT_ORGURL;OKTA_CLIENT_TOKEN;OKTA_AUTHN_ITS_MFAENROLLGROUPID" - jdk8: @@ -77,9 +77,9 @@ workflows: semgrep: jobs: - jdk17 - - platform-orb/job-semgrep-prepare: + - general-platform-helpers/job-semgrep-prepare: name: semgrep-prepare - - platform-orb/job-semgrep-scan: + - general-platform-helpers/job-semgrep-scan: name: "Scan with Semgrep" requires: - semgrep-prepare From 8d9357fd498b5a84df26b63fcdd96fb1891d912e Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:42:48 -0600 Subject: [PATCH 3/8] minor update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d375cd4cf..aa5bf6a48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,7 +76,7 @@ workflows: # See OKTA-624750 semgrep: jobs: - - jdk17 + - jdk11 - general-platform-helpers/job-semgrep-prepare: name: semgrep-prepare - general-platform-helpers/job-semgrep-scan: From f845e6693fd9bd12102a065606a1af3108a068a3 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:43:21 -0600 Subject: [PATCH 4/8] minor update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa5bf6a48..240feb7eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,7 +86,7 @@ workflows: - general-platform-helpers/job-snyk-prepare: name: prepare-snyk requires: - - jdk17 + - jdk11 - snyk-scan: name: execute-snyk requires: From 83104f6fff37923db640bc15edf40a2294fdef1b Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:48:03 -0600 Subject: [PATCH 5/8] minor update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 240feb7eb..81d65b018 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ jobs: snyk-scan: docker: - - image: cimg/openjdk:17.0.6-node + - image: cimg/openjdk:11.0.18-node steps: - checkout - run: ./mvnw -ntp clean install -Pci -Dmaven.test.skip.exec=true From 043422db885f595486057cfa177b5a038f577d64 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:56:46 -0600 Subject: [PATCH 6/8] minor update --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81d65b018..d52e248d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: - image: cimg/openjdk:11.0.18-node steps: - checkout - - run: ./mvnw -ntp clean install -Pci -Dmaven.test.skip.exec=true + - run: ./mvnw clean install -Dlicense.skip=true -Pci - general-platform-helpers/step-load-dependencies - general-platform-helpers/step-run-snyk-monitor: scan-all-projects: false @@ -76,7 +76,7 @@ workflows: # See OKTA-624750 semgrep: jobs: - - jdk11 + - jdk17 - general-platform-helpers/job-semgrep-prepare: name: semgrep-prepare - general-platform-helpers/job-semgrep-scan: @@ -86,7 +86,7 @@ workflows: - general-platform-helpers/job-snyk-prepare: name: prepare-snyk requires: - - jdk11 + - jdk17 - snyk-scan: name: execute-snyk requires: From 850b22eb8fa8047d5942593cc17aba9a2aca6037 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:59:25 -0600 Subject: [PATCH 7/8] minor update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d52e248d0..9dfa7e7dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ jobs: - image: cimg/openjdk:11.0.18-node steps: - checkout - - run: ./mvnw clean install -Dlicense.skip=true -Pci + - run: ./mvnw clean install -DskipITs - general-platform-helpers/step-load-dependencies - general-platform-helpers/step-run-snyk-monitor: scan-all-projects: false From 317d05ee9b2a8567ee57b1d5a8e49fb2924d9549 Mon Sep 17 00:00:00 2001 From: Arvind Krishnakumar Date: Thu, 14 Dec 2023 13:59:45 -0600 Subject: [PATCH 8/8] minor update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9dfa7e7dd..ec15600d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ jobs: snyk-scan: docker: - - image: cimg/openjdk:11.0.18-node + - image: cimg/openjdk:17.0.6-node steps: - checkout - run: ./mvnw clean install -DskipITs