Small refactoring of shouldBypassToolcache

github · Nov 24, 2022 · 102e01d · 102e01d
1 parent eb19ecb
commit 102e01d
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 40 deletions.
diff --git a/lib/config-utils.js b/lib/config-utils.js
diff --git a/lib/config-utils.js.map b/lib/config-utils.js.map
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/src/config-utils.ts b/src/config-utils.ts
@@ -973,7 +973,7 @@ export async function getRawLanguages(
   } else {
     autodetected = true;
 
-    // Obtain languages as all languages in the repo that can be analysed
+    // Obtain all languages in the repo that can be analysed
     rawLanguages = (await getLanguagesInRepo(repository, logger)) as string[];
   }
   return { rawLanguages, autodetected };

diff --git a/src/util.ts b/src/util.ts
@@ -861,30 +861,33 @@ export async function shouldBypassToolcache(
     return true;
   }
 
-  let bypass = false;
   // Check if the toolcache is disabled for kotlin and swift.
   if (
-    await featuresEnablement.getValue(Feature.BypassToolcacheKotlinSwiftEnabled)
+    !(await featuresEnablement.getValue(
+      Feature.BypassToolcacheKotlinSwiftEnabled
+    ))
   ) {
-    // Now check to see if kotlin or swift is one of the languages being analyzed.
-    const { rawLanguages, autodetected } = await getRawLanguages(
-      languagesInput,
-      repository,
-      logger
+    return false;
+  }
+
+  // Now check to see if kotlin or swift is one of the languages being analyzed.
+  const { rawLanguages, autodetected } = await getRawLanguages(
+    languagesInput,
+    repository,
+    logger
+  );
+  let bypass = rawLanguages.some((lang) => KOTLIN_SWIFT_BYPASS.includes(lang));
+  if (bypass) {
+    logger.info(
+      `Bypassing toolcache for kotlin or swift. Languages: ${rawLanguages}`
     );
-    bypass = rawLanguages.some((lang) => KOTLIN_SWIFT_BYPASS.includes(lang));
-    if (bypass) {
-      logger.info(
-        `Bypassing toolcache for kotlin or swift. Languages: ${rawLanguages}`
-      );
-    } else if (!autodetected && rawLanguages.includes(Language.java)) {
-      // special case: java was explicitly specified, but there might be
-      // some kotlin in the repository, so we need to make a request for that.
-      const langsInRepo = await getLanguagesInRepo(repository, logger);
-      if (langsInRepo.includes("kotlin")) {
-        logger.info(`Bypassing toolcache for kotlin.`);
-        bypass = true;
-      }
+  } else if (!autodetected && rawLanguages.includes(Language.java)) {
+    // special case: java was explicitly specified, but there might be
+    // some kotlin in the repository, so we need to make a request for that.
+    const langsInRepo = await getLanguagesInRepo(repository, logger);
+    if (langsInRepo.includes("kotlin")) {
+      logger.info(`Bypassing toolcache for kotlin.`);
+      bypass = true;
     }
   }
   return bypass;