diff --git a/hack/sample-pssaas.json b/hack/sample-pssaas.json index 14c4514..63cb3ce 100644 --- a/hack/sample-pssaas.json +++ b/hack/sample-pssaas.json @@ -6,6 +6,10 @@ {"build-id":"ASLKGOMQVVAAA", "type":"pnc"}, {"build-id":"ASLMBTBCNVAAA", - "type":"pnc"}] + "type":"pnc"}, + {"type":"git", + "repo":"https://code.engineering.redhat.com/gerrit/quarkusio/quarkus.git", + "ref":"2.13.8.Final-redhat-00001"} + ] } diff --git a/src/main/java/com/redhat/pctsec/model/Scan.java b/src/main/java/com/redhat/pctsec/model/Scan.java index 04b67ad..a1e3daa 100644 --- a/src/main/java/com/redhat/pctsec/model/Scan.java +++ b/src/main/java/com/redhat/pctsec/model/Scan.java @@ -1,5 +1,6 @@ package com.redhat.pctsec.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import jakarta.transaction.Transactional; import jakarta.validation.constraints.Email; @@ -86,11 +87,13 @@ public class Scan { //@Temporal(TemporalType.TIMESTAMP) @CreationTimestamp + @JsonIgnore @Column(name="creation_timestamp") //@NotNull private Instant creationTimestamp; @UpdateTimestamp + @JsonIgnore @Column(name="update_timestamp") //@NotNull private Instant updateTimestamp; diff --git a/src/main/java/com/redhat/pctsec/model/ScanRequest.java b/src/main/java/com/redhat/pctsec/model/ScanRequest.java index 0ec1851..82765b8 100644 --- a/src/main/java/com/redhat/pctsec/model/ScanRequest.java +++ b/src/main/java/com/redhat/pctsec/model/ScanRequest.java @@ -1,5 +1,6 @@ package com.redhat.pctsec.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.redhat.pctsec.model.api.request.git; import com.redhat.pctsec.tekton.brewTaskRun; import com.redhat.pctsec.tekton.scmUrlPipelineRun; @@ -20,7 +21,7 @@ public class ScanRequest { @Id @GeneratedValue - private UUID id; + protected UUID id; private String metadata; private String oshScanOptions; @@ -33,6 +34,7 @@ public class ScanRequest { } @Transient + @JsonIgnore @Inject EventBus bus; diff --git a/src/main/java/com/redhat/pctsec/model/ScanRequests.java b/src/main/java/com/redhat/pctsec/model/ScanRequests.java index 06357b8..8bd8935 100644 --- a/src/main/java/com/redhat/pctsec/model/ScanRequests.java +++ b/src/main/java/com/redhat/pctsec/model/ScanRequests.java @@ -18,7 +18,7 @@ public class ScanRequests { @Id @GeneratedValue - private UUID id; + protected UUID id; @OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL) @JoinColumn(name = "scan_request_id", referencedColumnName = "id") diff --git a/src/main/java/com/redhat/pctsec/model/ScanTask.java b/src/main/java/com/redhat/pctsec/model/ScanTask.java index e45a89e..a20fc6a 100644 --- a/src/main/java/com/redhat/pctsec/model/ScanTask.java +++ b/src/main/java/com/redhat/pctsec/model/ScanTask.java @@ -1,6 +1,7 @@ package com.redhat.pctsec.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.vertx.core.eventbus.impl.EventBusImpl; import io.vertx.mutiny.core.eventbus.EventBus; import jakarta.enterprise.context.Dependent; @@ -10,7 +11,7 @@ import jakarta.inject.Inject; @Dependent public class ScanTask { - + @JsonIgnore @Inject EventBus bus; public ScanTaskState state; diff --git a/src/main/java/com/redhat/pctsec/model/jpa/ScanRequestsRepository.java b/src/main/java/com/redhat/pctsec/model/jpa/ScanRequestsRepository.java new file mode 100644 index 0000000..3234845 --- /dev/null +++ b/src/main/java/com/redhat/pctsec/model/jpa/ScanRequestsRepository.java @@ -0,0 +1,4 @@ +package com.redhat.pctsec.model.jpa; + +public class ScanRequestsRepository { +} diff --git a/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java new file mode 100644 index 0000000..3ec99b0 --- /dev/null +++ b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java @@ -0,0 +1,4 @@ +package com.redhat.pctsec.rest.v1alpha1; + +public class ScanRequestsResource { +} diff --git a/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java index 5e8f10d..6281ffe 100644 --- a/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java +++ b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java @@ -58,6 +58,7 @@ public class ScanResource { { return sr.listAll(); } + @GET @Path("{id}") @Produces({"application/json"}) @@ -93,6 +94,7 @@ public class ScanResource { @GET @Path("single/brew") @Produces({"application/json"}) + @Transactional public Scan singleGit(@RestQuery String brewId) { Scan s = new Scan(); @@ -104,6 +106,7 @@ public class ScanResource { @GET @Path("single/pnc") @Produces({"application/json"}) + @Transactional public Scan singlePNC(@RestQuery String pncId) { Scan s = new Scan();