[JENKINS-64810] Add creation time boundaries to tags for discovery

src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java

@@ -170,7 +170,7 @@
 
     public AbstractGitSCMSource() {
     }
-    
+
     @Deprecated
     public AbstractGitSCMSource(String id) {
         setId(id);
@@ -635,7 +635,9 @@
                         discoverBranches(repository, walk, request, remoteReferences);
                     }
                     if (context.wantTags()) {
-                        discoverTags(repository, walk, request, remoteReferences);
+                        discoverTags(repository, walk, request, remoteReferences,
+                                context.getAtLeastTagCommitTimeMillis(),
+                                context.getAtMostTagCommitTimeMillis());
                     }
                     if (context.wantOtherRefs()) {
                         discoverOtherRefs(repository, walk, request, remoteReferences,
@@ -775,7 +777,9 @@
 
             private void discoverTags(final Repository repository,
                                           final RevWalk walk, GitSCMSourceRequest request,
-                                          Map<String, ObjectId> remoteReferences)
+                                          Map<String, ObjectId> remoteReferences,
+                                          long atLeastMillis,
+                                          long atMostMillis)
                     throws IOException, InterruptedException {
                 listener.getLogger().println("Checking tags...");
                 walk.setRetainBody(false);
@@ -788,6 +792,27 @@
                     final String tagName = StringUtils.removeStart(ref.getKey(), Constants.R_TAGS);
                     RevCommit commit = walk.parseCommit(ref.getValue());
                     final long lastModified = TimeUnit.SECONDS.toMillis(commit.getCommitTime());
+
+                    if (atLeastMillis >= 0L || atMostMillis >= 0L) {
+                        if (atMostMillis >= 0L && atLeastMillis > atMostMillis) {
+                            /* Invalid. It's impossible for any tag to satisfy this. */
+                            listener.getLogger().format("  Skipping tag %s: invalid age range (min > max)%n", tagName);
+                            continue;
+                        }
+                        long tagAgeMillis = System.currentTimeMillis() - lastModified;
+                        long tagAgeDays = TimeUnit.MILLISECONDS.toDays(tagAgeMillis);
+                        if (atMostMillis >= 0L && tagAgeMillis > atMostMillis) {
+                            listener.getLogger().format("  Skipping tag %s: too old (%d days, max %d days)%n",
+                                    tagName, tagAgeDays, TimeUnit.MILLISECONDS.toDays(atMostMillis));
+                            continue;
+                        }
+                        if (atLeastMillis >= 0L && tagAgeMillis < atLeastMillis) {
+                            listener.getLogger().format("  Skipping tag %s: too new (%d days, min %d days)%n",
+                                    tagName, tagAgeDays, TimeUnit.MILLISECONDS.toDays(atLeastMillis));
+                            continue;
+                        }
+                    }
+
                     if (request.process(new GitTagSCMHead(tagName, lastModified),
                             new SCMSourceRequest.IntermediateLambda<ObjectId>() {
                                 @Nullable

src/main/java/jenkins/plugins/git/GitSCMSourceContext.java

@@ -37,6 +37,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -95,6 +96,10 @@ public class GitSCMSourceContext<C extends GitSCMSourceContext<C, R>, R extends
     @NonNull
     private String remoteName = AbstractGitSCMSource.DEFAULT_REMOTE_NAME;
 
+    private long atLeastTagCommitTimeMillis = -1L;
+
+    private long atMostTagCommitTimeMillis = -1L;
+
     /**
      * Constructor.
      *
@@ -192,6 +197,14 @@ public final String remoteName() {
         return remoteName;
     }
 
+    public final long getAtLeastTagCommitTimeMillis() {
+        return atLeastTagCommitTimeMillis;
+    }
+
+    public final long getAtMostTagCommitTimeMillis() {
+        return atMostTagCommitTimeMillis;
+    }
+
     /**
      * Adds a requirement for branch details to any {@link GitSCMSourceRequest} for this context.
      *
@@ -358,6 +371,29 @@ public final List<RefSpec> asRefSpecs() {
         return result;
     }
 
+    private long getTagCommitTimeLimitMillisFromDays(String limitDays) {
+        try {
+            long tagCommitTimeLimit = Long.parseLong(StringUtils.defaultIfBlank(limitDays, "-1"));
+            return tagCommitTimeLimit < 0 ? -1L : TimeUnit.DAYS.toMillis(tagCommitTimeLimit);
+        } catch (NumberFormatException e) {
+            return -1L;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @NonNull
+    public final C withAtLeastTagCommitTimeDays(String atLeastDays) {
+        this.atLeastTagCommitTimeMillis = getTagCommitTimeLimitMillisFromDays(atLeastDays);
+        return (C) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @NonNull
+    public final C withAtMostTagCommitTimeDays(String atMostDays) {
+        this.atMostTagCommitTimeMillis = getTagCommitTimeLimitMillisFromDays(atMostDays);
+        return (C) this;
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/jenkins/plugins/git/traits/TagDiscoveryTrait.java

@@ -23,6 +23,7 @@
  */
 package jenkins.plugins.git.traits;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import jenkins.plugins.git.GitSCMBuilder;
@@ -51,11 +52,20 @@
  * @since 3.6.0
  */
 public class TagDiscoveryTrait extends SCMSourceTrait {
+    private final String atLeastDays;
+    private final String atMostDays;
+
     /**
      * Constructor for stapler.
      */
     @DataBoundConstructor
+    public TagDiscoveryTrait(@CheckForNull String atLeastDays, @CheckForNull String atMostDays) {
+        this.atLeastDays = atLeastDays;
+        this.atMostDays = atMostDays;
+    }
+
     public TagDiscoveryTrait() {
+        this(null, null);
     }
 
     /**
@@ -66,6 +76,8 @@
         GitSCMSourceContext<?,?> ctx = (GitSCMSourceContext<?, ?>) context;
         ctx.wantTags(true);
         ctx.withAuthority(new TagSCMHeadAuthority());
+        ctx.withAtLeastTagCommitTimeDays(atLeastDays)
+                .withAtMostTagCommitTimeDays(atMostDays);
     }
 
     /**
@@ -76,6 +88,14 @@
         return category instanceof TagSCMHeadCategory;
     }
 
+    public String getAtLeastDays() {
+        return atLeastDays;
+    }
+
+    public String getAtMostDays() {
+        return atMostDays;
+    }
+
     /**
      * Our descriptor.
      */

src/main/resources/jenkins/plugins/git/traits/TagDiscoveryTrait/config.jelly

@@ -1,4 +1,10 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:c="/lib/credentials"
          xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+    <f:entry field="atLeastDays" title="${%Ignore tags newer than}">
+        <f:number min="0"/>
+    </f:entry>
+    <f:entry field="atMostDays" title="${%Ignore tags older than}">
+        <f:number min="0"/>
+    </f:entry>
 </j:jelly>

src/main/resources/jenkins/plugins/git/traits/TagDiscoveryTrait/help-atLeastDays.html

@@ -0,0 +1,15 @@
+<div>
+    Minimum age of tags (in days) to <strong>include</strong> when discovering tags.
+    Tags newer than this value are ignored.
+    Tag age is calculated from the tag creation / commit timestamp to the time the
+    scan runs.
+    Leave this field blank to <strong>not</strong> filter out tags based on a minimum age
+    (no lower age bound).
+    Examples:
+    <ul>
+        <li><code>7</code> – ignore tags created in the last 7 days (only tags at least 7 days old are used).</li>
+        <li><code>0</code> – do not ignore tags for being too new (equivalent to leaving it blank).</li>
+    </ul>
+    When used together with <em>Ignore tags older than</em> (<code>atMostDays</code>),
+    this value should be less than or equal to the <em>older than</em> value to define a valid age range.
+</div>

src/main/resources/jenkins/plugins/git/traits/TagDiscoveryTrait/help-atMostDays.html

@@ -0,0 +1,16 @@
+<div>
+    Maximum age of tags (in days) to <strong>include</strong> when discovering tags.
+    Tags older than this value are ignored.
+    Tag age is calculated from the tag creation / commit timestamp to the time the
+    scan runs.
+    Leave this field blank to <strong>not</strong> filter out tags based on a maximum age
+    (no upper age bound).
+    Examples:
+    <ul>
+        <li><code>7</code> – ignore tags older than 7 days (only tags from the last 7 days are used).</li>
+        <li><code>30</code> – ignore tags older than 30 days (only tags from the last 30 days are used).</li>
+    </ul>
+    When used together with <em>Ignore tags newer than</em> (<code>atLeastDays</code>),
+    this value should be greater than or equal to the <em>newer than</em> value so that the
+    age range is consistent.
+</div>

src/test/java/jenkins/plugins/git/AbstractGitSCMSourceTest.java

@@ -36,6 +36,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import jenkins.plugins.git.junit.jupiter.WithGitSampleRepo;
 import jenkins.plugins.git.traits.BranchDiscoveryTrait;
@@ -291,6 +292,34 @@ void retrieveHeadsSupportsTagDiscovery_onlyTagsWithoutBranchDiscoveryTrait() thr
         assertEquals("[SCMHead{'annotated'}, SCMHead{'lightweight'}]", source.fetch(listener).toString());
     }
 
+    @Issue("JENKINS-64810")
+    @Test
+    void retrieveHeadsSupportsTagDiscovery_withTagAgeRestrictions() throws Exception {
+        assumeTrue(isTimeAvailable(), "Test class max time " + MAX_SECONDS_FOR_THESE_TESTS + " exceeded");
+        sampleRepo.init();
+        sampleRepo.write("file", "initial");
+        sampleRepo.git("commit", "--all", "--message=initial");
+        sampleRepo.git("tag", "test-tag");
+
+        GitSCMSource source = new GitSCMSource(sampleRepo.toString());
+        TaskListener listener = StreamTaskListener.fromStderr();
+
+        source.setTraits(Collections.singletonList(new TagDiscoveryTrait()));
+        assertThat(source.fetch(listener).stream().map(SCMHead::getName).collect(Collectors.toSet()), contains("test-tag"));
+
+        source.setTraits(Collections.singletonList(new TagDiscoveryTrait(null, "0")));
+        assertThat(source.fetch(listener).stream().map(SCMHead::getName).collect(Collectors.toSet()), not(contains("test-tag")));
+
+        source.setTraits(Collections.singletonList(new TagDiscoveryTrait("1", null)));
+        assertThat(source.fetch(listener).stream().map(SCMHead::getName).collect(Collectors.toSet()), not(contains("test-tag")));
+
+        source.setTraits(Collections.singletonList(new TagDiscoveryTrait("1", "0")));
+        assertThat(source.fetch(listener), empty());
+
+        source.setTraits(Collections.singletonList(new TagDiscoveryTrait("apple", "banana")));
+        assertThat(source.fetch(listener).stream().map(SCMHead::getName).collect(Collectors.toSet()), contains("test-tag"));
+    }
+
     @Issue("JENKINS-45953")
     @Test
     void retrieveRevisions() throws Exception {