From 2595437409039a7f156f41d107a9accbc62dfd1d Mon Sep 17 00:00:00 2001
From: Tony Le <tony.le@sentry.io>
Date: Wed, 20 Nov 2024 13:59:07 -0500
Subject: [PATCH] Adding upload coverage args in scripts

---
 dist/codecov.sh                     | 82 +++++++++++++----------------
 scripts/run.sh                      |  4 +-
 scripts/set_create_commit_args.sh   | 10 ----
 scripts/set_create_report_args.sh   | 10 ----
 scripts/set_do_upload_args.sh       | 70 ------------------------
 scripts/set_upload_coverage_args.sh | 75 ++++++++++++++++++++++++++
 6 files changed, 112 insertions(+), 139 deletions(-)
 delete mode 100755 scripts/set_create_commit_args.sh
 delete mode 100755 scripts/set_create_report_args.sh
 delete mode 100755 scripts/set_do_upload_args.sh
 create mode 100644 scripts/set_upload_coverage_args.sh

diff --git a/dist/codecov.sh b/dist/codecov.sh
index c50115f..64bddee 100755
--- a/dist/codecov.sh
+++ b/dist/codecov.sh
@@ -125,76 +125,66 @@ cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
 cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
 cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
 cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
-cc_cc_args=()
-cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
-cc_cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-cc_cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
-cc_cc_args+=( $(k_arg PR) $(v_arg PR))
-cc_cc_args+=( $(k_arg SHA) $(v_arg SHA))
-cc_cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
-cc_create_report_args=()
-cc_cr_args+=( $(k_arg CODE) $(v_arg CODE))
-cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
-cc_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-cc_cr_args+=( $(k_arg PR) $(v_arg PR))
-cc_cr_args+=( $(k_arg SHA) $(v_arg SHA))
-cc_cr_args+=( $(k_arg SLUG) $(v_arg SLUG))
-cc_du_args=()
-cc_du_args+=( $(k_arg ENV) $(v_arg ENV))
+cc_uc_args=()
+# Args for create commit
+cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
+cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
+cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
+cc_uc_args+=( $(k_arg PR) $(v_arg PR))
+cc_uc_args+=( $(k_arg SHA) $(v_arg SHA))
+cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
+# Args for create report
+cc_uc_args+=( $(k_arg CODE) $(v_arg CODE))
+# Args for do upload
+cc_uc_args+=( $(k_arg ENV) $(v_arg ENV))
 OLDIFS=$IFS;IFS=,
-cc_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
-cc_du_args+=( $(k_arg BUILD) $(v_arg BUILD))
-cc_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
-cc_du_args+=( $(k_arg CODE) $(v_arg CODE))
-cc_du_args+=( $(k_arg DIR) $(v_arg DIR))
-cc_du_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
-cc_du_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
-cc_du_args+=( $(write_truthy_args CC_DRY_RUN) )
+cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
+cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
+cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
+cc_uc_args+=( $(k_arg DIR) $(v_arg DIR))
+cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
+cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
+cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) )
 if [ -n "$CC_EXCLUDES" ];
 then
   for directory in $CC_EXCLUDES; do
-    cc_du_args+=( "--exclude" "$directory" )
+    cc_uc_args+=( "--exclude" "$directory" )
   done
 fi
-cc_du_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
 if [ -n "$CC_FILES" ];
 then
   for file in $CC_FILES; do
-    cc_du_args+=( "--file" "$file" )
+    cc_uc_args+=( "--file" "$file" )
   done
 fi
 if [ -n "$CC_FLAGS" ];
 then
   for flag in $CC_FLAGS; do
-    cc_du_args+=( "--flag" "$flag" )
+    cc_uc_args+=( "--flag" "$flag" )
   done
 fi
-cc_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
-cc_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
-cc_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
-cc_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
-cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-cc_du_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
-cc_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
-cc_du_args+=( $(write_truthy_args CC_LEGACY) )
+cc_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
+cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
+cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
+cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
+cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
+cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
+cc_uc_args+=( $(write_truthy_args CC_LEGACY) )
 if [ -n "$CC_NAME" ];
 then
-  cc_du_args+=( "--name" "$CC_NAME" )
+  cc_uc_args+=( "--name" "$CC_NAME" )
 fi
-cc_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
-cc_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
-cc_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
+cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
+cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
+cc_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
 if [ -n "$CC_PLUGINS" ];
 then
   for plugin in $CC_PLUGINS; do
-    cc_du_args+=( "--plugin" "$plugin" )
+    cc_uc_args+=( "--plugin" "$plugin" )
   done
 fi
-cc_du_args+=( $(k_arg PR) $(v_arg PR))
-cc_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
-cc_du_args+=( $(k_arg SHA) $(v_arg SHA))
-cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
-cc_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
+cc_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
+cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
 IFS=$OLDIFS
 unset NODE_OPTIONS
 # See https://github.com/codecov/uploader/issues/475
diff --git a/scripts/run.sh b/scripts/run.sh
index 24db745..5522891 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -6,7 +6,5 @@
 . ./validate.sh
 
 . ./set_cli_args.sh
-. ./set_create_commit_args.sh
-. ./set_create_report_args.sh
-. ./set_do_upload_args.sh
+. ./set_upload_coverage_args.sh
 . ./upload.sh
