From e3e6378d7b7f4438bc20e6ef73ccfb0c91c46a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Farr=C3=A9?=
 <13270880+jafarre-bi@users.noreply.github.com>
Date: Fri, 10 Jul 2026 08:23:43 +0200
Subject: [PATCH 1/4] Fix VIT0089530

---
 delete-components/Jenkinsfile | 6 ++++++
 delete-projects/Jenkinsfile   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/delete-components/Jenkinsfile b/delete-components/Jenkinsfile
index 39d3f5711..6c803722a 100644
--- a/delete-components/Jenkinsfile
+++ b/delete-components/Jenkinsfile
@@ -3,6 +3,12 @@ def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
 def componentId = env.COMPONENT_ID.toLowerCase()
+if (!projectId ==~ /^[A-Za-z\d]+$/) {
+    throw new IllegalArgumentException("Invalid projectId: ${projectId}")
+}
+if (!componentId ==~ /^[A-Za-z\d\-]+$/) {
+    throw new IllegalArgumentException("Invalid componentId: ${componentId}")
+}
 
 // Jenkins DeploymentConfig environment variables
 def dockerRegistry
diff --git a/delete-projects/Jenkinsfile b/delete-projects/Jenkinsfile
index d565076aa..137f1848e 100644
--- a/delete-projects/Jenkinsfile
+++ b/delete-projects/Jenkinsfile
@@ -2,6 +2,9 @@
 def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
+if (!projectId ==~ /^[A-Za-z\d]+$/) {
+    throw new IllegalArgumentException("Invalid projectId: ${projectId}")
+}
 
 // Jenkins DeploymentConfig environment variables
 def dockerRegistry

From f89df7c5de815da788273013809019fda6f81156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Farr=C3=A9?=
 <13270880+jafarre-bi@users.noreply.github.com>
Date: Fri, 10 Jul 2026 08:38:37 +0200
Subject: [PATCH 2/4] Update change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc68941f8..9fceed1bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 ### Added
+- Fix VIT0089530 ([#1392](https://github.com/opendevstack/ods-core/pull/1392))
 
 ### Changed
 

From 6554a65f31f86bba64848987172db488760c9ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Farr=C3=A9?=
 <13270880+jafarre-bi@users.noreply.github.com>
Date: Fri, 10 Jul 2026 09:51:39 +0200
Subject: [PATCH 3/4] Fix precedence

---
 delete-components/Jenkinsfile | 4 ++--
 delete-projects/Jenkinsfile   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/delete-components/Jenkinsfile b/delete-components/Jenkinsfile
index 6c803722a..3743ff8b7 100644
--- a/delete-components/Jenkinsfile
+++ b/delete-components/Jenkinsfile
@@ -3,10 +3,10 @@ def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
 def componentId = env.COMPONENT_ID.toLowerCase()
-if (!projectId ==~ /^[A-Za-z\d]+$/) {
+if (!(projectId ==~ /^[A-Za-z\d]+$/)) {
     throw new IllegalArgumentException("Invalid projectId: ${projectId}")
 }
-if (!componentId ==~ /^[A-Za-z\d\-]+$/) {
+if (!(componentId ==~ /^[A-Za-z\d\-]+$/)) {
     throw new IllegalArgumentException("Invalid componentId: ${componentId}")
 }
 
diff --git a/delete-projects/Jenkinsfile b/delete-projects/Jenkinsfile
index 137f1848e..1da3810e4 100644
--- a/delete-projects/Jenkinsfile
+++ b/delete-projects/Jenkinsfile
@@ -2,7 +2,7 @@
 def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
-if (!projectId ==~ /^[A-Za-z\d]+$/) {
+if (!(projectId ==~ /^[A-Za-z\d]+$/)) {
     throw new IllegalArgumentException("Invalid projectId: ${projectId}")
 }
 

From 2a1c32098aa635b2d888ad071b46c129677322df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Farr=C3=A9?=
 <13270880+jafarre-bi@users.noreply.github.com>
Date: Fri, 10 Jul 2026 09:55:09 +0200
Subject: [PATCH 4/4] Fix change log

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fceed1bf..450d424d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,11 @@
 ## Unreleased
 
 ### Added
-- Fix VIT0089530 ([#1392](https://github.com/opendevstack/ods-core/pull/1392))
 
 ### Changed
 
 ### Fixed
+- Fixed VIT0089530 ([#1392](https://github.com/opendevstack/ods-core/pull/1392))
 
 ## [4.13.0] - 2026-07-01
 ### Changed