bin: fix pre-commit to run from test container

Author: anders-elastisys

.pre-commit-config.yaml

@@ -95,14 +95,22 @@ repos:
         types: [shell]
         language: script
         require_serial: true
-        entry: scripts/sbom/sbom.bash diff
+        entry: scripts/sbom/sbom.bash
+        args:
+          - diff
 
       - id: sbom-validate
         name: SBOM CycloneDX validation
         types: [shell]
         language: script
         require_serial: true
-        entry: scripts/sbom/sbom.bash validate
+        entry: scripts/run-from-container.sh
+        args:
+          - --network=none
+          - docker.io/cyclonedx/cyclonedx-cli:0.27.2
+          - validate
+          - --input-file
+          - docs/sbom.json
 
       # - id: sbom-get-unset
       #   name: SBOM get unset

scripts/sbom/sbom.bash

@@ -37,7 +37,7 @@ usage() {
   echo "COMMANDS:" >&2
   echo "  add <location> <key> <value> [property-value]   add key-value pair to a component" >&2
   echo "  diff                                            checks if any changes in git requires sbom to be updated" >&2
-  echo "  edit <location> <key>                           edit object under key for a component using $EDITOR" >&2
+  echo "  edit <location> <key>                           edit object under key for a component using ${EDITOR:-}" >&2
   echo "  generate                                        generate new cyclonedx sbom. Requires GITHUB_TOKEN to be set to avoid GitHub rate limits" >&2
   echo "  get <location> [key]                            get component from sbom, optionally query for a provided key" >&2
   echo "  get-charts                                      get all charts in sbom" >&2