Skip to content

Commit f7f546e

Browse files
authored
[JENKINS-75786] Incoming webhook from PLUGIN are reject with endpoint not found (#1068)
Add missing server_url parameter in the Jenkins endpoint to register in the webhook
1 parent fff4b7e commit f7f546e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/WebhookConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ boolean updateHook(BitbucketWebHook hook, BitbucketSCMSource owner) {
147147
}
148148
} else if (hook instanceof NativeBitbucketServerWebhook serverHook) {
149149
String serverURL = owner.getServerUrl();
150-
String url = getNativeServerWebhookUrl(serverURL, owner.getEndpointJenkinsRootURL());
150+
String url = getServerWebhookURL(serverURL, owner.getEndpointJenkinsRootURL());
151151

152152
if (!url.equals(serverHook.getUrl())) {
153153
serverHook.setUrl(url);
@@ -195,7 +195,7 @@ public BitbucketWebHook getHook(BitbucketSCMSource owner) {
195195
hook.setActive(true);
196196
hook.setDescription(description);
197197
hook.setEvents(getNativeServerEvents(serverUrl));
198-
hook.setUrl(getNativeServerWebhookUrl(serverUrl, rootUrl));
198+
hook.setUrl(getServerWebhookURL(serverUrl, rootUrl));
199199
hook.setSecret(signatureSecret);
200200
return hook;
201201
}
@@ -205,7 +205,7 @@ public BitbucketWebHook getHook(BitbucketSCMSource owner) {
205205
BitbucketServerWebhook hook = new BitbucketServerWebhook();
206206
hook.setActive(true);
207207
hook.setDescription(description);
208-
hook.setUrl(rootUrl + BitbucketSCMSourcePushHookReceiver.FULL_PATH);
208+
hook.setUrl(getServerWebhookURL(serverUrl, rootUrl));
209209
hook.setCommittersToIgnore(committersToIgnore);
210210
return hook;
211211
}
@@ -260,12 +260,12 @@ private static List<String> getNativeServerEvents(String serverUrl) {
260260
return NATIVE_SERVER_EVENTS_v7;
261261
}
262262

263-
private static String getNativeServerWebhookUrl(String serverUrl, String rootUrl) {
264-
return UriTemplate.buildFromTemplate(rootUrl)
263+
private static String getServerWebhookURL(String serverURL, String rootURL) {
264+
return UriTemplate.buildFromTemplate(rootURL)
265265
.template(BitbucketSCMSourcePushHookReceiver.FULL_PATH)
266266
.query("server_url")
267267
.build()
268-
.set("server_url", serverUrl)
268+
.set("server_url", serverURL)
269269
.expand();
270270
}
271271
}

0 commit comments

Comments
 (0)