Skip to content

Commit e619136

Browse files
soul2zimatesoul2zimate
committed
chore: update to trustify-da-api-spec and v5 endpoint
1 parent 02b77a7 commit e619136

File tree

8 files changed

+32
-31
lines changed

8 files changed

+32
-31
lines changed

‎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>
@@ -405,8 +406,8 @@ limitations under the License.]]>
405406
<version>${jacoco-maven-plugin.version}</version>
406407
<configuration>
407408
<excludes>
408-
<exclude>com/redhat/exhort/api/*</exclude>
409-
<exclude>com/redhat/exhort/api/serialization/*</exclude>
409+
<exclude>io/github/guacsec/trustifyda/api/*</exclude>
410+
<exclude>io/github/guacsec/trustifyda/api/serialization/*</exclude>
410411
<exclude>io/github/guacsec/trustifyda/exception/*</exclude>
411412
<!-- This one excluding ExhortApi implementation calss from coverage report as it's not tested by surefire plugin, but with junit-platform-maven-plugin -->
412413
<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
@@ -16,7 +16,7 @@
1616
*/
1717
package io.github.guacsec.trustifyda;
1818

19-
import com.redhat.exhort.api.v4.AnalysisReport;
19+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
2020
import io.github.guacsec.trustifyda.image.ImageRef;
2121
import java.io.IOException;
2222
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
@@ -23,10 +23,10 @@
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.core.JsonProcessingException;
2525
import com.fasterxml.jackson.databind.ObjectMapper;
26-
import com.redhat.exhort.api.v4.AnalysisReport;
27-
import com.redhat.exhort.api.v4.ProviderReport;
28-
import com.redhat.exhort.api.v4.SourceSummary;
2926
import io.github.guacsec.trustifyda.Api;
27+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
28+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
29+
import io.github.guacsec.trustifyda.api.v5.SourceSummary;
3030
import io.github.guacsec.trustifyda.impl.ExhortApi;
3131
import java.io.IOException;
3232
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
@@ -22,9 +22,9 @@
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import com.github.packageurl.MalformedPackageURLException;
2424
import com.github.packageurl.PackageURL;
25-
import com.redhat.exhort.api.v4.AnalysisReport;
2625
import io.github.guacsec.trustifyda.Api;
2726
import io.github.guacsec.trustifyda.Provider;
27+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
2828
import io.github.guacsec.trustifyda.image.ImageRef;
2929
import io.github.guacsec.trustifyda.image.ImageUtils;
3030
import io.github.guacsec.trustifyda.logging.LoggersFactory;
@@ -379,7 +379,7 @@ public CompletableFuture<AnalysisReport> componentAnalysis(
379379
String exClientTraceId = commonHookBeginning(false);
380380
var manifestPath = Path.of(manifest);
381381
var provider = Ecosystem.getProvider(manifestPath);
382-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
382+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
383383
var content = provider.provideComponent();
384384
commonHookAfterProviderCreatedSbomAndBeforeExhort();
385385
return getAnalysisReportForComponent(uri, content, exClientTraceId);
@@ -423,7 +423,7 @@ public CompletableFuture<AnalysisReport> componentAnalysis(String manifestFile)
423423
String exClientTraceId = commonHookBeginning(false);
424424
var manifestPath = Path.of(manifestFile);
425425
var provider = Ecosystem.getProvider(manifestPath);
426-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
426+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
427427
var content = provider.provideComponent();
428428
commonHookAfterProviderCreatedSbomAndBeforeExhort();
429429
return getAnalysisReportForComponent(uri, content, exClientTraceId);
@@ -464,7 +464,7 @@ private HttpRequest buildStackRequest(final String manifestFile, final MediaType
464464
throws IOException {
465465
var manifestPath = Path.of(manifestFile);
466466
var provider = Ecosystem.getProvider(manifestPath);
467-
var uri = URI.create(String.format("%s/api/v4/analysis", this.endpoint));
467+
var uri = URI.create(String.format("%s/api/v5/analysis", this.endpoint));
468468
var content = provider.provideStack();
469469
commonHookAfterProviderCreatedSbomAndBeforeExhort();
470470

@@ -543,7 +543,7 @@ <H, T> CompletableFuture<T> performBatchAnalysis(
543543
final String analysisName)
544544
throws IOException {
545545
String exClientTraceId = commonHookBeginning(false);
546-
var uri = URI.create(String.format("%s/api/v4/batch-analysis", this.endpoint));
546+
var uri = URI.create(String.format("%s/api/v5/batch-analysis", this.endpoint));
547547
var sboms = sbomsGenerator.get();
548548
var content =
549549
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
@@ -28,13 +28,13 @@
2828
import static org.mockito.Mockito.mockStatic;
2929
import static org.mockito.Mockito.when;
3030

31-
import com.redhat.exhort.api.v4.AnalysisReport;
32-
import com.redhat.exhort.api.v4.ProviderReport;
33-
import com.redhat.exhort.api.v4.ProviderStatus;
34-
import com.redhat.exhort.api.v4.Scanned;
35-
import com.redhat.exhort.api.v4.Source;
36-
import com.redhat.exhort.api.v4.SourceSummary;
3731
import io.github.guacsec.trustifyda.ExhortTest;
32+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
33+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
34+
import io.github.guacsec.trustifyda.api.v5.ProviderStatus;
35+
import io.github.guacsec.trustifyda.api.v5.Scanned;
36+
import io.github.guacsec.trustifyda.api.v5.Source;
37+
import io.github.guacsec.trustifyda.api.v5.SourceSummary;
3838
import io.github.guacsec.trustifyda.impl.ExhortApi;
3939
import java.io.IOException;
4040
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
@@ -30,10 +30,10 @@
3030
import static org.mockito.ArgumentMatchers.isNull;
3131
import static org.mockito.Mockito.mockStatic;
3232

33-
import com.redhat.exhort.api.v4.AnalysisReport;
34-
import com.redhat.exhort.api.v4.ProviderReport;
3533
import io.github.guacsec.trustifyda.Api;
3634
import io.github.guacsec.trustifyda.ExhortTest;
35+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
36+
import io.github.guacsec.trustifyda.api.v5.ProviderReport;
3737
import io.github.guacsec.trustifyda.image.ImageRef;
3838
import io.github.guacsec.trustifyda.providers.HelperExtension;
3939
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
@@ -39,10 +39,10 @@
3939
import com.fasterxml.jackson.databind.node.TextNode;
4040
import com.github.packageurl.MalformedPackageURLException;
4141
import com.github.packageurl.PackageURL;
42-
import com.redhat.exhort.api.v4.AnalysisReport;
4342
import io.github.guacsec.trustifyda.Api;
4443
import io.github.guacsec.trustifyda.ExhortTest;
4544
import io.github.guacsec.trustifyda.Provider;
45+
import io.github.guacsec.trustifyda.api.v5.AnalysisReport;
4646
import io.github.guacsec.trustifyda.image.ImageRef;
4747
import io.github.guacsec.trustifyda.tools.Ecosystem;
4848
import io.github.guacsec.trustifyda.tools.Operations;
@@ -506,7 +506,7 @@ void test_image_analysis()
506506
.equals(
507507
URI.create(
508508
String.format(
509-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
509+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
510510
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
511511
&& r.headers()
512512
.firstValue("Accept")
@@ -612,7 +612,7 @@ void imageAnalysisHtml() throws IOException, ExecutionException, InterruptedExce
612612
.equals(
613613
URI.create(
614614
String.format(
615-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
615+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
616616
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
617617
&& r.headers()
618618
.firstValue("Accept")
@@ -657,7 +657,7 @@ void test_perform_batch_analysis()
657657
.equals(
658658
URI.create(
659659
String.format(
660-
"%s/api/v4/batch-analysis", exhortApiSut.getEndpoint())))
660+
"%s/api/v5/batch-analysis", exhortApiSut.getEndpoint())))
661661
&& r.headers().firstValue("Content-Type").get().equals(Api.CYCLONEDX_MEDIA_TYPE)
662662
&& r.headers()
663663
.firstValue("Accept")

0 commit comments

Comments
 (0)