Browse Source

Set scanRequests on scan, dont put pnc build in json

21-email-to-args-for-osh-client
Jonathan Christison 3 years ago
parent
commit
d2386ac83a
  1. 4
      src/main/java/com/redhat/pctsec/model/PNCBuild.java
  2. 1
      src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

4
src/main/java/com/redhat/pctsec/model/PNCBuild.java

@ -1,5 +1,6 @@
package com.redhat.pctsec.model; package com.redhat.pctsec.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.redhat.pctsec.model.api.service.AltPncService; import com.redhat.pctsec.model.api.service.AltPncService;
//import com.redhat.pctsec.model.api.service.PncService; //import com.redhat.pctsec.model.api.service.PncService;
import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder;
@ -30,7 +31,8 @@ public class PNCBuild extends BuildType{
*/ */
@Transient @Transient
Build build; @JsonIgnore
private Build build;
private URI SCMURL; private URI SCMURL;
private String revision; private String revision;

1
src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

@ -81,6 +81,7 @@ public class ScanResource {
//Now set the actual payload requestor //Now set the actual payload requestor
s.setRequestor(scanRequest.requestor); s.setRequestor(scanRequest.requestor);
s.setProductName(scanRequest.productName); s.setProductName(scanRequest.productName);
s.setScanRequests(scanRequests);
sr.persist(s); sr.persist(s);
return s; return s;
} }

Loading…
Cancel
Save