From 69531a8e11fd941683177afcbc2b2ebe6f552085 Mon Sep 17 00:00:00 2001
From: Bertrand Goareguer <bertrand.goareguer@gmail.com>
Date: Fri, 26 Jan 2024 10:24:17 +0000
Subject: [PATCH] fix: resolve "python-index-cataloger does not exist"
---
README.md | 2 +-
kicker.json | 2 +-
templates/gitlab-ci-python.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index ad21f0e..e18845f 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,7 @@ It is bound to the `test` stage, and uses the following variables:
| `sbom-disabled` / `PYTHON_SBOM_DISABLED` | Set to `true` to disable this job | _none_ |
| `sbom-syft-url` / `PYTHON_SBOM_SYFT_URL` | Url to the `tar.gz` package for `linux_amd64` of Syft to use (ex: `https://github.com/anchore/syft/releases/download/v0.62.3/syft_0.62.3_linux_amd64.tar.gz`)<br/>_When unset, the latest version will be used_ | _none_ |
| `sbom-name` / `PYTHON_SBOM_NAME` | Component name of the emitted SBOM | `$CI_PROJECT_PATH/$PYTHON_PROJECT_DIR` |
-| `sbom-opts` / `PYTHON_SBOM_OPTS` | Options for syft used for SBOM analysis | `--catalogers python-index-cataloger` |
+| `sbom-opts` / `PYTHON_SBOM_OPTS` | Options for syft used for SBOM analysis | `--override-default-catalogers python-package-cataloger` |
In addition to logs in the console, this job produces the following reports, kept for one week:
diff --git a/kicker.json b/kicker.json
index dca014e..4421f5a 100644
--- a/kicker.json
+++ b/kicker.json
@@ -168,7 +168,7 @@
{
"name": "PYTHON_SBOM_OPTS",
"description": "Options for syft used for SBOM analysis",
- "default": "--catalogers python-index-cataloger",
+ "default": "--override-default-catalogers python-package-cataloger",
"advanced": true
}
]
diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml
index 6d85d1f..773dbd4 100644
--- a/templates/gitlab-ci-python.yml
+++ b/templates/gitlab-ci-python.yml
@@ -121,7 +121,7 @@ spec:
default: $CI_PROJECT_PATH/$PYTHON_PROJECT_DIR
sbom-opts:
description: Options for syft used for SBOM analysis
- default: --catalogers python-index-cataloger
+ default: --override-default-catalogers python-package-cataloger
release-enabled:
description: Enable Release
type: boolean
--
GitLab