Merge pull request #95 from jduimovich/tree-fix

fix cosign login and tree command
redhat-appstudio · Nov 27, 2024 · 3c9bc37 · 3c9bc37
2 parents 3f27d6b + 8567b47
commit 3c9bc37
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/rhtap/show-sbom-rhdh.sh b/rhtap/show-sbom-rhdh.sh
@@ -14,6 +14,11 @@ function show-sbom() {
         echo -n "."
         status=0
         echo
+        image_registry="${IMAGE_URL/\/*/}"
+        # If the repo is not publicly accessible we need to authenticate so ec can access it
+        prepare-registry-user-pass $image_registry
+        echo "cosign login to registry $image_registry"
+        cosign login --username="$IMAGE_REGISTRY_USER" --password="$IMAGE_REGISTRY_PASSWORD" $image_registry
         echo "SBOM_EYECATCHER_BEGIN"
         cosign download sbom $IMAGE_URL 2>> $RESULTS/err
         status=$?

diff --git a/rhtap/summary.sh b/rhtap/summary.sh
@@ -23,9 +23,22 @@ function appstudio-summary() {
     echo End Summary
 
 }
+# missing tree command
+function showTree() {
+    find $1 | sed -e "s/[^-][^\/]*\// ├─/g" -e "s/|\([^ ]\)/|─\1/"
+}
+function cosignTree() {
+    URL=$1
+    image_registry="${URL/\/*/}"
+    # If the repo is not publicly accessible we need to authenticate so ec can access it
+    prepare-registry-user-pass $image_registry
+    echo "cosign login to registry $image_registry"
+    cosign login --username="$IMAGE_REGISTRY_USER" --password="$IMAGE_REGISTRY_PASSWORD" $image_registry
+    cosign tree $URL
+}
 
 # Task Steps
 appstudio-summary
-tree $BASE_RESULTS
-cosign tree $IMAGE_URL
+showTree $BASE_RESULTS
+cosignTree $IMAGE_URL
 exit_with_success_result