Exercising entrypoint with more test targets (#8)

* Exercising entrypoint with more test targets * Running e2e without blocking
dotanuki-labs · Sep 22, 2024 · add3643 · add3643
1 parent b992056
commit add3643
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,6 +46,16 @@ jobs:
         env:
           APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_POCKETCASTS_IOS_KEY }}
 
+      - name: Test scanning iOS ipa plus dSyms
+        run: ./e2e/bitwarden-ios.sh
+        env:
+          APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_BITWARDEN_IOS_KEY }}
+
+      - name: Test scanning Android apk plus mappings
+        run: ./e2e/cromite-android.sh
+        env:
+          APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_DOTANUKI_CROMITE_ANDROID_KEY }}
+
   component-tests:
     needs: e2e
     runs-on: ubuntu-22.04

diff --git a/e2e/bitwarden-ios.sh b/e2e/bitwarden-ios.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Copyright 2024 Dotanuki Labs
+# SPDX-License-Identifier: MIT
+
+set -euo pipefail
+
+readonly repo="bitwarden/ios"
+readonly version="v2024.9.1"
+
+readonly ipa_asset="Bitwarden.iOS.2024.9.1.1092.ipa"
+readonly ipa_download_url="https://github.com/$repo/releases/download/$version/$ipa_asset"
+readonly ipa="bitwarden-ios.ipa"
+
+readonly dsyms_asset="Bitwarden.iOS.2024.9.1.1092.dSYMs.zip"
+readonly dsyms_download_url="https://github.com/$repo/releases/download/$version/$dsyms_asset"
+readonly dsyms_zip="dsyms.zip"
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "${script_dir%/*}"
+actual_dir=$(pwd)
+
+rm -rf "$actual_dir/.tmp" && mkdir "$actual_dir/.tmp"
+curl -fsSL -o "$actual_dir/.tmp/$ipa" -C - "$ipa_download_url"
+curl -fsSL -o "$actual_dir/.tmp/$dsyms_zip" -C - "$dsyms_download_url"
+unzip -d "$actual_dir/.tmp/dsyms" "$actual_dir/.tmp/$dsyms_zip"
+
+src/main.sh "$actual_dir/.tmp/$ipa" "$actual_dir/.tmp/dsyms"
diff --git a/e2e/cromite-android.sh b/e2e/cromite-android.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Copyright 2024 Dotanuki Labs
+# SPDX-License-Identifier: MIT
+
+set -euo pipefail
+
+readonly repo="uazo/cromite"
+readonly version="v129.0.6668.59-bbcb812cffa4e2815760cd7fc3e34b00b4e39ea1"
+
+readonly apk_asset="arm64_ChromePublic.apk"
+readonly apk_download_url="https://github.com/$repo/releases/download/$version/$apk_asset"
+readonly apk="cromite-android.apk"
+
+readonly mappings_asset="arm64_ChromePublic.apk.mapping"
+readonly mappings_download_url="https://github.com/$repo/releases/download/$version/$mappings_asset"
+readonly mappings="mappings.txt"
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "${script_dir%/*}"
+actual_dir=$(pwd)
+
+rm -rf "$actual_dir/.tmp" && mkdir "$actual_dir/.tmp"
+curl -fsSL -o "$actual_dir/.tmp/$apk" -C - "$apk_download_url"
+curl -fsSL -o "$actual_dir/.tmp/$mappings" -C - "$mappings_download_url"
+
+src/main.sh "$actual_dir/.tmp/$apk" "$actual_dir/.tmp/$mappings"
diff --git a/src/main.sh b/src/main.sh
@@ -43,39 +43,31 @@ install_guardsquare_cli() {
 }
 
 execute_android_scan() {
-    local scan_id
-
     if [[ -z "$extras" ]]; then
         echo "Scanning standalone archive : $archive"
         install_guardsquare_cli
-        scan_id=$("$guardsquare" scan "$archive" --commit-hash "$GITHUB_SHA" --format "{{.ID}}")
+        "$guardsquare" scan "$archive" --commit-hash "$GITHUB_SHA"
     else
         require_r8_or_proguard_mappings
         echo "Scanning archive     : $archive"
         echo "R8/Proguard mappings  : $extras"
         install_guardsquare_cli
-        scan_id=$("$guardsquare" scan "$archive" --mapping-file "$extras" --commit-hash "$GITHUB_SHA" --format "{{.ID}}")
+        "$guardsquare" scan "$archive" --mapping-file "$extras" --commit-hash "$GITHUB_SHA"
     fi
-
-    "$guardsquare" scan summary --wait-for static "$scan_id" --format json | jq
 }
 
 execute_ios_scan() {
-    local scan_id
-
     if [[ -z "$extras" ]]; then
         echo "Scanning standalone archive : $archive"
         install_guardsquare_cli
-        scan_id=$("$guardsquare" scan "$archive" --commit-hash "$GITHUB_SHA" --format "{{.ID}}")
+        "$guardsquare" scan "$archive" --commit-hash "$GITHUB_SHA"
     else
         require_dsyms_folder
         echo "Scanning archive : $archive"
-        echo "dsyms location    : $extras"
+        echo "dsyms location : $extras"
         install_guardsquare_cli
-        scan_id=$("$guardsquare" scan "$archive" --dsym "$extras" --commit-hash "$GITHUB_SHA" --format "{{.ID}}")
+        "$guardsquare" scan "$archive" --dsym "$extras" --commit-hash "$GITHUB_SHA"
     fi
-
-    "$guardsquare" scan summary --wait-for static "$scan_id" --format json | jq
 }
 
 require_archive
@@ -93,7 +85,7 @@ case "$archive" in
     echo "Supported archives :"
     echo
     echo "- Android : .aab, .apk"
-    echo "- iOS : .ipa, .xcarchive"
+    echo "- iOS     : .ipa, .xcarchive"
     echo
     exit 1
     ;;