CHANGELOG.md

+## [6.6.5](https://gitlab.com/to-be-continuous/python/compare/6.6.4...6.6.5) (2024-2-15)
+
+
+### Bug Fixes
+
+* more reliable retrieve url for Syft ([5d83eaa](https://gitlab.com/to-be-continuous/python/commit/5d83eaad9bfc08b10c41656f457c37fbec1ebb5b)), closes [#65](https://gitlab.com/to-be-continuous/python/issues/65)
+
 ## [6.6.4](https://gitlab.com/to-be-continuous/python/compare/6.6.3...6.6.4) (2024-2-2)
 
 

README.md

@@ -14,7 +14,7 @@ Add the following to your `gitlab-ci.yml`:
 ```yaml
 include:
   # 1: include the component
-  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.6.4
+  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.6.5
     # 2: set/override component inputs
     inputs:
       image: registry.hub.docker.com/library/python:3.10
@@ -29,7 +29,7 @@ Add the following to your `gitlab-ci.yml`:
 include:
   # 1: include the template
   - project: 'to-be-continuous/python'
-    ref: '6.6.4'
+    ref: '6.6.5'
     file: '/templates/gitlab-ci-python.yml'
 
 variables:
@@ -454,9 +454,9 @@ With:
 ```yaml
 include:
   # main component
-  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.6.4
+  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.6.5
   # Vault variant
-  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-vault@6.6.4
+  - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-vault@6.6.5
     inputs:
       vault-base-url: "https://vault.acme.host/v1"
       # audience claim for JWT

templates/gitlab-ci-python-vault.yml

@@ -22,7 +22,7 @@ variables:
 .python-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "python", "6.6.4"]
+      command: ["--service", "python", "6.6.5"]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"
   variables:

templates/gitlab-ci-python.yml

@@ -794,7 +794,7 @@ stages:
   image: $PYTHON_IMAGE
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "python", "6.6.4"]
+      command: ["--service", "python", "6.6.5"]
   # Cache downloaded dependencies and plugins between builds.
   # To keep cache across branches add 'key: "$CI_JOB_NAME"'
   cache:
@@ -1061,7 +1061,8 @@ py-sbom:
       if [[ -z "$PYTHON_SBOM_SYFT_URL" ]]
       then
         log_info "Syft version unset: retrieve latest version..."
-        PYTHON_SBOM_SYFT_URL="https://github.com$(curl https://github.com/anchore/syft/releases -s | sed -rn 's/.*href="(.*_linux_amd64\.tar\.gz)".*/\1/p')"
+        syft_version=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/anchore/syft/releases/latest | grep -o '[^/v]*$')
+        PYTHON_SBOM_SYFT_URL="https://github.com/anchore/syft/releases/download/v${syft_version}/syft_${syft_version}_linux_amd64.tar.gz"
         log_info "... use latest Syft version: \\e[32m$PYTHON_SBOM_SYFT_URL\\e[0m"
       fi
       python_sbom_syft="$PIP_CACHE_DIR/syft-$(echo "$PYTHON_SBOM_SYFT_URL" | md5sum | cut -d" " -f1)"