Revert "Add offline mode for exp3-gradle"

This reverts commit 1071db5.

Author: erichaagdev

build.gradle.kts

@@ -41,7 +41,6 @@ val mavenComponents by configurations.creating
 dependencies {
     argbash("argbash:argbash:2.10.0@zip")
     commonComponents(project(path = ":fetch-build-scan-data-cmdline-tool", configuration = "shadow"))
-    commonComponents(project(path = ":mock-scan-dump-to-csv-tool", configuration = "shadow"))
     mavenComponents(project(":capture-build-scan-url-maven-extension"))
     mavenComponents("com.gradle:gradle-enterprise-maven-extension:1.15.4")
     mavenComponents("com.gradle:common-custom-user-data-maven-extension:1.11.1")

components/mock-scan-dump-to-csv-tool/build.gradle.kts

@@ -154,12 +154,8 @@ execute_second_build() {
 }
 
 fetch_build_cache_metrics() {
-  if [ "${offline_mode}" == "on" ]; then
-    read_build_scan_from_scan_dump
-  else
-    read_build_scan_metadata
-    fetch_and_read_build_scan_data build_cache_metrics_only "${build_scan_urls[@]}"
-  fi
+  read_build_scan_metadata
+  fetch_and_read_build_scan_data build_cache_metrics_only "${build_scan_urls[@]}"
 }
 
 # Overrides info.sh#print_performance_metrics

components/mock-scan-dump-to-csv-tool/src/main/java/com/gradle/enterprise/Main.java

@@ -1,7 +1,31 @@
 #!/usr/bin/env bash
 
 readonly FETCH_BUILD_SCAN_DATA_JAR="${LIB_DIR}/export-api-clients/fetch-build-scan-data-cmdline-tool-${SCRIPT_VERSION}-all.jar"
-readonly MOCK_SCAN_DUMP_TO_CSV_JAR="${LIB_DIR}/export-api-clients/mock-scan-dump-to-csv-tool-${SCRIPT_VERSION}-all.jar"
+
+# Arrays used by callers to access the fetched build scan data
+project_names=()
+base_urls=()
+build_scan_urls=()
+build_scan_ids=()
+git_repos=()
+git_branches=()
+git_commit_ids=()
+requested_tasks=()
+build_outcomes=()
+# shellcheck disable=SC2034 # not all scripts use this data
+remote_build_cache_urls=()
+# shellcheck disable=SC2034 # not all scripts use this data
+remote_build_cache_shards=()
+
+# Build caching performance metrics
+avoided_up_to_date_num_tasks=()
+avoided_up_to_date_avoidance_savings=()
+avoided_from_cache_num_tasks=()
+avoided_from_cache_avoidance_savings=()
+executed_cacheable_num_tasks=()
+executed_cacheable_duration=()
+executed_not_cacheable_num_tasks=()
+executed_not_cacheable_duration=()
 
 read_build_scan_metadata() {
   # This isn't the most robust way to read a CSV,
@@ -23,10 +47,114 @@ read_build_data_from_current_dir() {
   requested_tasks+=("${tasks}")
 }
 
+fetch_build_scan_data() {
+  # OS specific support (must be 'true' or 'false').
+  cygwin=false
+  msys=false
+  case "$(uname)" in
+    CYGWIN* )
+      cygwin=true
+      ;;
+    MINGW* )
+      msys=true
+      ;;
+  esac
+
+  # Determine the Java command to use to start the JVM.
+  if [ -n "$JAVA_HOME" ] ; then
+      if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+          # IBM's JDK on AIX uses strange locations for the executables
+          JAVACMD="$JAVA_HOME/jre/sh/java"
+      else
+          JAVACMD="$JAVA_HOME/bin/java"
+      fi
+      if [ ! -x "$JAVACMD" ] ; then
+          die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+  Please set the JAVA_HOME variable in your environment to match the
+  location of your Java installation."
+      fi
+  else
+      JAVACMD="java"
+      which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+  Please set the JAVA_HOME variable in your environment to match the
+  location of your Java installation."
+  fi
+
+  # For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" ] || [ "$msys" = "true" ] ; then
+    APP_HOME=$(cygpath --path --mixed "$APP_HOME")
+    CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
+    JAVACMD=$(cygpath --unix "$JAVACMD")
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=$(echo "$arg"|grep -E -c "$OURCYGPATTERN" -)
+        CHECK2=$(echo "$arg"|grep -E -c "^-")                                 ### Determine if an option
+
+        # shellcheck disable=SC2046  # we actually want word splitting
+        # shellcheck disable=SC2116  # using echo to expand globs
+        if [ "$CHECK" -ne 0 ] && [ "$CHECK2" -eq 0 ] ; then                    ### Added a condition
+            eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
+        else
+            eval $(echo args$i)="\"$arg\""
+        fi
+        # shellcheck disable=SC2003
+        i=$(expr $i + 1)
+    done
+    # shellcheck disable=SC2154
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+  # Escape application args
+  save () {
+      for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+      echo " "
+  }
+  APP_ARGS=$(save "$@")
+
+  CLASSPATH="${FETCH_BUILD_SCAN_DATA_JAR}"
+  # Collect all arguments for the java command, following the shell quoting and substitution rules
+  eval set -- -Dpicocli.ansi=true -jar "\"$CLASSPATH\"" "$APP_ARGS"
+
+  # shellcheck disable=SC2154
+  if [[ "$_arg_debug" == "on" ]]; then
+    debug "$JAVACMD $*" 1>&2
+    print_bl 1>&2
+  fi
+
+  exec "$JAVACMD" "$@"
+}
+
 fetch_and_read_build_scan_data() {
   # This isn't the most robust way to read a CSV,
   # but we control the CSV so we don't have to worry about various CSV edge cases
-  local args build_cache_metrics_only
+  local args build_cache_metrics_only fetched_data header_row_read idx
   args=()
 
   if [[ "$_arg_debug" == "on" ]]; then
@@ -51,14 +179,49 @@ fetch_and_read_build_scan_data() {
   fi
   shift
   args+=( "$@" )
+  fetched_data="$(fetch_build_scan_data "${args[@]}")"
 
-  raw_build_scan_data="$(invoke_java "$FETCH_BUILD_SCAN_DATA_JAR" "${args[@]}")"
-  parse_raw_build_scan_data "$raw_build_scan_data" "$build_cache_metrics_only"
-}
+  debug "Raw fetched build scan data"
+  debug "---------------------------"
+  debug "${fetched_data}"
+  debug ""
+
+  header_row_read=false
+  idx=0
+
+  # shellcheck disable=SC2034 # not all scripts use all of the fetched data
+  while IFS=, read -r field_1 field_2 field_3 field_4 field_5 field_6 field_7 field_8 field_9 field_10 field_11 field_12 field_13 field_14 field_15 field_16 field_17 field_18 field_19; do
+     if [[ "$header_row_read" == "false" ]]; then
+         header_row_read=true
+         continue;
+     fi
+
+     if [[ "${build_cache_metrics_only}" != "true" ]]; then
+       project_names[idx]="$field_1"
+       base_urls[idx]="$field_2"
+       build_scan_urls[idx]="$field_3"
+       build_scan_ids[idx]="$field_4"
+       git_repos[idx]="$field_5"
+       git_branches[idx]="$field_6"
+       git_commit_ids[idx]="$field_7"
+       requested_tasks[idx]="$(remove_clean_task "${field_8}")"
+       build_outcomes[idx]="$field_9"
+       remote_build_cache_urls[idx]="${field_10}"
+       remote_build_cache_shards[idx]="${field_11}"
+     fi
+
+     # Build caching performance metrics
+     avoided_up_to_date_num_tasks[idx]="${field_12}"
+     avoided_up_to_date_avoidance_savings[idx]="${field_13}"
+     avoided_from_cache_num_tasks[idx]="${field_14}"
+     avoided_from_cache_avoidance_savings[idx]="${field_15}"
+     executed_cacheable_num_tasks[idx]="${field_16}"
+     executed_cacheable_duration[idx]="${field_17}"
+     executed_not_cacheable_num_tasks[idx]="${field_18}"
+     executed_not_cacheable_duration[idx]="${field_19}"
 
-read_build_scan_from_scan_dump() {
-  raw_build_scan_data="$(invoke_java "$MOCK_SCAN_DUMP_TO_CSV_JAR")"
-  parse_raw_build_scan_data "$raw_build_scan_data"
+     ((idx++))
+  done <<< "${fetched_data}"
 }
 
 detect_warnings_from_build_scans() {

components/scripts/gradle/03-validate-local-build-caching-different-locations.sh

@@ -3,7 +3,6 @@
 # Created by argbash-init v2.10.0
 # ARG_OPTIONAL_BOOLEAN([fail-if-not-fully-cacheable],[f],[])
 # ARG_HELP([This function is overridden later on.])
-# ARG_OPTIONAL_BOOLEAN([offline],[],[],[off])
 # ARG_VERSION([print_version],[v],[version],[])
 # ARGBASH_WRAP([common])
 # ARGBASH_SET_INDENT([  ])

components/scripts/lib/build_scan.sh

@@ -62,10 +62,6 @@ process_arguments() {
   if [ -n "${_arg_interactive+x}" ]; then
     interactive_mode="${_arg_interactive}"
   fi
-
-  if [ -n "${_arg_offline+x}" ]; then
-    offline_mode="${_arg_offline}"
-  fi
 }
 
 validate_required_config() {