From fa5c61cab7c37ea4094cbd07fcffce8608768947 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 25 Sep 2023 15:02:08 +0800 Subject: [PATCH] Fix PushEvent NullPointerException jenkinsci/github-plugin (#27203) (#27249) Backport #27203 by @Nabapadma-sarker Fixes #27202 Co-authored-by: Nabapadma-sarker (cherry picked from commit 4b37eb2c23f8488f36247f25f9cfd4949eb17e23) --- modules/structs/repo.go | 1 + services/convert/repository.go | 1 + templates/swagger/v1_json.tmpl | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/modules/structs/repo.go b/modules/structs/repo.go index 159ba76cec..a131646fc0 100644 --- a/modules/structs/repo.go +++ b/modules/structs/repo.go @@ -63,6 +63,7 @@ type Repository struct { Language string `json:"language"` LanguagesURL string `json:"languages_url"` HTMLURL string `json:"html_url"` + URL string `json:"url"` Link string `json:"link"` SSHURL string `json:"ssh_url"` CloneURL string `json:"clone_url"` diff --git a/services/convert/repository.go b/services/convert/repository.go index 6f77b4932e..71038cd062 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -181,6 +181,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR Parent: parent, Mirror: repo.IsMirror, HTMLURL: repo.HTMLURL(), + URL: repoAPIURL, SSHURL: cloneLink.SSH, CloneURL: cloneLink.HTTPS, OriginalURL: repo.SanitizedOriginalURL(), diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 88ad633711..39f73398ab 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -21258,6 +21258,10 @@ "format": "date-time", "x-go-name": "Updated" }, + "url": { + "type": "string", + "x-go-name": "URL" + }, "watchers_count": { "type": "integer", "format": "int64",