Fixes for github release asset check

nicholasdille · nicholasdille · commit ec6c0832f496 · 2023-07-13T18:18:20.000+02:00
diff --git a/@base/check-github-release-asset.sh b/@base/check-github-release-asset.sh
@@ -34,9 +34,11 @@ function check-github-release-asset() {
     echo "### Fetching release assets for ${repo} ${version}"
     local id
     local url="https://api.github.com/repos/${repo}/releases/tags/${version}"
-    if ! id="$(curl --silent --location --fail "${url}" | jq --raw-output '.id')" || test -z "${id}"; then
+    id="$(curl --silent --location "${url}" | jq --raw-output '.id')"
+    if test -z "${id}" || test "${id}" == "null"; then
         echo "    ERROR: Failed to fetch release id for ${repo} ${version}"
         echo "           at ${url}"
+        return 1
     fi
     echo "    Found release id ${id} for ${repo} ${version}"
 
@@ -45,5 +47,7 @@ function check-github-release-asset() {
     if ! curl --silent --location --fail "${url}" | jq --raw-output '.[].name'; then
         echo "    ERROR: Failed to fetch release assets for ${repo} ${version}"
         echo "           at ${url}"
+        return 1
     fi
+    return 1
 }
diff --git a/tools/git-credential-gopass/Dockerfile.template b/tools/git-credential-gopass/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "gopasspw/gopass" "v${version}" "gopass-linux-${alt_arch}"
+check-github-release-asset "gopasspw/git-credential-gopass" "v${version}" "git-credential-gopass-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/gopasspw/git-credential-gopass/releases/download/v${version}/git-credential-gopass-${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
     git-credential-gopass
diff --git a/tools/kbrew/Dockerfile.template b/tools/kbrew/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "kbrew-dev/kbrew" "${version}" "kbrew_${version}_Linux_${alt_arch}.tar.gz"
+check-github-release-asset "kbrew-dev/kbrew" "v${version}" "kbrew_${version}_Linux_${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/kbrew-dev/kbrew/releases/download/v${version}/kbrew_${version}_Linux_${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     kbrew
diff --git a/tools/kcount/Dockerfile.template b/tools/kcount/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "pan-net-security/kcount" "${version}" "kcount_${version}_Linux_x86_64.tar.gz"
+check-github-release-asset "pan-net-security/kcount" "v${version}" "kcount_${version}_Linux_x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/pan-net-security/kcount/releases/download/v${version}/kcount_${version}_Linux_x86_64.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
     kcount
diff --git a/tools/kdo/Dockerfile.template b/tools/kdo/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "stepro/kdo" "${version}" "kdo-v${version}-linux-amd64.tar.gz"
+check-github-release-asset "stepro/kdo" "v${version}" "kdo-v${version}-linux-amd64.tar.gz"
 curl --silent --location --fail "https://github.com/stepro/kdo/releases/download/v${version}/kdo-v${version}-linux-amd64.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
 EOF
diff --git a/tools/ketch/Dockerfile.template b/tools/ketch/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "theketchio/ketch" "${version}" "ketch-linux-amd64"
+check-github-release-asset "theketchio/ketch" "v${version}" "ketch-linux-amd64"
 curl --silent --location --fail --output "${prefix}${target}/bin/ketch" \
     "https://github.com/theketchio/ketch/releases/download/v${version}/ketch-linux-amd64"
 chmod +x "${prefix}${target}/bin/ketch"
diff --git a/tools/kink/Dockerfile.template b/tools/kink/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "Trendyol/kink" "${version}" "kink_${version}_Linux-${arch}.tar.gz"
+check-github-release-asset "Trendyol/kink" "v${version}" "kink_${version}_Linux-${arch}.tar.gz"
 curl --silent --location --fail "https://github.com/Trendyol/kink/releases/download/v${version}/kink_${version}_Linux-${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     kink
diff --git a/tools/kn/Dockerfile.template b/tools/kn/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "knative/client" "v${version}" "kn-linux-${alt_arch}"
+check-github-release-asset "knative/client" "knative-v${version}" "kn-linux-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/kn" \
     "https://github.com/knative/client/releases/download/knative-v${version}/kn-linux-${alt_arch}"
 chmod +x "${prefix}${target}/bin/kn"
diff --git a/tools/kubo/Dockerfile.template b/tools/kubo/Dockerfile.template
@@ -9,7 +9,7 @@ ARG version
 COPY ipfs.service ${prefix}${target}/etc/systemd/system
 
 RUN <<EOF
-check-github-release-asset "ipfs/go-ipfs" "v${version}" "go-ipfs_v${version}_linux-${alt_arch}.tar.gz"
+check-github-release-asset "ipfs/kubo" "v${version}" "kubo_v${version}_linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/ipfs/kubo/releases/download/v${version}/kubo_v${version}_linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
     kubo/ipfs
diff --git a/tools/kyverno/manifest.yaml b/tools/kyverno/manifest.yaml
@@ -1,5 +1,5 @@
 name: kyverno
-version: "10.10.10"
+version: "1.10.1"
 check: ${binary} version | grep ^Version | cut -d' ' -f2
 tags:
 - type/cli
diff --git a/tools/lstags/Dockerfile.template b/tools/lstags/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "ivanilves/lstags" "v${version}" "lstags-linux-${alt_arch}"
+check-github-release-asset "ivanilves/lstags" "v${version}" "lstags-linux-v${version}.tar.gz"
 curl --silent --location --fail "https://github.com/ivanilves/lstags/releases/download/v${version}/lstags-linux-v${version}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
 EOF
diff --git a/tools/pass-tail/Dockerfile.template b/tools/pass-tail/Dockerfile.template
@@ -12,7 +12,6 @@ WORKDIR /tmp/pass-tail
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "palortoff/pass-extension-tail" "v${version}" "pass-extension-tail-${version}.tar.gz"
 curl --silent --location --fail "https://github.com/palortoff/pass-extension-tail/archive/refs/tags/v${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1 --no-same-owner
 make install \
diff --git a/tools/runtainer/Dockerfile.template b/tools/runtainer/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "plumber-cd/runtainer" "${version}" "runtainer-linux-${alt_arch}"
+check-github-release-asset "plumber-cd/runtainer" "v${version}" "runtainer-linux-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/runtainer" \
     "https://github.com/plumber-cd/runtainer/releases/download/v${version}/runtainer-linux-${alt_arch}"
 chmod +x "${prefix}${target}/bin/runtainer"
diff --git a/tools/shellcheck/Dockerfile.template b/tools/shellcheck/Dockerfile.template
@@ -9,7 +9,7 @@ COPY --from=go-md2man / /
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "koalaman/shellcheck" "${version}" "shellcheck-v${version}.linux.${arch}.tar.xz"
+check-github-release-asset "koalaman/shellcheck" "v${version}" "shellcheck-v${version}.linux.${arch}.tar.xz"
 curl --silent --location --fail "https://github.com/koalaman/shellcheck/releases/download/v${version}/shellcheck-v${version}.linux.${arch}.tar.xz" \
 | tar --extract --xz --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
     shellcheck-v${version}/shellcheck
diff --git a/tools/slirp4netns/Dockerfile.template b/tools/slirp4netns/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "rootless-containers/slirp4netns" "${version}" "slirp4netns-${arch}"
+check-github-release-asset "rootless-containers/slirp4netns" "v${version}" "slirp4netns-${arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/slirp4netns" \
     "https://github.com/rootless-containers/slirp4netns/releases/download/v${version}/slirp4netns-${arch}"
 chmod +x "${prefix}${target}/bin/slirp4netns"
diff --git a/tools/sops/Dockerfile.template b/tools/sops/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "mozilla/sops" "${version}" "sops-v${version}.linux"
+check-github-release-asset "mozilla/sops" "v${version}" "sops-v${version}.linux"
 curl --silent --location --fail --output "${prefix}${target}/bin/sops" \
     "https://github.com/mozilla/sops/releases/download/v${version}/sops-v${version}.linux"
 chmod +x "${prefix}${target}/bin/sops"
diff --git a/tools/spdx-sbom-generator/Dockerfile.template b/tools/spdx-sbom-generator/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "opensbom-generator/spdx-sbom-generator" "${version}" "spdx-sbom-generator-v${version}-linux-${alt_arch}.tar.gz"
+check-github-release-asset "opensbom-generator/spdx-sbom-generator" "v${version}" "spdx-sbom-generator-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/opensbom-generator/spdx-sbom-generator/releases/download/v${version}/spdx-sbom-generator-v${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
 EOF
diff --git a/tools/spiffe-vault/Dockerfile.template b/tools/spiffe-vault/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "philips-labs/spiffe-vault" "${version}" "spiffe-vault_${version}_linux_${alt_arch}.tar.gz"
+check-github-release-asset "philips-labs/spiffe-vault" "v${version}" "spiffe-vault_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/philips-labs/spiffe-vault/releases/download/v${version}/spiffe-vault_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
 EOF
diff --git a/tools/ssh-key-confirmer/Dockerfile.template b/tools/ssh-key-confirmer/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "benjojo/ssh-key-confirmer" "${version}" "ssh-key-confirmer-${alt_arch}"
+check-github-release-asset "benjojo/ssh-key-confirmer" "v${version}" "ssh-key-confirmer-${alt_arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/ssh-key-confirmer" \
     "https://github.com/benjojo/ssh-key-confirmer/releases/download/v${version}/ssh-key-confirmer-${alt_arch}"
 chmod +x "${prefix}${target}/bin/ssh-key-confirmer"
diff --git a/tools/sshocker/Dockerfile.template b/tools/sshocker/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "lima-vm/sshocker" "${version}" "sshocker-Linux-${arch}"
+check-github-release-asset "lima-vm/sshocker" "v${version}" "sshocker-Linux-${arch}"
 curl --silent --location --fail --output "${prefix}${target}/bin/sshocker" \
     "https://github.com/lima-vm/sshocker/releases/download/v${version}/sshocker-Linux-${arch}"
 chmod +x "${prefix}${target}/bin/sshocker"
diff --git a/tools/tetragon/Dockerfile.template b/tools/tetragon/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "cilium/tetragon" "${version}" "tetra-linux-${alt_arch}.tar.gz"
+check-github-release-asset "cilium/tetragon" "v${version}" "tetra-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cilium/tetragon/releases/download/v${version}/tetra-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner
 
diff --git a/tools/vland/Dockerfile.template b/tools/vland/Dockerfile.template
@@ -6,7 +6,6 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "parke/vland" "${version}" "vland"
 curl --silent --location --fail --output "${prefix}${target}/bin/vland" \
     "https://github.com/parke/vland/raw/${version}/vland"
 chmod +x "${prefix}${target}/bin/vland"
diff --git a/tools/wait-for/Dockerfile.template b/tools/wait-for/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "dnnrly/wait-for" "${version}" "wait-for_${version}_linux_${alt_arch}.tar.gz"
+check-github-release-asset "dnnrly/wait-for" "v${version}" "wait-for_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/dnnrly/wait-for/releases/download/v${version}/wait-for_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
     wait-for
diff --git a/tools/watchtower/Dockerfile.template b/tools/watchtower/Dockerfile.template
@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-check-github-release-asset "containrrr/watchtower" "${version}" "watchtower_linux_amd64.tar.gz"
+check-github-release-asset "containrrr/watchtower" "v${version}" "watchtower_linux_amd64.tar.gz"
 curl --silent --location --fail "https://github.com/containrrr/watchtower/releases/download/v${version}/watchtower_linux_amd64.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     watchtower
diff --git a/tools/websocat/Dockerfile.template b/tools/websocat/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "vi/websocat" "${version}" "websocat.x86_64-unknown-linux-musl"
+check-github-release-asset "vi/websocat" "v${version}" "websocat.x86_64-unknown-linux-musl"
 curl --silent --location --fail --output "${prefix}${target}/bin/websocat" \
     "https://github.com/vi/websocat/releases/download/v${version}/websocat.x86_64-unknown-linux-musl"
 chmod +x "${prefix}${target}/bin/websocat"
diff --git a/tools/win-gpg-agent/Dockerfile.template b/tools/win-gpg-agent/Dockerfile.template
@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-check-github-release-asset "rupor-github/win-gpg-agent" "${version}" "win-gpg-agent.zip"
+check-github-release-asset "rupor-github/win-gpg-agent" "v${version}" "win-gpg-agent.zip"
 curl --silent --location --fail --remote-name "https://github.com/rupor-github/win-gpg-agent/releases/download/v${version}/win-gpg-agent.zip"
 unzip -q -o -d "/tmp" "win-gpg-agent.zip"
 rm "win-gpg-agent.zip"
diff --git a/tools/wksctl/Dockerfile.template b/tools/wksctl/Dockerfile.template
@@ -6,7 +6,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
 RUN <<EOF
-check-github-release-asset "weaveworks/wksctl" "${version}" "wksctl-${version}-linux-x86_64.tar.gz"
+check-github-release-asset "weaveworks/wksctl" "v${version}" "wksctl-${version}-linux-x86_64.tar.gz"
 curl --silent --location --fail "https://github.com/weaveworks/wksctl/releases/download/v${version}/wksctl-${version}-linux-x86_64.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/share/" --no-same-owner
 mv "${prefix}${target}/share/wksctl" "${prefix}${target}/bin/"
diff --git a/tools/wksctl/manifest.yaml b/tools/wksctl/manifest.yaml
@@ -1,5 +1,5 @@
 name: wksctl
-version: "0.10.2"
+version: "0.10.1"
 check: ${binary} version
 tags:
   - type/cli
