From e2fe6f26662ad1dcff45e318126cf142f7df3046 Mon Sep 17 00:00:00 2001 From: AndriiMysko Date: Thu, 25 Aug 2022 13:29:48 +0300 Subject: [PATCH 1/3] Add private repo check --- packer-scripts/cosign-install | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packer-scripts/cosign-install b/packer-scripts/cosign-install index d429dd5d0..8be396408 100644 --- a/packer-scripts/cosign-install +++ b/packer-scripts/cosign-install @@ -30,6 +30,17 @@ main() { main() { args="$@" + + if [ ! -z "${COSIGN_EXPERIMENTAL}" ] \ + && [ ! -z "${TRAVIS_REPO_PRIVATE}" ] \ + && [ $COSIGN_EXPERIMENTAL == 1 ] \ + && [ $TRAVIS_REPO_PRIVATE == "true" ] \ + && [[ $args != *"--key"* ]] + then + echo "Experimental cosign features are not allowed in builds for private repositories" + exit 1 + fi + # call original cosign binary and send arguments not_cosign $args From a8df80153055dd5a90caf033c2eeab9fee18c9cb Mon Sep 17 00:00:00 2001 From: AndriiMysko Date: Wed, 28 Sep 2022 10:22:53 +0300 Subject: [PATCH 2/3] Adjust cosign key --- packer-scripts/cosign-install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packer-scripts/cosign-install b/packer-scripts/cosign-install index 8be396408..138a8b8a7 100644 --- a/packer-scripts/cosign-install +++ b/packer-scripts/cosign-install @@ -25,7 +25,6 @@ main() { #!/usr/bin/env bash set -o errexit - set -o xtrace main() { @@ -35,7 +34,7 @@ main() { && [ ! -z "${TRAVIS_REPO_PRIVATE}" ] \ && [ $COSIGN_EXPERIMENTAL == 1 ] \ && [ $TRAVIS_REPO_PRIVATE == "true" ] \ - && [[ $args != *"--key"* ]] + && [[ $args != *"-key"* ]] then echo "Experimental cosign features are not allowed in builds for private repositories" exit 1 From afb8d171f53fa287458c16fc4455d02fb75547b6 Mon Sep 17 00:00:00 2001 From: Andrii Mysko Date: Fri, 30 Sep 2022 16:53:23 +0300 Subject: [PATCH 3/3] Update cosign-install --- packer-scripts/cosign-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer-scripts/cosign-install b/packer-scripts/cosign-install index 138a8b8a7..082a24237 100644 --- a/packer-scripts/cosign-install +++ b/packer-scripts/cosign-install @@ -34,7 +34,7 @@ main() { && [ ! -z "${TRAVIS_REPO_PRIVATE}" ] \ && [ $COSIGN_EXPERIMENTAL == 1 ] \ && [ $TRAVIS_REPO_PRIVATE == "true" ] \ - && [[ $args != *"-key"* ]] + && [[ $args != *"--key"* ]] then echo "Experimental cosign features are not allowed in builds for private repositories" exit 1