From 6d71ade6bdfd7586a1f9714e7406696f39ff42c5 Mon Sep 17 00:00:00 2001
From: Oleg Stiplin <stiplin@gmail.com>
Date: Mon, 12 Jun 2023 19:49:46 +0300
Subject: [PATCH] Add tokenCredentialId parameter support to
 generic-webhook-trigger

Change-Id: Ied3cbe3758967659f83637ccea78d834079a1470

Add tokenCredentialId parameter support to generic-webhook-trigger

Change-Id: Ied3cbe3758967659f83637ccea78d834079a1470
---
 jenkins_jobs/modules/triggers.py                          | 2 ++
 tests/triggers/fixtures/generic-webhook-trigger-full.xml  | 1 +
 tests/triggers/fixtures/generic-webhook-trigger-full.yaml | 1 +
 tests/triggers/fixtures/generic-webhook-trigger000.xml    | 1 +
 tests/triggers/fixtures/generic-webhook-trigger001.xml    | 1 +
 tests/triggers/fixtures/generic-webhook-trigger002.xml    | 1 +
 tests/triggers/fixtures/generic-webhook-trigger003.xml    | 1 +
 7 files changed, 8 insertions(+)

diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py
index 4eaa149bf..c071b9f3d 100644
--- a/jenkins_jobs/modules/triggers.py
+++ b/jenkins_jobs/modules/triggers.py
@@ -2608,6 +2608,7 @@ def generic_webhook_trigger(registry, xml_parent, data):
 
 
     :arg str token: A token to use to trigger the job. (default '')
+    :arg str token-credential-id: A token credential id to use to trigger the job. (default '')
     :arg bool print-post-content: Print post content in job log.
     :arg bool print-contrib-var: Print contributed variables in job log.
     :arg bool silent-response: Avoid responding with information about
@@ -2717,6 +2718,7 @@ def generic_webhook_trigger(registry, xml_parent, data):
         ("print-contrib-var", "printContributedVariables", False),
         ("cause", "causeString", ""),
         ("token", "token", ""),
+        ("token-credential-id", "tokenCredentialId", ""),
         ("silent-response", "silentResponse", False),
     ]
     # This should cover all the top level
diff --git a/tests/triggers/fixtures/generic-webhook-trigger-full.xml b/tests/triggers/fixtures/generic-webhook-trigger-full.xml
index d3fd96247..18af693f6 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger-full.xml
+++ b/tests/triggers/fixtures/generic-webhook-trigger-full.xml
@@ -37,6 +37,7 @@
       <printContributedVariables>true</printContributedVariables>
       <causeString>Generic Cause</causeString>
       <token>blah</token>
+      <tokenCredentialId>token_credential_id</tokenCredentialId>
       <silentResponse>true</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>
diff --git a/tests/triggers/fixtures/generic-webhook-trigger-full.yaml b/tests/triggers/fixtures/generic-webhook-trigger-full.yaml
index 70b3b765d..204acd231 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger-full.yaml
+++ b/tests/triggers/fixtures/generic-webhook-trigger-full.yaml
@@ -23,4 +23,5 @@ triggers:
         print-contrib-var: true
         cause: Generic Cause
         token: blah
+        token-credential-id: token_credential_id
         silent-response: true
diff --git a/tests/triggers/fixtures/generic-webhook-trigger000.xml b/tests/triggers/fixtures/generic-webhook-trigger000.xml
index cc285db7c..f7dad9b93 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger000.xml
+++ b/tests/triggers/fixtures/generic-webhook-trigger000.xml
@@ -18,6 +18,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>
diff --git a/tests/triggers/fixtures/generic-webhook-trigger001.xml b/tests/triggers/fixtures/generic-webhook-trigger001.xml
index 9ba8f3993..df0956702 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger001.xml
+++ b/tests/triggers/fixtures/generic-webhook-trigger001.xml
@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>
diff --git a/tests/triggers/fixtures/generic-webhook-trigger002.xml b/tests/triggers/fixtures/generic-webhook-trigger002.xml
index 67bb288b1..9def63c8a 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger002.xml
+++ b/tests/triggers/fixtures/generic-webhook-trigger002.xml
@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>
diff --git a/tests/triggers/fixtures/generic-webhook-trigger003.xml b/tests/triggers/fixtures/generic-webhook-trigger003.xml
index 67bb288b1..9def63c8a 100644
--- a/tests/triggers/fixtures/generic-webhook-trigger003.xml
+++ b/tests/triggers/fixtures/generic-webhook-trigger003.xml
@@ -15,6 +15,7 @@
       <printContributedVariables>false</printContributedVariables>
       <causeString/>
       <token/>
+      <tokenCredentialId/>
       <silentResponse>false</silentResponse>
     </org.jenkinsci.plugins.gwt.GenericTrigger>
   </triggers>