Skip to content

Commit 308f681

Browse files
zvigrinbergzvigrinberg
committed
feat: add oss-index provider/source support
Signed-off-by: Zvi Grinberg <[email protected]>
1 parent a425db4 commit 308f681

File tree

4 files changed

+44
-0
lines changed

4 files changed

+44
-0
lines changed

‎src/main/java/org/jboss/tools/intellij/exhort/ApiService.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,16 @@ private void setRequestProperties(final String manifestName) {
214214
} else {
215215
System.clearProperty("EXHORT_SNYK_TOKEN");
216216
}
217+
if (settings.ossIndexUser != null && !settings.ossIndexUser.isBlank()) {
218+
System.setProperty("EXHORT_OSS_INDEX_USER", settings.ossIndexUser);
219+
} else {
220+
System.clearProperty("EXHORT_OSS_INDEX_USER");
221+
}
222+
if (settings.ossIndexToken != null && !settings.ossIndexToken.isBlank()) {
223+
System.setProperty("EXHORT_OSS_INDEX_TOKEN", settings.ossIndexToken);
224+
} else {
225+
System.clearProperty("EXHORT_OSS_INDEX_TOKEN");
226+
}
227+
217228
}
218229
}

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsComponent.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public class ApiSettingsComponent {
4949
+ "<br>Specifies if comparing the resolved package versions with the versions defined in the manifest.</html>";
5050
private final static String snykTokenLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Snyk Token</b>"
5151
+ "<br>Red Hat Dependency Analytics sever authentication token for Snyk.</html>";
52+
private final static String ossIndexUserLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Oss Index User</b>"
53+
+ "<br>Red Hat Dependency Analytics sever User for Oss Index.</html>";
54+
private final static String ossIndexTokenLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Oss Index Token</b>"
55+
+ "<br>Red Hat Dependency Analytics sever authentication token for Oss Index.</html>";
5256

5357
private final JPanel mainPanel;
5458

@@ -66,6 +70,9 @@ public class ApiSettingsComponent {
6670
private final JCheckBox pythonMatchManifestVersionsCheck;
6771
private final JBTextField snykTokenText;
6872

73+
private final JBTextField ossIndexUserText;
74+
private final JBTextField ossIndexTokenText;
75+
6976
public ApiSettingsComponent() {
7077
mvnPathText = new TextFieldWithBrowseButton();
7178
mvnPathText.addBrowseFolderListener(
@@ -141,6 +148,8 @@ public ApiSettingsComponent() {
141148
pythonMatchManifestVersionsCheck = new JCheckBox("Strictly match package version");
142149

143150
snykTokenText = new JBTextField();
151+
ossIndexUserText = new JBTextField();
152+
ossIndexTokenText = new JBTextField();
144153

145154
mainPanel = FormBuilder.createFormBuilder()
146155
.addLabeledComponent(new JBLabel(mvnPathLabel), mvnPathText, 1, true)
@@ -173,6 +182,10 @@ public ApiSettingsComponent() {
173182
.addVerticalGap(10)
174183
.addLabeledComponent(new JBLabel(snykTokenLabel), snykTokenText, 1, true)
175184
.addComponentFillVertically(new JPanel(), 0)
185+
.addVerticalGap(10)
186+
.addLabeledComponent(new JBLabel(ossIndexUserLabel), ossIndexUserText, 1, true)
187+
.addVerticalGap(10)
188+
.addLabeledComponent(new JBLabel(ossIndexTokenLabel), ossIndexTokenText, 1, true)
176189
.getPanel();
177190
}
178191

@@ -292,7 +305,18 @@ public String getSnykTokenText() {
292305
return snykTokenText.getText();
293306
}
294307

308+
public String getOssIndexTokenText() {
309+
return ossIndexTokenText.getText();
310+
}
311+
public String getOssIndexUserText() {
312+
return ossIndexUserText.getText();
313+
}
314+
295315
public void setSnykTokenText(@NotNull String text) {
296316
snykTokenText.setText(text);
297317
}
318+
public void setOssIndexTokenText(@NotNull String text) {
319+
ossIndexTokenText.setText(text);
320+
}
321+
298322
}

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsConfigurable.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public boolean isModified() {
5252
modified |= settingsComponent.getPythonInstallBestEffortsCheck() != settings.pythonInstallBestEfforts;
5353
modified |= settingsComponent.getPythonMatchManifestVersionsCheck() != settings.pythonMatchManifestVersions;
5454
modified |= !settingsComponent.getSnykTokenText().equals(settings.snykToken);
55+
modified |= !settingsComponent.getOssIndexTokenText().equals(settings.ossIndexToken);
56+
modified |= !settingsComponent.getOssIndexUserText().equals(settings.ossIndexUser);
57+
5558
return modified;
5659
}
5760

@@ -71,6 +74,8 @@ public void apply() {
7174
settings.pythonInstallBestEfforts = settingsComponent.getPythonInstallBestEffortsCheck();
7275
settings.pythonMatchManifestVersions = settingsComponent.getPythonMatchManifestVersionsCheck();
7376
settings.snykToken = settingsComponent.getSnykTokenText();
77+
settings.ossIndexToken = settingsComponent.getOssIndexTokenText();
78+
settings.ossIndexUser = settingsComponent.getOssIndexUserText();
7479
}
7580

7681
@Override
@@ -89,6 +94,7 @@ public void reset() {
8994
settingsComponent.setPythonInstallBestEffortsCheck(settings.pythonInstallBestEfforts);
9095
settingsComponent.setPythonMatchManifestVersionsCheck(settings.pythonMatchManifestVersions);
9196
settingsComponent.setSnykTokenText(settings.snykToken != null ? settings.snykToken : "");
97+
settingsComponent.setOssIndexTokenText(settings.ossIndexToken != null ? settings.ossIndexToken : "");
9298
}
9399

94100
@Override

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsState.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public static ApiSettingsState getInstance() {
5353

5454
public String snykToken;
5555

56+
public String ossIndexUser;
57+
public String ossIndexToken;
58+
5659
@Override
5760
public @Nullable ApiSettingsState getState() {
5861
return this;

0 commit comments

Comments
 (0)