From 43d06684fbf65845144513f2bfca82a4834d155c Mon Sep 17 00:00:00 2001 From: Jonathan Christison Date: Tue, 4 Jul 2023 13:17:59 +0100 Subject: [PATCH] Make task handler public so vertx can trigger it Also changed pssaas to autofire endpoint for easier hacking --- hack/pssaas-request-curl.sh | 4 ++-- src/main/java/com/redhat/pctsec/model/BuildType.java | 2 ++ src/main/java/com/redhat/pctsec/tekton/TaskHandler.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hack/pssaas-request-curl.sh b/hack/pssaas-request-curl.sh index 975735d..f6681a2 100755 --- a/hack/pssaas-request-curl.sh +++ b/hack/pssaas-request-curl.sh @@ -1,4 +1,4 @@ #!/bin/bash -curl -H 'Content-Type: application/json' -d '@sample-pssaas.json' localhost:8080/api/v1a/Scan/PSSaaS -vv -curl -H 'Content-Type: application/json' -d '@sample-pssaas-bad.json' localhost:8080/api/v1a/Scan/PSSaaS -vv +curl -H 'Content-Type: application/json' -d '@sample-pssaas.json' localhost:8080/api/v1a/Scan/PSSaaS/run -vv | jq +#curl -H 'Content-Type: application/json' -d '@sample-pssaas-bad.json' localhost:8080/api/v1a/Scan/PSSaaS -vv diff --git a/src/main/java/com/redhat/pctsec/model/BuildType.java b/src/main/java/com/redhat/pctsec/model/BuildType.java index 1b542fb..7714f97 100644 --- a/src/main/java/com/redhat/pctsec/model/BuildType.java +++ b/src/main/java/com/redhat/pctsec/model/BuildType.java @@ -27,7 +27,9 @@ abstract public class BuildType { } + //This is the git URL of the sources abstract public URI SCMURL(); + //This is the URL of the build abstract public URL URL(); abstract public String revision(); } diff --git a/src/main/java/com/redhat/pctsec/tekton/TaskHandler.java b/src/main/java/com/redhat/pctsec/tekton/TaskHandler.java index b76dbe3..a75b31d 100644 --- a/src/main/java/com/redhat/pctsec/tekton/TaskHandler.java +++ b/src/main/java/com/redhat/pctsec/tekton/TaskHandler.java @@ -37,7 +37,7 @@ public class TaskHandler { @Inject TektonClient tektonClient; @ConsumeEvent("tekton") - private ScanTask consume(ScanTask scanTask) + public ScanTask consume(ScanTask scanTask) { switch(scanTask.getScanRequest().getType())