From 68a3410c2a0d6ae0570cd5ccd1ceaaa825bcde33 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Wed, 23 Apr 2025 16:03:22 +0300 Subject: [PATCH 1/5] fix bug in showing error message --- .../ide/eclipse/configuration/XrayGlobalConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java index 4ae81dc..83d6f68 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java @@ -81,8 +81,9 @@ public boolean performOk() { CliDriverWrapper.HOME_PATH.toFile(), configEnv ); - if (!configResults.getErr().isBlank()) { - throw new Exception(configResults.getErr()); + // log an error in case that the config command returned output not in debug log level + if (!configResults.getErr().isBlank() && !XrayServerConfigImpl.getInstance().getIsDebugLogs()) { + Logger.getInstance().error(configResults.getErr()); } } catch (Exception e) { CliDriverWrapper.getInstance().showCliError("An error occurred while setting up the server connection:", e); From 09013a47dbcb055dfb408ca2898e9d1c65781f1d Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Wed, 23 Apr 2025 16:10:52 +0300 Subject: [PATCH 2/5] upgrade plugins common version --- bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index 11e0bdf..fd10a6f 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -27,7 +27,7 @@ - 2.4.3 + 2.4.4 From ff6032b4a899d2a61557eb411b6fdf468bf39847 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Wed, 23 Apr 2025 16:44:38 +0300 Subject: [PATCH 3/5] change error msg to log in problems view during scan --- .../src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java index 6eca61c..30b7624 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java @@ -189,7 +189,7 @@ public void run() { } catch (CancellationException ce) { log.info(ce.getMessage()); } catch (Exception e) { - CliDriverWrapper.getInstance().showCliError("An error occurred while performing audit scan", e); + log.error("An error occurred while performing audit scan", e); } finally { scanFinished(); } From 0c1a84b56b5f7b2a58552aa98b4da905767a18f1 Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Wed, 23 Apr 2025 17:34:08 +0300 Subject: [PATCH 4/5] remove the error logging in config --- .../ide/eclipse/configuration/XrayGlobalConfiguration.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java index 83d6f68..c27f347 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java @@ -81,10 +81,8 @@ public boolean performOk() { CliDriverWrapper.HOME_PATH.toFile(), configEnv ); - // log an error in case that the config command returned output not in debug log level - if (!configResults.getErr().isBlank() && !XrayServerConfigImpl.getInstance().getIsDebugLogs()) { - Logger.getInstance().error(configResults.getErr()); - } + + Logger.getInstance().debug(configResults.getErr()); } catch (Exception e) { CliDriverWrapper.getInstance().showCliError("An error occurred while setting up the server connection:", e); } From cd0e8d19b759ecbf4fab15264aebc8711439626b Mon Sep 17 00:00:00 2001 From: kerenr-jfrog Date: Thu, 24 Apr 2025 11:04:28 +0300 Subject: [PATCH 5/5] change creation of cli driver object --- .../com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java index 88290a5..47f33fa 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java @@ -4,6 +4,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.HashMap; + import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -30,7 +32,7 @@ private CliDriverWrapper() { showCliError("An error occurred while creating the JFrog Eclipse plugin directory:",e); } // Initialize the cliDriver and download CLI if needed - this.cliDriver = new JfrogCliDriver(null, HOME_PATH.toString(), Logger.getInstance()); + this.cliDriver = new JfrogCliDriver(new HashMap(), HOME_PATH.toString(), Logger.getInstance()); try { this.cliDriver.downloadCliIfNeeded(HOME_PATH.toString(), CLI_VERSION); } catch (IOException e) {