SCA-432 SCA CLI client error handling

2 files changed, 4 insertions, 3 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliCacheService.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliCacheService.java
index 305bc224349..24db0ddec64 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliCacheService.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sca/CliCacheService.java
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -175,8 +176,8 @@ public class CliCacheService {
         }.getType();
         return new Gson().fromJson(reader, listOfMetadata);
       }
-    } catch (Exception e) {
-      throw new IllegalStateException("Unable to load CLI metadata", e);
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
     }
   }
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/sca/CliCacheServiceTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sca/CliCacheServiceTest.java
index 9193157e213..17214a13cfc 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/sca/CliCacheServiceTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sca/CliCacheServiceTest.java
@@ -161,7 +161,7 @@ class CliCacheServiceTest {
     WsTestUtil.mockException(scannerWsClient, e);
 
     assertThatThrownBy(underTest::cacheCli).isInstanceOf(IllegalStateException.class)
-      .hasMessageContaining("Unable to load CLI metadata");
+      .hasMessageContaining("http error");
 
     verify(telemetryCache).put("scanner.sca.get.cli.success", "false");
   }