Merge branch 'main' into phantsure/lint-fix

code-scanning/codeql.yml

@@ -34,6 +34,8 @@ jobs:
       matrix:
         language: [ $detected-codeql-languages ]
         # CodeQL supports [ $supported-codeql-languages ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:

code-scanning/datree.yml

@@ -0,0 +1,47 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# A sample workflow which checks out your code and scans your desired k8s config files for misconfigurations using the Datree CLI.
+# The results are then uploaded to GitHub Security Code Scanning.
+#
+# For more information and configurations options, see https://github.com/datreeio/action-datree/
+
+name: Datree
+
+on:
+  push:
+    branches: [ $default-branch, $protected-branches ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ $default-branch ]
+
+permissions:
+  contents: read
+
+jobs:
+  datree:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run Datree policy check
+        continue-on-error: true
+        uses: datreeio/action-datree@de67ae7a5133d719dc794e1b75682cd4c5f94d8a
+        env:
+          # In order to use the Datree action you will need to have a Datree token.
+          # See https://hub.datree.io/setup/account-token#1-get-your-account-token-from-the-dashboard to acquire your token.
+          DATREE_TOKEN: ${{ secrets.DATREE_TOKEN }}
+        with:
+          # Add the path to the configuration file/s that you would like to test.
+          # See https://github.com/datreeio/action-datree#usage for all available options.
+          path: test-file.yaml
+          # Setting a SARIF output will generate a file named "datree.sarif" containing your test results
+          cliArguments: "-o sarif"
+      - name: Upload result to GitHub Code Scanning
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: datree.sarif

code-scanning/properties/datree.properties.json

@@ -0,0 +1,7 @@
+{
+    "name": "Datree",
+    "creator": "Datree",
+    "description": "Detect misconfigurations in your Kubernetes manifests and present them in Github code scanning",
+    "iconName": "datree",
+    "categories": ["Code Scanning", "YAML"]
+}

code-scanning/soos-dast-scan.yml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run SOOS DAST Scan
-        uses: soos-io/soos-dast-github-action@5b9c65687cee49aee1c776759f25561f908be565 # Use latest version from https://github.com/marketplace/actions/soos-dast
+        uses: soos-io/soos-dast-github-action@3e71b27756f4ed77d7ad3c0ad92afddb47a40e4d # Use latest version from https://github.com/marketplace/actions/soos-dast
         with:
           client_id: ${{ secrets.SOOS_CLIENT_ID }}
           api_key: ${{ secrets.SOOS_API_KEY }}
@@ -45,6 +45,4 @@ jobs:
       - name: Upload SOOS DAST SARIF Report
         uses: github/codeql-action/upload-sarif@v2
         with:
-          sarif_file: results.sarif
-
-
+          sarif_file: results.sarif