Use archive_reader_url function instead of two

Author: arcusfelis

Diff for: tools/circle-publish-github-comment.sh

@@ -72,7 +72,7 @@ function rewrite_log_links_to_s3
     local CT_REPORT=big_tests/ct_report
     local CT_REPORT_ABS=$(./tools/abs_dirpath.sh "$CT_REPORT")
     local CT_REPORTS=$(ct_reports_dir)
-    local BIG_TESTS_URL="$(zip_reader_big_url ${CT_REPORTS})"
+    local BIG_TESTS_URL="$(archive_reader_url big ${CT_REPORTS})"
     cp /tmp/ct_markdown /tmp/ct_markdown_original
     replace_string "$CT_REPORT_ABS" "$BIG_TESTS_URL" /tmp/ct_markdown
     # URL escape for s3_reports.html script
@@ -97,15 +97,15 @@ function small_suite_path
 function ct_run_url
 {
     local CT_REPORTS=$(ct_reports_dir)
-    local BIG_TESTS_URL="$(zip_reader_big_url ${CT_REPORTS})"
+    local BIG_TESTS_URL="$(archive_reader_url big ${CT_REPORTS})"
     local RUN_PART=$(echo "$(last_ct_run_name)" | sed "s/@/%40/g")
     echo "$BIG_TESTS_URL/$RUN_PART/index.html"
 }
 
 function ct_small_url
 {
     local CT_REPORTS=$(ct_reports_dir)
-    local SMALL_TESTS_URL="$(zip_reader_small_url ${CT_REPORTS})"
+    local SMALL_TESTS_URL="$(archive_reader_url small ${CT_REPORTS})"
     local SUFFIX=$(small_suite_path)
     echo "$SMALL_TESTS_URL/$SUFFIX"
 }

Diff for: tools/helpers.sh

@@ -59,12 +59,8 @@ direct_s3_url() {
   echo "https://circleci-mim-results.s3.eu-central-1.amazonaws.com/${CT_REPORTS}"
 }
 
-zip_reader_big_url() {
-  local CT_REPORTS=${1:-}
-  echo "https://esl.github.io/html-zip-reader/${CT_REPORTS}/big.tar.gz/"
-}
-
-zip_reader_small_url() {
-  local CT_REPORTS=${1:-}
-  echo "https://esl.github.io/html-zip-reader/${CT_REPORTS}/small.tar.gz/"
+archive_reader_url() {
+  local TEST_TYPE=$1
+  local CT_REPORTS=${2:-}
+  echo "https://esl.github.io/html-zip-reader/${CT_REPORTS}/${TEST_TYPE}.tar.gz/"
 }

Diff for: tools/publish-github-comment.sh

@@ -70,7 +70,7 @@ function rewrite_log_links_to_s3
     local CT_REPORT=big_tests/ct_report
     local CT_REPORT_ABS=$(./tools/abs_dirpath.sh "$CT_REPORT")
     local CT_REPORTS=$(ct_reports_dir)
-    local BIG_TESTS_URL="$(zip_reader_big_url ${CT_REPORTS})"
+    local BIG_TESTS_URL="$(archive_reader_url big ${CT_REPORTS})"
     cp /tmp/ct_markdown /tmp/ct_markdown_original
     replace_string "$CT_REPORT_ABS" "$BIG_TESTS_URL" /tmp/ct_markdown
     # URL escape for s3_reports.html script
@@ -95,15 +95,15 @@ function small_suite_path
 function ct_run_url
 {
     local CT_REPORTS=$(ct_reports_dir)
-    local BIG_TESTS_URL="$(zip_reader_big_url ${CT_REPORTS})"
+    local BIG_TESTS_URL="$(archive_reader_url big ${CT_REPORTS})"
     local RUN_PART=$(echo "$(last_ct_run_name)" | sed "s/@/%40/g")
     echo "$BIG_TESTS_URL/$RUN_PART/index.html"
 }
 
 function ct_small_url
 {
     local CT_REPORTS=$(ct_reports_dir)
-    local SMALL_TESTS_URL="$(zip_reader_small_url ${CT_REPORTS})"
+    local SMALL_TESTS_URL="$(archive_reader_url small ${CT_REPORTS})"
     local SUFFIX=$(small_suite_path)
     echo "$SMALL_TESTS_URL/$SUFFIX"
 }