From c58875a446edd212e6560dfa5eb472cb246d2e16 Mon Sep 17 00:00:00 2001
From: Artem Goncharov <artem.goncharov@gmail.com>
Date: Thu, 5 Dec 2024 09:28:14 +0100
Subject: [PATCH] Make the dojo_url basepath

in tests dojo_url is a full api path while in secrets we have only a
base url. Ensure all tasks explicitly construct required url.

Signed-off-by: Artem Goncharov <artem.goncharov@gmail.com>
---
 .zuul.d/config.yaml      | 2 +-
 playbooks/greenbone.yaml | 2 +-
 playbooks/nuclei.yaml    | 2 +-
 playbooks/owasp-zap.yaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.zuul.d/config.yaml b/.zuul.d/config.yaml
index 4a2f246..2b4b8bf 100644
--- a/.zuul.d/config.yaml
+++ b/.zuul.d/config.yaml
@@ -102,7 +102,7 @@
         - zuul.sovereignit.cloud
 
       pipeline_conf:
-        dojo_url: https://demo.defectdojo.com/api/v2/import-scan/
+        dojo_url: https://demo.defectdojo.com
         daily_scan_engagement_id: 1
         weekly_scan_engagement_id: 1
         dojo_auth: "Basic YWRtaW46MURlZmVjdGRvam9AZGVtbyNhcHBzZWM="
diff --git a/playbooks/greenbone.yaml b/playbooks/greenbone.yaml
index 436f33f..9dbba15 100644
--- a/playbooks/greenbone.yaml
+++ b/playbooks/greenbone.yaml
@@ -55,7 +55,7 @@
     - name: Send Greenbone results to Defect Dojo
       no_log: true
       ansible.builtin.uri:
-        url: "{{ pipeline_conf.dojo_url }}"
+        url: "{{ pipeline_conf.dojo_url }}/api/v2/import-scan"
         headers:
           Authorization: "{{ ('Token ' + pipeline_conf.dojo_api_key) if pipeline_conf.dojo_api_key is defined else pipeline_conf.dojo_auth }}"
         method: "POST"
diff --git a/playbooks/nuclei.yaml b/playbooks/nuclei.yaml
index 0534f44..330e2dd 100644
--- a/playbooks/nuclei.yaml
+++ b/playbooks/nuclei.yaml
@@ -36,7 +36,7 @@
     - name: Send Nuclei results to Defect Dojo
       #no_log: true
       ansible.builtin.uri:
-        url: "{{ pipeline_conf.dojo_url }}"
+        url: "{{ pipeline_conf.dojo_url }}/api/v2/import-scan"
         headers:
           Authorization: "{{ ('Token ' + pipeline_conf.dojo_api_key) if pipeline_conf.dojo_api_key is defined else pipeline_conf.dojo_auth }}"
         method: "POST"
diff --git a/playbooks/owasp-zap.yaml b/playbooks/owasp-zap.yaml
index 1fce753..91d2d62 100644
--- a/playbooks/owasp-zap.yaml
+++ b/playbooks/owasp-zap.yaml
@@ -52,7 +52,7 @@
     - name: Send Zap results to Defect Dojo
       #  no_log: true
       ansible.builtin.uri:
-        url: "{{ pipeline_conf.dojo_url }}"
+        url: "{{ pipeline_conf.dojo_url }}/api/v2/import-scan"
         headers:
           Authorization: "{{ ('Token ' + pipeline_conf.dojo_api_key) if pipeline_conf.dojo_api_key is defined else pipeline_conf.dojo_auth }}"
         method: "POST"