Jonathan Christison 3 years ago
parent
commit
6069d11e1c
  1. 11
      src/main/java/com/redhat/pctsec/model/Scan.java
  2. 2
      src/main/java/com/redhat/pctsec/model/ScanRequests.java
  3. 6
      src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

11
src/main/java/com/redhat/pctsec/model/Scan.java

@ -29,7 +29,7 @@ public class Scan {
@JoinColumn(name = "product_id", referencedColumnName = "id")
private String productName;
*/
@Column(name="proudct_name")
@Column(name="product_name")
private String productName;
//@Temporal(TemporalType.TIMESTAMP)
@ -54,7 +54,7 @@ public class Scan {
@NotNull
private String requestor;
@Column(name="report_email")
@Column(name="email")
@Email
private String email;
@ -102,8 +102,9 @@ public class Scan {
@Access(AccessType.PROPERTY)
@Email
public String getEmail() {
if(email != null)
if(email != null) {
return email;
}
return getRequestor() + "@redhat.com";
}
@ -122,9 +123,9 @@ public class Scan {
@JsonIgnore
@Transient
public void propergateOptions(){
public void propagateOptions(){
//In future lets export this scan object as YAML
getScanRequests().propergateOptions();
getScanRequests().propagateOptions();
String covscanArgs = " --email-to " + this.getEmail() + " --comment \"" + this.productName + "\"";
getScanRequests().scanRequests.forEach(sr -> sr.setScanProperties(sr.getScanProperties() + covscanArgs));
}

2
src/main/java/com/redhat/pctsec/model/ScanRequests.java

@ -131,7 +131,7 @@ public class ScanRequests {
@JsonIgnore
@Transient
public void propergateOptions(){
public void propagateOptions(){
//In future lets export this scan object as YAML
//If its empy overwrite with the global options
getScanRequests().stream().filter(eso -> eso.getScanProperties() == null).forEach(sr -> sr.setScanProperties(getGlobalScanProperties()));

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

@ -61,7 +61,7 @@ public class ScanResource {
public List<ScanTask> createRunPSSAAS(@Valid pssaas scanRequest)
{
Scan s = this.createPSSAAS(scanRequest);
s.propergateOptions();
s.propagateOptions();
return s.scanRequests.execute(bus);
}
@ -94,7 +94,7 @@ public class ScanResource {
public List<ScanTask> createRunScanChain(@Valid scanChain scanRequest)
{
Scan s = this.createScanChain(scanRequest);
s.propergateOptions();
s.propagateOptions();
return s.scanRequests.execute(bus);
}
@GET
@ -120,7 +120,7 @@ public class ScanResource {
public List<ScanTask> scanRequestExe(String id)
{
Scan s = sr.findById(UUID.fromString(id));
s.propergateOptions();
s.propagateOptions();
return s.scanRequests.execute(bus);
}

Loading…
Cancel
Save