Skip to content

Commit d7b02f2

Browse files
soul2zimatesoul2zimate
committed
chore: update to trustify-da-api-spec and v5 endpoint
1 parent e862de8 commit d7b02f2

8 files changed

Lines changed: 32 additions & 31 deletions

File tree

‎pom.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<maven.compiler.release>17</maven.compiler.release>
2020
<!-- Dependencies -->
21-
<exhort-api.version>1.0.6</exhort-api.version>
21+
<trustify-da-api-model.version>2.0.1</trustify-da-api-model.version>
2222
<jackson.version>2.19.2</jackson.version>
2323
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
2424
<jakarta.mail.version>2.0.4</jakarta.mail.version>
2525
<cyclonedx.version>10.2.1</cyclonedx.version>
26+
<tomlj.version>1.1.1</tomlj.version>
2627
<!-- Testing Dependencies -->
2728
<assertj.version>3.27.3</assertj.version>
2829
<junit-jupiter.version>5.10.5</junit-jupiter.version>
@@ -106,14 +107,14 @@
106107
<dependencies>
107108
<!-- Dependencies -->
108109
<dependency>
109-
<groupId>com.redhat.ecosystemappeng</groupId>
110-
<artifactId>exhort-api-spec</artifactId>
111-
<version>${exhort-api.version}</version>
110+
<groupId>io.github.guacsec</groupId>
111+
<artifactId>trustify-da-api-model</artifactId>
112+
<version>${trustify-da-api-model.version}</version>
112113
</dependency>
113114
<dependency>
114115
<groupId>org.tomlj</groupId>
115116
<artifactId>tomlj</artifactId>
116-
<version>1.1.1</version>
117+
<version>${tomlj.version}</version>
117118
</dependency>
118119
<dependency>
119120
<groupId>com.fasterxml.jackson.core</groupId>
@@ -187,8 +188,8 @@
187188
<dependencies>
188189
<!-- Dependencies -->
189190
<dependency>
190-
<groupId>com.redhat.ecosystemappeng</groupId>
191-
<artifactId>exhort-api-spec</artifactId>
191+
<groupId>io.github.guacsec</groupId>
192+
<artifactId>trustify-da-api-model</artifactId>
192193
</dependency>
193194
<dependency>
194195
<groupId>org.tomlj</groupId>
@@ -404,8 +405,8 @@ limitations under the License.]]>
404405
<version>${jacoco-maven-plugin.version}</version>
405406
<configuration>
406407
<excludes>
407-
<exclude>com/redhat/exhort/api/*</exclude>
408-
<exclude>com/redhat/exhort/api/serialization/*</exclude>
408+
<exclude>io/github/guacsec/trustifyda/api/*</exclude>
409+
<exclude>io/github/guacsec/trustifyda/api/serialization/*</exclude>
409410
<exclude>io/github/guacsec/trustifyda/exception/*</exclude>
410411
<!-- This one excluding ExhortApi implementation calss from coverage report as it's not tested by surefire plugin, but with junit-platform-maven-plugin -->
411412
<exclude>io/github/guacsec/trustifyda/impl/*</exclude>

‎src/main/java/io/github/guacsec/trustifyda/Api.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.github.guacsec.trustifyda;
1717

18-
import com.redhat.exhort.api.v4.AnalysisReport;
18+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
1919
import io.github.guacsec.trustifyda.image.ImageRef;
2020
import java.io.IOException;
2121
import java.util.Arrays;

‎src/main/java/io/github/guacsec/trustifyda/cli/App.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import com.fasterxml.jackson.annotation.JsonInclude;
2323
import com.fasterxml.jackson.core.JsonProcessingException;
2424
import com.fasterxml.jackson.databind.ObjectMapper;
25-
import com.redhat.exhort.api.v4.AnalysisReport;
26-
import com.redhat.exhort.api.v4.ProviderReport;
27-
import com.redhat.exhort.api.v4.SourceSummary;
2825
import io.github.guacsec.trustifyda.Api;
26+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
27+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
28+
import io.github.guacsec.trustifyda.api.v5.SourceSummary;
2929
import io.github.guacsec.trustifyda.impl.ExhortApi;
3030
import java.io.IOException;
3131
import java.nio.file.Files;

‎src/main/java/io/github/guacsec/trustifyda/impl/ExhortApi.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import com.fasterxml.jackson.databind.ObjectMapper;
2222
import com.github.packageurl.MalformedPackageURLException;
2323
import com.github.packageurl.PackageURL;
24-
import com.redhat.exhort.api.v4.AnalysisReport;
2524
import io.github.guacsec.trustifyda.Api;
2625
import io.github.guacsec.trustifyda.Provider;
26+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
2727
import io.github.guacsec.trustifyda.image.ImageRef;
2828
import io.github.guacsec.trustifyda.image.ImageUtils;
2929
import io.github.guacsec.trustifyda.logging.LoggersFactory;
@@ -378,7 +378,7 @@ public CompletableFuture<AnalysisReport> componentAnalysis(
378378
String exClientTraceId = commonHookBeginning(false);
379379
var manifestPath = Path.of(manifest);
380380
var provider = Ecosystem.getProvider(manifestPath);
381-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
381+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
382382
var content = provider.provideComponent();
383383
commonHookAfterProviderCreatedSbomAndBeforeExhort();
384384
return getAnalysisReportForComponent(uri, content, exClientTraceId);
@@ -422,7 +422,7 @@ public CompletableFuture<AnalysisReport> componentAnalysis(String manifestFile)
422422
String exClientTraceId = commonHookBeginning(false);
423423
var manifestPath = Path.of(manifestFile);
424424
var provider = Ecosystem.getProvider(manifestPath);
425-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
425+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
426426
var content = provider.provideComponent();
427427
commonHookAfterProviderCreatedSbomAndBeforeExhort();
428428
return getAnalysisReportForComponent(uri, content, exClientTraceId);
@@ -463,7 +463,7 @@ private HttpRequest buildStackRequest(final String manifestFile, final MediaType
463463
throws IOException {
464464
var manifestPath = Path.of(manifestFile);
465465
var provider = Ecosystem.getProvider(manifestPath);
466-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
466+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
467467
var content = provider.provideStack();
468468
commonHookAfterProviderCreatedSbomAndBeforeExhort();
469469

@@ -542,7 +542,7 @@ <H, T> CompletableFuture<T> performBatchAnalysis(
542542
final String analysisName)
543543
throws IOException {
544544
String exClientTraceId = commonHookBeginning(false);
545-
var uri = URI.create(String.format("%s/api/v4/batch-analysis", this.endpoint));
545+
var uri = URI.create(String.format("%s/api/v5/batch-analysis", this.endpoint));
546546
var sboms = sbomsGenerator.get();
547547
var content =
548548
new Provider.Content(

‎src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
requires jakarta.annotation;
77
requires java.xml;
88
requires jakarta.mail;
9-
requires transitive exhort.api;
9+
requires transitive trustifyda.api;
1010
requires cyclonedx.core.java;
1111
requires transitive packageurl.java;
1212
requires transitive java.logging;

‎src/test/java/io/github/guacsec/trustifyda/cli/AppTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import static org.mockito.Mockito.mockStatic;
2828
import static org.mockito.Mockito.when;
2929

30-
import com.redhat.exhort.api.v4.AnalysisReport;
31-
import com.redhat.exhort.api.v4.ProviderReport;
32-
import com.redhat.exhort.api.v4.ProviderStatus;
33-
import com.redhat.exhort.api.v4.Scanned;
34-
import com.redhat.exhort.api.v4.Source;
35-
import com.redhat.exhort.api.v4.SourceSummary;
3630
import io.github.guacsec.trustifyda.ExhortTest;
31+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
32+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
33+
import io.github.guacsec.trustifyda.api.v5.ProviderStatus;
34+
import io.github.guacsec.trustifyda.api.v5.Scanned;
35+
import io.github.guacsec.trustifyda.api.v5.Source;
36+
import io.github.guacsec.trustifyda.api.v5.SourceSummary;
3737
import io.github.guacsec.trustifyda.impl.ExhortApi;
3838
import java.io.IOException;
3939
import java.lang.reflect.Method;

‎src/test/java/io/github/guacsec/trustifyda/impl/ExhortApiIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import static org.mockito.ArgumentMatchers.isNull;
3030
import static org.mockito.Mockito.mockStatic;
3131

32-
import com.redhat.exhort.api.v4.AnalysisReport;
33-
import com.redhat.exhort.api.v4.ProviderReport;
3432
import io.github.guacsec.trustifyda.Api;
3533
import io.github.guacsec.trustifyda.ExhortTest;
34+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
35+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
3636
import io.github.guacsec.trustifyda.image.ImageRef;
3737
import io.github.guacsec.trustifyda.providers.HelperExtension;
3838
import io.github.guacsec.trustifyda.providers.JavaScriptNpmProvider;

‎src/test/java/io/github/guacsec/trustifyda/impl/Exhort_Api_Test.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
import com.fasterxml.jackson.databind.node.TextNode;
3939
import com.github.packageurl.MalformedPackageURLException;
4040
import com.github.packageurl.PackageURL;
41-
import com.redhat.exhort.api.v4.AnalysisReport;
4241
import io.github.guacsec.trustifyda.Api;
4342
import io.github.guacsec.trustifyda.ExhortTest;
4443
import io.github.guacsec.trustifyda.Provider;
44+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
4545
import io.github.guacsec.trustifyda.image.ImageRef;
4646
import io.github.guacsec.trustifyda.tools.Ecosystem;
4747
import io.github.guacsec.trustifyda.tools.Operations;
@@ -505,7 +505,7 @@ void test_image_analysis()
505505
.equals(
506506
URI.create(
507507
String.format(
508-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
508+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
509509
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
510510
&& r.headers()
511511
.firstValue("Accept")
@@ -611,7 +611,7 @@ void imageAnalysisHtml() throws IOException, ExecutionException, InterruptedExce
611611
.equals(
612612
URI.create(
613613
String.format(
614-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
614+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
615615
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
616616
&& r.headers()
617617
.firstValue("Accept")
@@ -656,7 +656,7 @@ void test_perform_batch_analysis()
656656
.equals(
657657
URI.create(
658658
String.format(
659-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
659+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
660660
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
661661
&& r.headers()
662662
.firstValue("Accept")

0 commit comments

Comments
 (0)