Adding GITLAB_USER_USERNAME variable to GitLabPushCauseData and GitLa…

…bTagPushCauseData (#387)
jenkinsci · Jan 25, 2024 · aed303b · aed303b
1 parent a51e812
commit aed303b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -532,6 +532,7 @@ GITLAB_REF
 GITLAB_CHECKOUT_SHA
 GITLAB_USER_ID
 GITLAB_USER_NAME
+GITLAB_USER_USERNAME
 GITLAB_USER_EMAIL
 GITLAB_PROJECT_ID
 GITLAB_PROJECT_ID_2
@@ -591,6 +592,7 @@ GITLAB_REF
 GITLAB_CHECKOUT_SHA
 GITLAB_USER_ID
 GITLAB_USER_NAME
+GITLAB_USER_USERNAME
 GITLAB_USER_EMAIL
 GITLAB_PROJECT_ID
 GITLAB_PROJECT_ID_2

diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabPushCauseData.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabPushCauseData.java
@@ -24,6 +24,7 @@ public GitLabPushCauseData(PushEvent pushEvent) {
         this.variables.put("GITLAB_CHECKOUT_SHA", defaultString(pushEvent.getCheckoutSha()));
         this.variables.put("GITLAB_USER_ID", defaultLongString(pushEvent.getUserId()));
         this.variables.put("GITLAB_USER_NAME", defaultString(pushEvent.getUserName()));
+        this.variables.put("GITLAB_USER_USERNAME", defaultString(pushEvent.getUserUsername()));
         this.variables.put("GITLAB_USER_EMAIL", defaultString(pushEvent.getUserEmail()));
         this.variables.put("GITLAB_PROJECT_ID", defaultLongString(pushEvent.getProjectId()));
         this.variables.put(

diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabTagPushCauseData.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabTagPushCauseData.java
@@ -24,6 +24,7 @@ public GitLabTagPushCauseData(TagPushEvent tagPushEvent) {
         this.variables.put("GITLAB_CHECKOUT_SHA", defaultString(tagPushEvent.getCheckoutSha()));
         this.variables.put("GITLAB_USER_ID", defaultLongString(tagPushEvent.getUserId()));
         this.variables.put("GITLAB_USER_NAME", defaultString(tagPushEvent.getUserName()));
+        this.variables.put("GITLAB_USER_USERNAME", defaultString(tagPushEvent.getUserUsername()));
         this.variables.put("GITLAB_USER_EMAIL", defaultString(tagPushEvent.getUserEmail()));
         this.variables.put("GITLAB_PROJECT_ID", defaultLongString(tagPushEvent.getProjectId()));
         this.variables.put(