Skip to content

make webhook url configurable #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

make webhook url configurable #310

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cac4578
make webhook url configurable
Jun 12, 2020
42e407a
return null explicitly
Jun 12, 2020
8f452a8
return rootUrl
Jun 12, 2020
fa74e2d
Merge branch 'master' into feature/make-hook-url-configurable
lifeofguenter Jun 17, 2020
2d18296
Merge branch 'task/formatting-base' into feature/make-hook-url-config…
bitwiseman Mar 4, 2021
e2c64df
Apply autoformatting
bitwiseman Mar 4, 2021
9ef1e08
Merge remote-tracking branch 'upstream/master' into feature/make-hook…
bitwiseman Mar 4, 2021
e9d0fd8
Merge branch 'master' into feature/make-hook-url-configurable
jtnord Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubOrgWebHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,16 @@ public class GitHubOrgWebHook {
private static final List<GHEvent> EVENTS = Arrays.asList(GHEvent.REPOSITORY, GHEvent.PUSH, GHEvent.PULL_REQUEST, GHEvent.PULL_REQUEST_REVIEW_COMMENT);

public static void register(GitHub hub, String orgName) throws IOException {
String rootUrl = System.getProperty("jenkins.hook.url");
if (rootUrl == null) {
rootUrl = Jenkins.get().getRootUrl();
}
if (rootUrl == null) {
String url = getWebhookUrl();
if (url == null) {
return;
}

GHUser u = hub.getUser(orgName);
FileBoolean orghook = new FileBoolean(getTrackingFile(orgName));
if (orghook.isOff()) {
try {
GHOrganization org = hub.getOrganization(orgName);
String url = rootUrl + "github-webhook/";
boolean found = false;
for (GHHook hook : org.getHooks()) {
if (hook.getConfig().get("url").equals(url)) {
Expand Down Expand Up @@ -96,16 +93,16 @@ private static File getTrackingFile(String orgName) {
}

public static void deregister(GitHub hub, String orgName) throws IOException {
String rootUrl = Jenkins.get().getRootUrl();
if (rootUrl == null) {
String url = getWebhookUrl();
if (url == null) {
return;
}

GHUser u = hub.getUser(orgName);
FileBoolean orghook = new FileBoolean(getTrackingFile(orgName));
if (orghook.isOn()) {
try {
GHOrganization org = hub.getOrganization(orgName);
String url = rootUrl + "github-webhook/";
for (GHHook hook : org.getHooks()) {
if (hook.getConfig().get("url").equals(url)) {
hook.delete();
Expand All @@ -130,4 +127,16 @@ public static void deregister(GitHub hub, String orgName) throws IOException {
}
}

private static String getWebhookUrl() {
String rootUrl = System.getProperty("jenkins.hook.url");
if (rootUrl == null) {
rootUrl = Jenkins.get().getRootUrl();
}
if (rootUrl == null) {
return rootUrl;
Copy link
Member

@jglick jglick Jan 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return rootUrl;
return null;

(for clarity)

}

return rootUrl + "github-webhook/";
}

}