Skip to content

Commit 8d2f1f6

Browse files
soul2zimatesoul2zimate
committed
fix: add back exhortignore to for backward compatibility and set required TRUSTIFY_DA_BACKEND_URL before creating ExhortApi instance
1 parent 7fb9424 commit 8d2f1f6

File tree

7 files changed

+41
-9
lines changed

7 files changed

+41
-9
lines changed

‎src/main/java/org/jboss/tools/intellij/componentanalysis/CAUtil.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class CAUtil {
3333

3434
public static String PACKAGE_JSON = "package.json";
3535
public static String TRUSTIFY_DA_IGNORE = "trustify-da-ignore";
36+
public static String EXHORT_IGNORE = "exhortignore";
3637
public static String DEPENDENCIES = "dependencies";
3738

3839
public static Map<Dependency, List<PsiElement>> getDependencyListMap(PsiFile file) {
@@ -77,7 +78,9 @@ private static Set<String> getIgnoredDependencies(PsiFile file) {
7778
Set<String> ignored = Arrays.stream(file.getChildren())
7879
.filter(e -> e instanceof JsonObject)
7980
.flatMap(e -> Arrays.stream(e.getChildren()))
80-
.filter(e -> e instanceof JsonProperty && TRUSTIFY_DA_IGNORE.equals(((JsonProperty) e).getName()))
81+
.filter(e -> e instanceof JsonProperty &&
82+
(TRUSTIFY_DA_IGNORE.equals(((JsonProperty) e).getName()) ||
83+
EXHORT_IGNORE.equals(((JsonProperty) e).getName())))
8184
.flatMap(e -> Arrays.stream(e.getChildren()))
8285
.filter(e -> e instanceof JsonArray)
8386
.flatMap(e -> Arrays.stream(e.getChildren()))

‎src/main/java/org/jboss/tools/intellij/componentanalysis/golang/GoCAAnnotator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.regex.Pattern;
3030

3131
import static org.jboss.tools.intellij.componentanalysis.CAUtil.TRUSTIFY_DA_IGNORE;
32+
import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
3233

3334
public class GoCAAnnotator extends CAAnnotator {
3435
public static final Pattern REQUIRE_PATTERN = Pattern.compile("^\\s*([a-zA-Z0-9._/-]+)\\s+(v?[0-9]+(?:\\.[0-9]+)*[0-9a-zA-Z\\-+._]*)(?:\\s*//.*)?$");
@@ -70,8 +71,8 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
7071
continue;
7172
}
7273

73-
// Skip if line contains trustify-da-ignore
74-
if (line.contains(TRUSTIFY_DA_IGNORE)) {
74+
// Skip if line contains trustify-da-ignore or exhortignore
75+
if (line.contains(TRUSTIFY_DA_IGNORE) || line.contains(EXHORT_IGNORE)) {
7576
continue;
7677
}
7778

‎src/main/java/org/jboss/tools/intellij/componentanalysis/gradle/GradleCAAnnotator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.Objects;
3131

3232
import static org.jboss.tools.intellij.componentanalysis.CAUtil.TRUSTIFY_DA_IGNORE;
33+
import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
3334

3435
public class GradleCAAnnotator extends CAAnnotator {
3536

@@ -44,7 +45,9 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
4445
Map<Dependency, List<PsiElement>> resultMap = new HashMap<>();
4546
Arrays.stream(file.getChildren())
4647
.filter(e -> e instanceof Artifact)
47-
.filter(artifact -> ((Artifact)artifact).getComment() == null || Objects.nonNull(((Artifact)artifact).getComment()) && !((Artifact)artifact).getComment().getText().contains(TRUSTIFY_DA_IGNORE))
48+
.filter(artifact -> ((Artifact)artifact).getComment() == null || Objects.nonNull(((Artifact)artifact).getComment()) &&
49+
!((Artifact)artifact).getComment().getText().contains(TRUSTIFY_DA_IGNORE) &&
50+
!((Artifact)artifact).getComment().getText().contains(EXHORT_IGNORE))
4851
.map(dep -> (Artifact)dep)
4952
.forEach( dep -> {
5053
Dependency dependency = new Dependency("maven", dep.getGroup().getText().replace("\"","") , dep.getArtifactId().getText(),dep.getVersion().getText());

‎src/main/java/org/jboss/tools/intellij/componentanalysis/maven/MavenCAAnnotator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
import static org.jboss.tools.intellij.componentanalysis.CAUtil.DEPENDENCIES;
3737
import static org.jboss.tools.intellij.componentanalysis.CAUtil.TRUSTIFY_DA_IGNORE;
38+
import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
3839

3940
public class MavenCAAnnotator extends CAAnnotator {
4041

@@ -58,7 +59,8 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
5859
.filter(e -> e instanceof XmlTag && "dependency".equals(((XmlTag) e).getName()))
5960
.filter(e -> Arrays.stream(e.getChildren())
6061
.noneMatch(c -> c instanceof XmlComment
61-
&& TRUSTIFY_DA_IGNORE.equals(((XmlComment) c).getCommentText().trim())))
62+
&& (TRUSTIFY_DA_IGNORE.equals(((XmlComment) c).getCommentText().trim()) ||
63+
EXHORT_IGNORE.equals(((XmlComment) c).getCommentText().trim()))))
6264
.map(e -> (XmlTag) e)
6365
.forEach(d -> {
6466
List<XmlTag> elements = Arrays.stream(d.getChildren())

‎src/main/java/org/jboss/tools/intellij/componentanalysis/pypi/PipCAAnnotator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.Map;
3131

3232
import static org.jboss.tools.intellij.componentanalysis.CAUtil.TRUSTIFY_DA_IGNORE;
33+
import static org.jboss.tools.intellij.componentanalysis.CAUtil.EXHORT_IGNORE;
3334

3435
public class PipCAAnnotator extends CAAnnotator {
3536
@Override
@@ -50,7 +51,9 @@ protected Map<Dependency, List<PsiElement>> getDependencies(PsiFile file) {
5051
.noneMatch(c -> {
5152
String comment = c.getText().trim();
5253
if (!comment.isEmpty() && '#' == comment.charAt(0)) {
53-
return TRUSTIFY_DA_IGNORE.equals(comment.substring(1).trim());
54+
String commentContent = comment.substring(1).trim();
55+
return TRUSTIFY_DA_IGNORE.equals(commentContent) ||
56+
EXHORT_IGNORE.equals(commentContent);
5457
}
5558
return false;
5659
}))

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
public final class ApiService {
3939

4040
private static final Logger LOG = Logger.getInstance(ApiService.class);
41+
private static final String TRUSTIFY_DA_BACKEND_URL_PROPERTY = "TRUSTIFY_DA_BACKEND_URL";
42+
private static final String RHDA_BACKEND_URL = "https://rhda.rhcloud.com";
4143

4244
enum TelemetryKeys {
4345
MANIFEST, ECOSYSTEM, PLATFORM, TRUST_DA_TOKEN;
@@ -51,7 +53,12 @@ public String toString() {
5153
private final Api exhortApi;
5254

5355
public ApiService() {
54-
this(new ExhortApi());
56+
this(createExhortApiWithBackendUrl());
57+
}
58+
59+
public static Api createExhortApiWithBackendUrl() {
60+
setBackendUrl();
61+
return new ExhortApi();
5562
}
5663

5764
ApiService(Api exhortApi) {
@@ -129,6 +136,8 @@ private void setRequestProperties(final String manifestName) {
129136
ApiSettingsState settings = ApiSettingsState.getInstance();
130137
System.setProperty("TRUST_DA_TOKEN", settings.rhdaToken);
131138

139+
setBackendUrl();
140+
132141
if (settings.mvnPath != null && !settings.mvnPath.isBlank()) {
133142
System.setProperty("TRUSTIFY_DA_MVN_PATH", settings.mvnPath);
134143
} else {
@@ -260,6 +269,14 @@ private void setRequestProperties(final String manifestName) {
260269
}
261270
}
262271

272+
public static void setBackendUrl() {
273+
String backendUrl = System.getenv(TRUSTIFY_DA_BACKEND_URL_PROPERTY);
274+
if (backendUrl == null || backendUrl.isBlank()) {
275+
backendUrl = RHDA_BACKEND_URL;
276+
}
277+
System.setProperty(TRUSTIFY_DA_BACKEND_URL_PROPERTY, backendUrl);
278+
}
279+
263280
public static Optional<String> getProxyUrl() {
264281
// This API only works in 2024.2+ versions.
265282
ProxyConfiguration proxyConfiguration = ProxySettings.getInstance().getProxyConfiguration();

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.github.guacsec.trustifyda.Api;
2222
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
2323
import io.github.guacsec.trustifyda.image.ImageRef;
24-
import io.github.guacsec.trustifyda.impl.ExhortApi;
2524
import org.jboss.tools.intellij.exhort.TelemetryService;
2625
import org.jboss.tools.intellij.settings.ApiSettingsState;
2726

@@ -37,7 +36,9 @@
3736
import java.util.function.Function;
3837
import java.util.stream.Collectors;
3938

39+
import static org.jboss.tools.intellij.exhort.ApiService.createExhortApiWithBackendUrl;
4040
import static org.jboss.tools.intellij.exhort.ApiService.getProxyUrl;
41+
import static org.jboss.tools.intellij.exhort.ApiService.setBackendUrl;
4142

4243
@Service(Service.Level.APP)
4344
public final class ApiService {
@@ -47,7 +48,7 @@ public final class ApiService {
4748
private final Api exhortApi;
4849

4950
public ApiService() {
50-
this.exhortApi = new ExhortApi();
51+
this.exhortApi = createExhortApiWithBackendUrl();
5152
}
5253

5354
static ApiService getInstance() {
@@ -125,6 +126,8 @@ private void setServiceEnvironment() {
125126
var settings = ApiSettingsState.getInstance();
126127
System.setProperty("TRUST_DA_TOKEN", settings.rhdaToken);
127128

129+
setBackendUrl();
130+
128131
if (settings.syftPath != null && !settings.syftPath.isBlank()) {
129132
System.setProperty("TRUSTIFY_DA_SYFT_PATH", settings.syftPath);
130133
} else {

0 commit comments

Comments
 (0)