diff --git a/scripts/set_create_commit_args.sh b/scripts/set_create_commit_args.sh
deleted file mode 100755
index 0430b86..0000000
--- a/scripts/set_create_commit_args.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-codecov_cc_args=()
-
-codecov_cc_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
-codecov_cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-codecov_cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
-codecov_cc_args+=( $(k_arg PR) $(v_arg PR))
-codecov_cc_args+=( $(k_arg SHA) $(v_arg SHA))
-codecov_cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
diff --git a/scripts/set_create_report_args.sh b/scripts/set_create_report_args.sh
deleted file mode 100755
index b35080c..0000000
--- a/scripts/set_create_report_args.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-codecov_create_report_args=()
-
-codecov_cr_args+=( $(k_arg CODE) $(v_arg CODE))
-codecov_cr_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
-codecov_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-codecov_cr_args+=( $(k_arg PR) $(v_arg PR))
-codecov_cr_args+=( $(k_arg SHA) $(v_arg SHA))
-codecov_cr_args+=( $(k_arg SLUG) $(v_arg SLUG))
diff --git a/scripts/set_do_upload_args.sh b/scripts/set_do_upload_args.sh
deleted file mode 100755
index ab24f8a..0000000
--- a/scripts/set_do_upload_args.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-codecov_du_args=()
-
-codecov_du_args+=( $(k_arg ENV) $(v_arg ENV))
-
-OLDIFS=$IFS;IFS=,
-
-codecov_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
-codecov_du_args+=( $(k_arg BUILD) $(v_arg BUILD))
-codecov_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
-codecov_du_args+=( $(k_arg CODE) $(v_arg CODE))
-codecov_du_args+=( $(k_arg DIR) $(v_arg DIR))
-codecov_du_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
-codecov_du_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
-codecov_du_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
-
-if [ -n "$CODECOV_EXCLUDES" ];
-then
-  for directory in $CODECOV_EXCLUDES; do
-    codecov_du_args+=( "--exclude" "$directory" )
-  done
-fi
-
-codecov_du_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
-
-if [ -n "$CODECOV_FILES" ];
-then
-  for file in $CODECOV_FILES; do
-    codecov_du_args+=( "--file" "$file" )
-  done
-fi
-
-if [ -n "$CODECOV_FLAGS" ];
-then
-  for flag in $CODECOV_FLAGS; do
-    codecov_du_args+=( "--flag" "$flag" )
-  done
-fi
-
-codecov_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
-codecov_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
-codecov_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
-codecov_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
-codecov_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-codecov_du_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
-codecov_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
-codecov_du_args+=( $(write_truthy_args CODECOV_LEGACY) )
-if [ -n "$CODECOV_NAME" ];
-then
-  codecov_du_args+=( "--name" "$CODECOV_NAME" )
-fi
-codecov_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
-codecov_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
-codecov_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
-
-if [ -n "$CODECOV_PLUGINS" ];
-then
-  for plugin in $CODECOV_PLUGINS; do
-    codecov_du_args+=( "--plugin" "$plugin" )
-  done
-fi
-
-codecov_du_args+=( $(k_arg PR) $(v_arg PR))
-codecov_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
-codecov_du_args+=( $(k_arg SHA) $(v_arg SHA))
-codecov_du_args+=( $(k_arg SLUG) $(v_arg SLUG))
-codecov_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
-
-IFS=$OLDIFS
diff --git a/scripts/set_upload_coverage_args.sh b/scripts/set_upload_coverage_args.sh
new file mode 100644
index 0000000..510fdbd
--- /dev/null
+++ b/scripts/set_upload_coverage_args.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+codecov_uc_args=()
+
+# Args for create commit
+codecov_uc_args+=( $(write_truthy_args CODECOV_FAIL_ON_ERROR) )
+codecov_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
+codecov_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
+codecov_uc_args+=( $(k_arg PR) $(v_arg PR))
+codecov_uc_args+=( $(k_arg SHA) $(v_arg SHA))
+codecov_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
+
+# Args for create report
+codecov_uc_args+=( $(k_arg CODE) $(v_arg CODE))
+
+# Args for do upload
+codecov_uc_args+=( $(k_arg ENV) $(v_arg ENV))
+
+OLDIFS=$IFS;IFS=,
+
+codecov_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
+codecov_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
+codecov_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
+codecov_uc_args+=( $(k_arg DIR) $(v_arg DIR))
+codecov_uc_args+=( $(write_truthy_args CODECOV_DISABLE_FILE_FIXES) )
+codecov_uc_args+=( $(write_truthy_args CODECOV_DISABLE_SEARCH) )
+codecov_uc_args+=( $(write_truthy_args CODECOV_DRY_RUN) )
+
+if [ -n "$CODECOV_EXCLUDES" ];
+then
+  for directory in $CODECOV_EXCLUDES; do
+    codecov_uc_args+=( "--exclude" "$directory" )
+  done
+fi
+
+if [ -n "$CODECOV_FILES" ];
+then
+  for file in $CODECOV_FILES; do
+    codecov_uc_args+=( "--file" "$file" )
+  done
+fi
+
+if [ -n "$CODECOV_FLAGS" ];
+then
+  for flag in $CODECOV_FLAGS; do
+    codecov_uc_args+=( "--flag" "$flag" )
+  done
+fi
+
+codecov_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
+codecov_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
+codecov_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
+codecov_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
+codecov_uc_args+=( $(write_truthy_args CODECOV_HANDLE_NO_REPORTS_FOUND) )
+codecov_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
+codecov_uc_args+=( $(write_truthy_args CODECOV_LEGACY) )
+if [ -n "$CODECOV_NAME" ];
+then
+  codecov_uc_args+=( "--name" "$CODECOV_NAME" )
+fi
+codecov_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
+codecov_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
+codecov_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
+
+if [ -n "$CODECOV_PLUGINS" ];
+then
+  for plugin in $CODECOV_PLUGINS; do
+    codecov_uc_args+=( "--plugin" "$plugin" )
+  done
+fi
+
+codecov_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
+codecov_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
+
+IFS=$OLDIFS