Skip to content

Fix false error msg in server config #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kerenr-jfrog merged 5 commits into from
Apr 24, 2025
Merged

Fix false error msg in server config #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68a3410
fix bug in showing error message
kerenr-jfrog Apr 23, 2025
09013a4
upgrade plugins common version
kerenr-jfrog Apr 23, 2025
ff6032b
change error msg to log in problems view during scan
kerenr-jfrog Apr 23, 2025
0c1a84b
remove the error logging in config
kerenr-jfrog Apr 23, 2025
cd0e8d1
change creation of cli driver object
kerenr-jfrog Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</repositories>

<properties>
<ide-plugins-common-version>2.4.3</ide-plugins-common-version>
<ide-plugins-common-version>2.4.4</ide-plugins-common-version>
</properties>

<build>
Expand Down
4 changes: 3 additions & 1 deletion bundle/src/main/java/com/jfrog/ide/eclipse/configuration/CliDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String, String>(), HOME_PATH.toString(), Logger.getInstance());
try {
this.cliDriver.downloadCliIfNeeded(HOME_PATH.toString(), CLI_VERSION);
} catch (IOException e) {
Expand Down
5 changes: 2 additions & 3 deletions bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,8 @@ public boolean performOk() {
CliDriverWrapper.HOME_PATH.toFile(),
configEnv
);
if (!configResults.getErr().isBlank()) {
throw new Exception(configResults.getErr());
}

Logger.getInstance().debug(configResults.getErr());
} catch (Exception e) {
CliDriverWrapper.getInstance().showCliError("An error occurred while setting up the server connection:", e);
}
Expand Down
2 changes: 1 addition & 1 deletion bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down