From 328a576d6369005a41cffc98628b3897fbf48a77 Mon Sep 17 00:00:00 2001
From: daynewlee <yli3@redhat.com>
Date: Mon, 6 May 2024 15:00:34 -0500
Subject: [PATCH 1/4] Check download success or failure in the tmp folder

---
 scripts/ci/jobs/diff-dumps.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/jobs/diff-dumps.sh b/scripts/ci/jobs/diff-dumps.sh
index b80228eef..dffe4c4a9 100755
--- a/scripts/ci/jobs/diff-dumps.sh
+++ b/scripts/ci/jobs/diff-dumps.sh
@@ -121,9 +121,11 @@ upload_offline_dump() {
     latest_version=$(grep -oE '^[0-9]+\.[0-9]+' "$version_file" | sort -V | tail -n 1)
 
     file_to_check="scanner-v4-defs-${latest_version}.zip"
+    temp_file="/tmp/$file_to_check"
 
-    if curl --silent --show-error --max-time 60 --retry 3 -o $file_to_check https://definitions.stackrox.io/v4/offline-bundles/$file_to_check; then
-        # If the file exists, add it to scanner-vuln-updates.zip
+    if curl --show-error --max-time 60 --retry 3 -o "$temp_file" https://definitions.stackrox.io/v4/offline-bundles/$file_to_check; then
+        # File exists, move it to the intended location
+        mv "$temp_file" "$file_to_check"
         zip scanner-vuln-updates.zip "$file_to_check"
         echo "$file_to_check added to scanner-vuln-updates.zip"
     else

From c190b671f1a5f33e45d61337c0d478528b1ce018 Mon Sep 17 00:00:00 2001
From: daynewlee <yli3@redhat.com>
Date: Mon, 6 May 2024 15:39:30 -0500
Subject: [PATCH 2/4] test

---
 scripts/ci/jobs/diff-dumps.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/ci/jobs/diff-dumps.sh b/scripts/ci/jobs/diff-dumps.sh
index dffe4c4a9..cc126eb64 100755
--- a/scripts/ci/jobs/diff-dumps.sh
+++ b/scripts/ci/jobs/diff-dumps.sh
@@ -123,13 +123,17 @@ upload_offline_dump() {
     file_to_check="scanner-v4-defs-${latest_version}.zip"
     temp_file="/tmp/$file_to_check"
 
-    if curl --show-error --max-time 60 --retry 3 -o "$temp_file" https://definitions.stackrox.io/v4/offline-bundles/$file_to_check; then
-        # File exists, move it to the intended location
-        mv "$temp_file" "$file_to_check"
-        zip scanner-vuln-updates.zip "$file_to_check"
-        echo "$file_to_check added to scanner-vuln-updates.zip"
+    if curl --silent --show-error --max-time 60 --retry 3 -o "$temp_file" "https://definitions.stackrox.io/v4/offline-bundles/$file_to_check"; then
+        if file "$temp_file" | grep -q 'Zip archive data'; then
+            mv "$temp_file" "$file_to_check"
+            zip scanner-vuln-updates.zip "$file_to_check"
+            echo "$file_to_check added to scanner-vuln-updates.zip"
+        else
+            echo "Failed to download a valid ZIP file."
+            exit 1
+        fi
     else
-        echo "$file_to_check does not exist."
+        echo "Failed to download the file."
         exit 1
     fi
     "${cmd[@]}" gsutil cp scanner-vuln-updates.zip gs://scanner-support-public/offline/v1/scanner-vuln-updates.zip

From 890cd6640cad4c852c51fdb9972d30533fcc2825 Mon Sep 17 00:00:00 2001
From: Yi Li <yli3@redhat.com>
Date: Wed, 15 May 2024 15:54:17 -0500
Subject: [PATCH 3/4] Update diff-dumps.sh

---
 scripts/ci/jobs/diff-dumps.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/scripts/ci/jobs/diff-dumps.sh b/scripts/ci/jobs/diff-dumps.sh
index cc126eb64..02fd22d2c 100755
--- a/scripts/ci/jobs/diff-dumps.sh
+++ b/scripts/ci/jobs/diff-dumps.sh
@@ -121,21 +121,11 @@ upload_offline_dump() {
     latest_version=$(grep -oE '^[0-9]+\.[0-9]+' "$version_file" | sort -V | tail -n 1)
 
     file_to_check="scanner-v4-defs-${latest_version}.zip"
-    temp_file="/tmp/$file_to_check"
 
-    if curl --silent --show-error --max-time 60 --retry 3 -o "$temp_file" "https://definitions.stackrox.io/v4/offline-bundles/$file_to_check"; then
-        if file "$temp_file" | grep -q 'Zip archive data'; then
-            mv "$temp_file" "$file_to_check"
-            zip scanner-vuln-updates.zip "$file_to_check"
-            echo "$file_to_check added to scanner-vuln-updates.zip"
-        else
-            echo "Failed to download a valid ZIP file."
-            exit 1
-        fi
-    else
-        echo "Failed to download the file."
-        exit 1
-    fi
+    curl --silent --show-error --fail --max-time 60 --retry 3 -o $file_to_check https://definitions.stackrox.io/v4/offline-bundles/$file_to_check
+    zip scanner-vuln-updates.zip "$file_to_check"
+    echo "$file_to_check added to scanner-vuln-updates.zip"
+
     "${cmd[@]}" gsutil cp scanner-vuln-updates.zip gs://scanner-support-public/offline/v1/scanner-vuln-updates.zip
 }
 

From c8e666a9ed784888f8f0ae166bfae5be9fbca5e3 Mon Sep 17 00:00:00 2001
From: Yi Li <yli3@redhat.com>
Date: Thu, 16 May 2024 15:23:04 -0500
Subject: [PATCH 4/4] Update scripts/ci/jobs/diff-dumps.sh

Co-authored-by: J. Victor Martins <jvdm@sdf.org>
---
 scripts/ci/jobs/diff-dumps.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/jobs/diff-dumps.sh b/scripts/ci/jobs/diff-dumps.sh
index 02fd22d2c..80bfbc067 100755
--- a/scripts/ci/jobs/diff-dumps.sh
+++ b/scripts/ci/jobs/diff-dumps.sh
@@ -123,6 +123,7 @@ upload_offline_dump() {
     file_to_check="scanner-v4-defs-${latest_version}.zip"
 
     curl --silent --show-error --fail --max-time 60 --retry 3 -o $file_to_check https://definitions.stackrox.io/v4/offline-bundles/$file_to_check
+    unzip -l "$file_to_check"
     zip scanner-vuln-updates.zip "$file_to_check"
     echo "$file_to_check added to scanner-vuln-updates.zip"