Skip to content

feat(updating reregisterallhooks method): only register parent, not all children #241

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

Closed
dgutzmann wants to merge 2 commits into from
Closed

feat(updating reregisterallhooks method): only register parent, not all children #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c99e85
feat(updating reregisterallhooks method): only register parent, not a…
Nov 6, 2020
ec4bc9b
Switching to SCMsourceOwner
Nov 10, 2020
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
2 changes: 2 additions & 0 deletions src/main/java/com/cloudbees/jenkins/GitHubWebHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import static org.jenkinsci.plugins.github.util.FluentIterableWrapper.from;
import static org.jenkinsci.plugins.github.util.JobInfoHelpers.isAlive;
import static org.jenkinsci.plugins.github.util.JobInfoHelpers.isBuildable;
import static org.jenkinsci.plugins.github.util.JobInfoHelpers.isNotSCMSourceOwner;
import static org.jenkinsci.plugins.github.webhook.WebhookManager.forHookUrl;


Expand Down Expand Up @@ -104,6 +105,7 @@ public List<Item> reRegisterAllHooks() {
return from(getJenkinsInstance().getAllItems(Item.class))
.filter(isBuildable())
.filter(isAlive())
.filter(isNotSCMSourceOwner())
.transform(reRegisterHookForJob())
.toList();
}
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/org/jenkinsci/plugins/github/util/JobInfoHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import hudson.triggers.Trigger;
import hudson.triggers.TriggerDescriptor;
import jenkins.model.ParameterizedJobMixIn;
import jenkins.scm.api.SCMSourceOwner;
import org.jenkinsci.plugins.github.extension.GHEventsSubscriber;

import javax.annotation.CheckForNull;
Expand Down Expand Up @@ -141,5 +142,18 @@ protected Job asJob() {
}
};
}

/**
* Can be useful to ignore child jobs on reregistering hooks
*
* @return predicate with true on apply if item is not a child of WorkflowMultiBranchProject
*/
public static <ITEM extends Item> Predicate<ITEM> isNotSCMSourceOwner() {
return new Predicate<ITEM>() {
public boolean apply(ITEM item) {
return !(item.getParent() instanceof SCMSourceOwner);
}
};
}
}