feat(labels): integrate get_first_arch and enhance retry testing

- Update get_image_labels to use get_first_arch.
- Add test for updated get_image_labels.

Signed-off-by: Ashwini Kumar

Author: Ashwini Kumar

test/utils.sh

@@ -938,22 +938,18 @@ get_image_labels() {
     exit 2
   fi
 
-  local image_labels
   # Ensure that we don't have a tag and digest for skopeo
   image=$(get_image_registry_repository_digest "$image")
 
-  # Fetch first arch using --raw as skopeo may fail when
-  # the image does not have build for arch same as base system.
-  local raw_output
-
-  if ! raw_output=$(retry skopeo inspect --raw "docker://${image}"); then
-    echo "get_image_labels: raw inspect failed after retries" >&2
+  first_arch=$(get_first_arch "${image}")
+  if [ -z "${first_arch}" ] || [ "${first_arch}" == "null" ]; then
+      echo "get_image_labels: architecture could not be determined for ${image}" >&2
+      exit 1
   fi
 
-  first_arch=$(echo "${raw_output}" | jq -r '.manifests[].platform.architecture' | head -n 1)
   echo "get_image_labels: First architecture found: ${first_arch}"
 
-
+  local image_labels
   if ! image_labels=$(retry skopeo inspect  --override-arch="${first_arch}" --no-tags docker://"${image}"); then
     echo "get_image_labels: failed to inspect the image" >&2
     exit 1

unittests_bash/test_utils.bats

@@ -836,14 +836,12 @@ EOF
 @test "Get Image Labels: registry/image-manifest:tag@invalid" {
     run get_image_labels registry/image-manifest:tag@invalid
 
-    local EXPECTED_LINE_1="get_image_labels: First architecture found:"
-    local EXPECTED_LINE_2="get_image_labels: failed to inspect the image"
-    local EXPECTED_ERROR_LINE="Invalid numeric literal at line 1, column 13"
+    local EXPECTED_LINE_1="get_first_arch: Error fetching raw manifest for registry/image-manifest@invalid"
+    local EXPECTED_LINE_2="get_image_labels: architecture could not be determined for registry/image-manifest@invalid"
 
     [[ "$status" -eq 1 \
         && "${output}" == *"${EXPECTED_LINE_1}"* \
-        && "${output}" == *"${EXPECTED_LINE_2}"* \
-        && "${output}" == *"${EXPECTED_ERROR_LINE}"* ]]
+        && "${output}" == *"${EXPECTED_LINE_2}"* ]]
 }
 
 @test "Get relatedImages from operator bundle: valid-operator-bundle-1" {
@@ -1514,12 +1512,12 @@ EOF
 
 }
 
-@test "Retry Get Image Labels: registry/image:tag@invalid-url" {
+@test "Retry Get Image Labels: registry/image-manifest@valid" {
     RETRY_COUNT=1
     RETRY_INTERVAL=1
     retry_output=$(get_retry_expected_output)
-    run get_image_labels  registry/image:tag@invalid-url
-    EXPECTED_RESPONSE=$(echo -e -n "get_image_labels: First architecture found: \n${retry_output}get_image_labels: failed to inspect the image")
+    run get_image_labels  registry/image-manifest@valid
+    EXPECTED_RESPONSE=$(echo -e -n "get_image_labels: First architecture found: amd64\n${retry_output}get_image_labels: failed to inspect the image")
 
     [[ "${output}" == *"${EXPECTED_RESPONSE}"* && "$status" -eq 1 ]]
 }
@@ -2179,4 +2177,18 @@ EOF
 
     [ "$status" -eq 1 ]
     [[ "$output" == *"get_first_arch: Error fetching raw manifest"* ]]
+}
+@test "Retry get_first_arch: registry/invalid-image:lates" {
+    RETRY_COUNT=1
+    RETRY_INTERVAL=1
+
+    retry_output=$(get_retry_expected_output)
+
+    run get_first_arch "registry/invalid-image:latest"
+
+    local EXPECTED_FINAL_ERROR="get_first_arch: Error fetching raw manifest for ${image}"
+    EXPECTED_RESPONSE=$(echo -e "${retry_output}\n${FINAL_ERROR}")
+    echo "$EXPECTED_RESPONSE"
+    [[ "${output}" == *"${EXPECTED_RESPONSE}"* && "$status" -eq 1 ]]
+
 }