Consistently check for network settings file and mapping file

Author: jthurne

components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/model/CustomValueNames.java

@@ -12,15 +12,18 @@ public class CustomValueNames {
     );
 
     public static CustomValueNames loadFromFile(Path customValueMappingFile) throws IOException {
-        try (BufferedReader in = Files.newBufferedReader(customValueMappingFile)) {
-            Properties mappingProps = new Properties();
-            mappingProps.load(in);
-            return new CustomValueNames(
-                mappingProps.getProperty("git.repository", DEFAULT.getGitRepositoryKey()),
-                mappingProps.getProperty("git.branch", DEFAULT.getGitBranchKey()),
-                mappingProps.getProperty("git.commitId", DEFAULT.getGitCommitIdKey())
-            );
+        if (Files.isRegularFile(customValueMappingFile)) {
+            try (BufferedReader in = Files.newBufferedReader(customValueMappingFile)) {
+                Properties mappingProps = new Properties();
+                mappingProps.load(in);
+                return new CustomValueNames(
+                    mappingProps.getProperty("git.repository", DEFAULT.getGitRepositoryKey()),
+                    mappingProps.getProperty("git.branch", DEFAULT.getGitBranchKey()),
+                    mappingProps.getProperty("git.commitId", DEFAULT.getGitCommitIdKey())
+                );
+            }
         }
+        return CustomValueNames.DEFAULT;
     }
 
     private final String gitRepositoryKey;

components/scripts/lib/build_scan.sh

@@ -166,7 +166,9 @@ fetch_and_read_build_scan_data() {
     args+=("--mapping-file" "${mapping_file}")
   fi
 
-  args+=("--network-settings-file" "${SCRIPT_DIR}/network.settings")
+  if [ -f "${SCRIPT_DIR}/network.settings" ]; then
+    args+=("--network-settings-file" "${SCRIPT_DIR}/network.settings")
+  fi
 
   if [[ "$1" == "build_cache_metrics_only" ]]; then
     build_cache_metrics_only="true"