Refresh urls, react on repository org/repo change (#271)

* Support repochanges...

* WIP

* WIP

* undo

* cleanup

* WIP

* For multibranch also

* Fix test

* Fix trigger cache + test

* undo

* fix test

Author: KostyaSha

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchRepository.java

@@ -5,6 +5,7 @@
 import hudson.model.Item;
 import hudson.model.Result;
 import hudson.model.Run;
+import hudson.model.TaskListener;
 import hudson.model.queue.QueueTaskFuture;
 import hudson.util.FormValidation;
 import hudson.util.RunList;
@@ -48,7 +49,7 @@ public class GitHubBranchRepository extends GitHubRepository<GitHubBranchReposit
      *
      * @param remoteRepository remote repository full name.
      */
-    public GitHubBranchRepository(GHRepository remoteRepository) {
+    public GitHubBranchRepository(GHRepository remoteRepository) throws IOException {
         super(remoteRepository);
     }
 
@@ -62,6 +63,14 @@ public Map<String, GitHubBranch> getBranches() {
         return branches;
     }
 
+    @Override
+    public void actualiseOnChange(@Nonnull GHRepository ghRepository, @Nonnull TaskListener listener) {
+        if (changed) {
+            listener.getLogger().println("Local settings changed, removing branches in repository!");
+            getBranches().clear();
+        }
+    }
+
     @Override
     public String getIconFileName() {
         return GitHubBranch.getIconFileName();

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchRepositoryFactory.java

@@ -7,6 +7,8 @@
 import hudson.XmlFile;
 import hudson.model.Action;
 import hudson.model.Job;
+import hudson.model.TaskListener;
+import org.jenkinsci.plugins.github.pullrequest.GitHubPRTrigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,6 +29,7 @@
  *
  * @author Kanstantsin Shautsou
  */
+@SuppressWarnings("unused")
 @Extension
 public class GitHubBranchRepositoryFactory
         extends GitHubRepositoryFactory<GitHubBranchRepositoryFactory, GitHubBranchTrigger> {
@@ -58,29 +61,38 @@ private static GitHubBranchRepository forProject(Job<?, ?> job) throws IOExcepti
         String githubUrl = property.getProjectUrl().toString();
 
         GitHubBranchRepository localRepository;
+        boolean created = false;
         if (configFile.exists()) {
             try {
                 localRepository = (GitHubBranchRepository) configFile.read();
             } catch (IOException e) {
                 LOGGER.info("Can't read saved repository, re-creating new one", e);
                 localRepository = new GitHubBranchRepository(repoFullName.toString(), new URL(githubUrl));
+                created = true;
             }
         } else {
             LOGGER.info("Creating new Branch Repository for '{}'", job.getFullName());
             localRepository = new GitHubBranchRepository(repoFullName.toString(), new URL(githubUrl));
+            created = true;
         }
 
         // set transient cached fields
         localRepository.setJob(job);
         localRepository.setConfigFile(configFile);
 
-        try {
-            localRepository.actualise(trigger.getRemoteRepository());
-            localRepository.save();
-        } catch (Throwable ignore) {
-            //silently try actualise
+
+        GitHubPRTrigger.DescriptorImpl prTriggerDescriptor = GitHubPRTrigger.DescriptorImpl.get();
+        if (prTriggerDescriptor.isActualiseOnFactory()) {
+            try {
+                localRepository.actualise(trigger.getRemoteRepository(), TaskListener.NULL);
+                created = true;
+            } catch (Throwable ignore) {
+                //silently try actualise
+            }
         }
 
+        if (created) localRepository.save();
+
         return localRepository;
     }
 

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/GitHubBranchTrigger.java

@@ -191,7 +191,7 @@ public void doRun(String branch) {
                     getDateTimeInstance().format(new Date(startTime)), localRepository.getFullName());
 
             try {
-                localRepository.actualise(getRemoteRepository());
+                localRepository.actualise(getRemoteRepository(), listener);
 
                 causes = readyToBuildCauses(localRepository, listener, branch);
 
@@ -200,7 +200,7 @@ public void doRun(String branch) {
                 // TODO print triggering to listener?
                 from(causes).filter(new JobRunnerForBranchCause(job, this)).toSet();
             } catch (Throwable t) {
-                listener.error("Can't end trigger check: '{}'", t);
+                listener.error("Can't end trigger check!", t);
             }
 
             long duration = System.currentTimeMillis() - startTime;
@@ -219,6 +219,11 @@ private List<GitHubBranchCause> readyToBuildCauses(GitHubBranchRepository localR
                                                        @Nullable String requestedBranch) {
         try {
             GitHub github = getRepoProvider().getGitHub(this);
+            if (isNull(github)) {
+                LOG.error("GitHub connection is null, check Repo Providers!");
+                throw new IllegalStateException("GitHub connection is null, check Repo Providers!");
+            }
+
             GHRateLimit rateLimitBefore = github.getRateLimit();
             listener.debug("GitHub rate limit before check: {}", rateLimitBefore);
 

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubRepository.java

@@ -5,6 +5,7 @@
 import hudson.model.Action;
 import hudson.model.Job;
 import hudson.model.Saveable;
+import hudson.model.TaskListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.util.FormValidation;
 import org.kohsuke.github.GHRepository;
@@ -15,6 +16,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.net.URL;
 
 import static java.util.Objects.isNull;
@@ -29,6 +31,7 @@ public abstract class GitHubRepository<T extends GitHubRepository> implements Ac
 
     protected transient XmlFile configFile; // for save()
     protected transient Job<?, ?> job;  // for UI
+    protected transient boolean changed; // for actualisation
 
     @CheckForNull
     private String fullName;
@@ -40,8 +43,8 @@ public abstract class GitHubRepository<T extends GitHubRepository> implements Ac
     @CheckForNull
     private String sshUrl;
 
-    public GitHubRepository(@Nonnull GHRepository ghRepository) {
-        actualise(ghRepository);
+    public GitHubRepository(@Nonnull GHRepository ghRepository) throws IOException {
+        actualise(ghRepository, TaskListener.NULL);
     }
 
     public GitHubRepository(String repoFullName, URL githubUrl) {
@@ -53,21 +56,38 @@ public GitHubRepository(String repoFullName, URL githubUrl) {
      * Repository may be created without gh connection, but trigger logic expects this fields.
      * Should be called before trigger logic starts checks.
      */
-    public void actualise(@Nonnull GHRepository ghRepository) {
-        if (isNull(fullName)) {
+    public void actualise(@Nonnull GHRepository ghRepository, @Nonnull TaskListener listener) throws IOException {
+        changed = false;
+
+        PrintStream logger = listener.getLogger();
+        // just in case your organisation decided to change domain
+        // take into account only repo/name
+        if (isNull(fullName) || !fullName.equals(ghRepository.getFullName())) {
+            logger.printf("Repository full name changed from '%s' to '%s'.\n", fullName, ghRepository.getFullName());
             fullName = ghRepository.getFullName();
+            changed = true;
         }
-        if (isNull(githubUrl)) {
+
+        if (isNull(githubUrl) || !githubUrl.equals(ghRepository.getHtmlUrl())) {
+            logger.printf("Changing GitHub url from '%s' to '%s'.\n", githubUrl, ghRepository.getHtmlUrl());
             githubUrl = ghRepository.getHtmlUrl();
         }
-        if (isNull(gitUrl)) {
+
+        if (isNull(gitUrl) || !gitUrl.equals(ghRepository.getGitTransportUrl())) {
+            logger.printf("Changing Git url from '%s' to '%s'.\n", gitUrl, ghRepository.getGitTransportUrl());
             gitUrl = ghRepository.getGitTransportUrl();
         }
-        if (isNull(sshUrl)) {
+
+        if (isNull(sshUrl) || !sshUrl.equals(ghRepository.getSshUrl())) {
+            logger.printf("Changing SSH url from '%s' to '%s'.\n", sshUrl, ghRepository.getSshUrl());
             sshUrl = ghRepository.getSshUrl();
         }
+
+        actualiseOnChange(ghRepository, listener);
     }
 
+    protected abstract void actualiseOnChange(@Nonnull GHRepository ghRepository, @Nonnull TaskListener listener);
+
     public String getFullName() {
         return fullName;
     }

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTrigger.java

@@ -108,6 +108,12 @@ public void setRepoName(GitHubRepositoryName repoName) {
         this.repoName = repoName;
     }
 
+    @Override
+    public void start(Job<?, ?> project, boolean newInstance) {
+        repoName = null; // reset cache
+        super.start(project, newInstance);
+    }
+
     @Beta
     @Nonnull
     public List<GitHubRepoProvider> getRepoProviders() {
@@ -152,11 +158,12 @@ public GitHubRepoProvider getRepoProvider() {
 
         if (isNull(repoProvider)) {
             getErrorsAction().addOrReplaceError(new GitHubRepoProviderError(
-                    String.format("Can't find repo provider for %s.<br/> All providers failed: %s", job.getName(), throwables)
+                    String.format("Can't find repo provider for %s.<br/> All providers failed: %s",
+                            job.getFullName(), throwables)
             ));
         }
 
-        checkState(nonNull(repoProvider), "Can't find repo provider for %s", job.getName());
+        checkState(nonNull(repoProvider), "Can't find repo provider for %s", job.getFullName());
         getErrorsAction().removeErrors(GitHubRepoProviderError.class);
 
         return repoProvider;
@@ -165,7 +172,7 @@ public GitHubRepoProvider getRepoProvider() {
     @Nonnull
     public GHRepository getRemoteRepository() throws IOException {
         GHRepository remoteRepository = getRepoProvider().getGHRepository(this);
-        checkState(nonNull(remoteRepository), "Can't get remote GH repo for %s", job.getName());
+        checkState(nonNull(remoteRepository), "Can't get remote GH repo for %s", job.getFullName());
         return remoteRepository;
     }
 
@@ -179,6 +186,7 @@ public GitHubErrorsAction getErrorsAction() {
 
     @Override
     public void stop() {
+        repoName = null;
         //TODO clean hooks?
         if (nonNull(job)) {
             LOG.info("Stopping '{}' for project '{}'", getDescriptor().getDisplayName(), job.getFullName());

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTriggerDescriptor.java

@@ -41,6 +41,8 @@ public SequentialExecutionQueue getQueue() {
 
     private String publishedURL;
 
+    private boolean actualiseOnFactory = false;
+
     public String getPublishedURL() {
         return publishedURL;
     }
@@ -49,6 +51,14 @@ public void setPublishedURL(String publishedURL) {
         this.publishedURL = publishedURL;
     }
 
+    public boolean isActualiseOnFactory() {
+        return actualiseOnFactory;
+    }
+
+    public void setActualiseOnFactory(boolean actualiseOnFactory) {
+        this.actualiseOnFactory = actualiseOnFactory;
+    }
+
     public String getJenkinsURL() {
         String url = getPublishedURL();
         if (isNotBlank(url)) {

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/multibranch/action/GitHubRepo.java

@@ -3,6 +3,7 @@
 import com.github.kostyasha.github.integration.branch.GitHubBranchRepository;
 import com.github.kostyasha.github.integration.tag.GitHubTagRepository;
 import hudson.model.Action;
+import hudson.model.TaskListener;
 import org.jenkinsci.plugins.github.pullrequest.GitHubPRRepository;
 import org.kohsuke.github.GHRepository;
 import org.slf4j.Logger;
@@ -36,7 +37,7 @@ public GitHubRepo(GitHubSCMSourcesLocalStorage owner) {
     /**
      * When remote side available.
      */
-    public GitHubRepo(GHRepository repository) {
+    public GitHubRepo(GHRepository repository) throws IOException {
         this(new GitHubBranchRepository(repository), new GitHubTagRepository(repository), new GitHubPRRepository(repository));
     }
 
@@ -86,12 +87,19 @@ public String getUrlName() {
     public void actualize(GHRepository remoteRepo) throws IOException {
         if (isNull(branchRepository)) {
             branchRepository = new GitHubBranchRepository(remoteRepo);
+        } else {
+            branchRepository.actualise(remoteRepo, TaskListener.NULL);
         }
+
         if (isNull(tagRepository)) {
             tagRepository = new GitHubTagRepository(remoteRepo);
+        } else  {
+            tagRepository.actualise(remoteRepo, TaskListener.NULL);
         }
         if (isNull(prRepository)) {
             prRepository = new GitHubPRRepository(remoteRepo);
+        } else {
+            prRepository.actualise(remoteRepo, TaskListener.NULL);
         }
 
         if (owner != null) {

github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/tag/GitHubTagRepository.java

@@ -1,6 +1,7 @@
 package com.github.kostyasha.github.integration.tag;
 
 import com.github.kostyasha.github.integration.generic.GitHubRepository;
+import hudson.model.TaskListener;
 import hudson.util.FormValidation;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.stapler.StaplerRequest;
@@ -30,7 +31,7 @@ public class GitHubTagRepository extends GitHubRepository<GitHubTagRepository> {
      *
      * @param remoteRepository remote repository full name.
      */
-    public GitHubTagRepository(GHRepository remoteRepository) {
+    public GitHubTagRepository(GHRepository remoteRepository) throws IOException {
         super(remoteRepository);
     }
 
@@ -59,6 +60,14 @@ public String getUrlName() {
         return "github-tag";
     }
 
+    @Override
+    public void actualiseOnChange(@Nonnull GHRepository ghRepository, @Nonnull TaskListener listener) {
+        if (changed) {
+            listener.getLogger().println("Local settings changed, removing tags in repository state!");
+            getTags().clear();
+        }
+    }
+
     @Override
     public FormValidation doClearRepo() throws IOException {
         return FormValidation.ok();

github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRPullRequest.java

@@ -106,7 +106,7 @@ public GitHubPRPullRequest(GHPullRequest pr) {
 
         // see https://github.com/kohsuke/github-api/issues/111
         try {
-            mergeable = execute(() -> pr.getMergeable());
+            mergeable = execute(pr::getMergeable);
         } catch (IOException e) {
             LOGGER.error("Can't get mergeable status.", e);
             mergeable = false;