Merge pull request #13421 from DefectDojo/release/2.51.1

Release: Merge release into master from: release/2.51.1

Author: rossops

.github/workflows/helm-docs-updates.yml

@@ -0,0 +1,25 @@
+name: Update HELM docs for Renovate & Dependabot
+
+on:
+  pull_request:
+    branches:
+      - master
+      - dev
+      - bugfix
+      - release/**
+      - hotfix/**
+
+jobs:
+  docs_updates:
+    name: Update documentation
+    runs-on: ubuntu-latest
+    if: startsWith(github.head_ref, 'renovate/') or startsWith(github.head_ref, 'dependabot/')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      
+      - name: Run helm-docs
+        uses: losisin/helm-docs-github-action@a57fae5676e4c55a228ea654a1bcaec8dd3cf5b5 # v1.6.2
+        with:
+          chart-search-root: "helm/defectdojo"
+          git-push: true

.github/workflows/release-nightly-dev.yml

@@ -8,7 +8,7 @@ on:
   schedule:
     # every day at 5:00 UTC
     # in this case inputs are all null/empty, hence the default values are used below
-    - cron: "* 5 * * *"
+    - cron: "0 5 * * *"
   workflow_dispatch:
 
 jobs:

.github/workflows/release-x-manual-helm-chart.yml

@@ -117,5 +117,5 @@ jobs:
           fi
           cp -f ./build/index.yaml ./index.yaml
           git add ./index.yaml
-          git commit -m "Update index.yaml"
+          git commit -m "Update index.yaml - ${{ inputs.release_number }}"
           git push -u origin helm-charts

.github/workflows/test-helm-chart.yml

@@ -79,7 +79,7 @@ jobs:
           target_annotation=$(git show "${{ env.ct-branch }}:helm/defectdojo/Chart.yaml" | yq e '.annotations."artifacthub.io/changes"' -)
 
           if [[ "$current_annotation" == "$target_annotation" ]]; then
-            echo "::error file=helm/defectdojo/Chart.yaml::The 'artifacthub.io/changes' annotation has not been updated compared to ${{ env.ct-branch }}"
+            echo "::error file=helm/defectdojo/Chart.yaml::The 'artifacthub.io/changes' annotation has not been updated compared to ${{ env.ct-branch }}. For more, check the hint in 'helm/defectdojo/Chart.yaml'"
             exit 1
           fi
 

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.51.0",
+  "version": "2.51.1",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

docs/content/en/api/api-v2-docs.md

@@ -9,7 +9,7 @@ DefectDojo\'s API is created using [Django Rest
 Framework](http://www.django-rest-framework.org/). The documentation of
 each endpoint is available within each DefectDojo installation at
 [`/api/v2/oa3/swagger-ui`](https://demo.defectdojo.org/api/v2/oa3/swagger-ui/) and can be accessed by choosing the API v2
-Docs link on the user drop down menu in the header. 
+Docs link on the user drop down menu in the header.
 
 ![image](images/api_v2_1.png)
 
@@ -155,7 +155,6 @@ Example for importing a scan result:
     tags:test
     scan_type:ZAP Scan
     minimum_severity:Info
-    skip_duplicates:true
     close_old_findings:false
 
 -   Body tab

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa: F401
 
-__version__ = "2.51.0"
+__version__ = "2.51.1"
 __url__ = "https://github.com/DefectDojo/django-DefectDojo"
 __docs__ = "https://documentation.defectdojo.com"

dojo/jira_link/views.py

@@ -327,6 +327,7 @@ def post(self, request):
                 return render(request, self.get_template(), {"jform": jform})
             # authentication successful
             # Get the open and close keys
+            msg = "Unable to find Open/Close ID's (invalid issue key specified?). They will need to be found manually"
             try:
                 issue_id = jform.cleaned_data.get("issue_key")
                 key_url = jira_server.strip("/") + "/rest/api/latest/issue/" + issue_id + "/transitions?expand=transitions.fields"
@@ -339,8 +340,9 @@ def post(self, request):
                     if node["to"]["statusCategory"]["name"] == "Done":
                         close_key = close_key or int(node["id"])
             except Exception:
-                msg = "Unable to find Open/Close ID's (invalid issue key specified?). They will need to be found manually"
                 logger.exception(msg)  # already logged in jira_helper
+
+            if not open_key or not close_key:
                 messages.add_message(
                     request,
                     messages.ERROR,