Merge branch 'main' into bugfix/scb-bot-pr-changelog

Ilyesbdlala · Ilyesbdlala · commit 9d995f491d85 · 2021-11-17T11:22:45.000+01:00
This is done to get it inline with the #819 PR Signed-off-by: Ilyes Ben Dlala <ilyes.bendlala@iteratec.com>
diff --git a/.github/workflows/scb-bot.yaml b/.github/workflows/scb-bot.yaml
@@ -37,21 +37,37 @@ jobs:
           git-user-signingkey: true
           git-commit-gpgsign: true
 
+      - name: Fetch local scanner version
+        uses: mikefarah/yq@v4.4.1
+        with:
+          cmd: echo local=$(yq e .appVersion scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV
+
       - name: Fetch scanner's version API
         uses: mikefarah/yq@v4.4.1
         with:
           cmd: echo versionApi=$(yq e .annotations.versionApi scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV
 
       - name: Fetch latest release scanner version
-        run: echo release=$((curl -sL ${{env.versionApi}}  ) | jq -r ".tag_name") | tr -d "v" >> $GITHUB_ENV
-
-      - name: Fetch local scanner version
-        uses: mikefarah/yq@v4.4.1
-        with:
-          cmd: echo local=$(yq e .appVersion scanners/${{ matrix.scanner }}/Chart.yaml) | tr -d "v" >> $GITHUB_ENV
+        # A hacky way to solve the problem where the docker image is in the "1.0" format and the github release is in the "v1.0" format
+        # We make sure to add or remove the "v" character when necessary
+        run: |
+          local=${{env.local}}
+          release=$(curl -sL ${{env.versionApi}}  | jq -r ".tag_name" )
+          upgrade=$release
+
+          if [[ ${local:0:1} != ${release:0:1} ]] ; then
+            if [[ ${local:0:1} == "v" ]] ; then
+              upgrade=v${release};
+            elif [[ ${release:0:1} == "v" ]] ; then
+              upgrade=$(echo $release| tr -d "v")
+            fi
+          fi
+          
+          echo $upgrade
+          echo release=$upgrade >> $GITHUB_ENV
 
       - name: Check if scanner is outdated and if PR already exists
-        if: ${{ env.release != env.local }}
+        if: ${{ env.release != env.local && env.release != null }}
         run: |
           echo 'The ${{ matrix.scanner }} scanner is outdated.  Current SCB version is ${{env.local}} and remote version is ${{env.release}}'
 
@@ -65,14 +81,15 @@ jobs:
        if: ${{ env.release != env.local }}
         run: |
           changelog=$(curl -sL ${{env.versionApi}} | jq -r ".body" | sed -e 's/#[0-9]\+//g')
+          echo $changelog
           echo releaseChangelog=$changelog >> $GITHUB_ENV
 
       - name: Upgrade Scanner Helm Chart
-        if: ${{ env.release != env.local && env.prExists == 0 }}
+        if: ${{ env.release != env.local && env.prExists == 0 && env.release != null}}
         uses: mikefarah/yq@v4.4.1
         with:
           # appVersion value in chart is replaced with release value. Empty lines are deleted in the process
-          cmd: yq e --inplace '.appVersion = "v${{env.release}}"' ./scanners/${{ matrix.scanner }}/Chart.yaml
+          cmd: yq e --inplace '.appVersion = "${{env.release}}"' ./scanners/${{ matrix.scanner }}/Chart.yaml
 
       # Updating Helm Docs
       - name: Download Helm Docs
@@ -114,7 +131,7 @@ jobs:
           rm -rf helm-docs
 
       - name: Create Pull Request
-        if: ${{ env.release != env.local && env.prExists == 0 }}
+        if: ${{ env.release != env.local && env.prExists == 0 && env.release != null }}
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.SCB_BOT_USER_TOKEN }}
diff --git a/parser-sdk/nodejs/package-lock.json b/parser-sdk/nodejs/package-lock.json
diff --git a/parser-sdk/nodejs/package.json b/parser-sdk/nodejs/package.json
@@ -11,7 +11,7 @@
     "ajv": "^8.6.3",
     "ajv-draft-04": "^1.0.0",
     "ajv-formats": "^2.1.0",
-    "axios": "^0.21.4",
+    "axios": "^0.22.0",
     "jsonpointer": "^5.0.0",
     "uuid": "^8.3.2",
     "ws": "^7.5.5"
diff --git a/scanners/semgrep/Chart.yaml b/scanners/semgrep/Chart.yaml
@@ -18,7 +18,7 @@ version: "v3.1.0-alpha1"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.71.0"
+appVersion: "0.73.0"
 annotations:
   versionApi: https://api.github.com/repos/returntocorp/semgrep/releases/latest
 kubeVersion: ">=v1.11.0-0"
diff --git a/scanners/semgrep/README.md b/scanners/semgrep/README.md
@@ -3,7 +3,7 @@ title: "Semgrep"
 category: "scanner"
 type: "Repository"
 state: "released"
-appVersion: "0.71.0"
+appVersion: "0.73.0"
 usecase: "Static Code Analysis"
 ---
 
diff --git a/scanners/trivy/Chart.yaml b/scanners/trivy/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the trivy security scanner that integrates with th
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: v3.1.0-alpha1
-appVersion: "0.20.2"
+appVersion: "0.21.0"
 kubeVersion: ">=v1.11.0-0"
 annotations:
   versionApi: https://api.github.com/repos/aquasecurity/trivy/releases/latest
diff --git a/scanners/trivy/README.md b/scanners/trivy/README.md
@@ -3,7 +3,7 @@ title: "Trivy"
 category: "scanner"
 type: "Container"
 state: "released"
-appVersion: "0.20.2"
+appVersion: "0.21.0"
 usecase: "Container Vulnerability Scanner"
 ---
 
diff --git a/scanners/wpscan/Chart.yaml b/scanners/wpscan/Chart.yaml
@@ -5,11 +5,10 @@
 apiVersion: v2
 name: wpscan
 description: A Helm chart for the WordPress security scanner that integrates with the secureCodeBox.
-
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
 version: v3.1.0-alpha1
-appVersion: "v3.8.19"
+appVersion: "v3.8.20"
 kubeVersion: ">=v1.11.0-0"
 
 annotations:
diff --git a/scanners/wpscan/README.md b/scanners/wpscan/README.md
@@ -3,7 +3,7 @@ title: 'WPScan'
 category: 'scanner'
 type: "CMS"
 state: "released"
-appVersion: "v3.8.19"
+appVersion: "v3.8.20"
 usecase: "Wordpress Vulnerability Scanner"
 ---
 
