refactor: rename and refactor to clarify the unshallow execution paths

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java

@@ -17,7 +17,7 @@ public interface GitClient {
 
   boolean isShallow() throws IOException, TimeoutException, InterruptedException;
 
-  void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit)
+  void unshallow(@Nullable String remoteCommitReference, boolean shallowUntilCommit)
       throws IOException, TimeoutException, InterruptedException;
 
   @Nullable

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitRepoUnshallow.java

@@ -20,14 +20,27 @@ public GitRepoUnshallow(Config config, GitClient gitClient) {
     this.gitClient = gitClient;
   }
 
-  public synchronized boolean unshallow(@Nullable String commit)
+  /**
+   * Unshallows git repo up to a specific boundary commit, if provided, or up to the time limit
+   * configured in the git client if not.
+   *
+   * @param boundaryCommitSha used as boundary for the unshallowing if provided.
+   * @return false if unshallowing is not enabled or unnecessary, true otherwise
+   */
+  public synchronized boolean unshallow(@Nullable String boundaryCommitSha)
       throws IOException, InterruptedException, TimeoutException {
     if (!config.isCiVisibilityGitUnshallowEnabled() || !gitClient.isShallow()) {
       return false;
     }
 
     long unshallowStart = System.currentTimeMillis();
-    if (commit == null) {
+    if (boundaryCommitSha != null) {
+      try {
+        gitClient.unshallow(boundaryCommitSha, true);
+      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
+        LOGGER.debug("Could not unshallow to specific boundary {}", boundaryCommitSha, e);
+      }
+    } else {
       try {
         gitClient.unshallow(GitClient.HEAD, false);
       } catch (ShellCommandExecutor.ShellCommandFailedException e) {
@@ -45,12 +58,6 @@ public synchronized boolean unshallow(@Nullable String commit)
             e);
         gitClient.unshallow(null, false);
       }
-    } else {
-      try {
-        gitClient.unshallow(commit, true);
-      } catch (ShellCommandExecutor.ShellCommandFailedException e) {
-        LOGGER.debug("Could not unshallow specific commit {}", commit, e);
-      }
     }
     LOGGER.debug("Repository unshallowing took {} ms", System.currentTimeMillis() - unshallowStart);
     return true;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/NoOpGitClient.java

@@ -21,7 +21,7 @@ public boolean isShallow() {
   }
 
   @Override
-  public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit) {
+  public void unshallow(@Nullable String remoteCommitReference, boolean shallowUntilCommit) {
     // no op
   }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/ShellGitClient.java

@@ -129,24 +129,28 @@ public String getUpstreamBranchSha() throws IOException, TimeoutException, Inter
    *
    * @param remoteCommitReference The commit to fetch from the remote repository, so local repo will
    *     be updated with this commit and its ancestors. If {@code null}, everything will be fetched.
-   * @param onlyFetchCommit Only fetch the specific commit provided.
+   * @param shallowUntilCommit Only unshallow up until the commit provided, or use the time limit
+   *     configured if not. Ignored if no reference is provided.
    * @throws IOException If an error was encountered while writing command input or reading output
    * @throws TimeoutException If timeout was reached while waiting for Git command to finish
    * @throws InterruptedException If current thread was interrupted while waiting for Git command to
    *     finish
    */
   @Override
-  public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchCommit)
+  public void unshallow(@Nullable String remoteCommitReference, boolean shallowUntilCommit)
       throws IOException, TimeoutException, InterruptedException {
     executeCommand(
         Command.UNSHALLOW,
         () -> {
           String remote = getRemoteName();
 
           // refetch data from the server for the given period of time
-          if (remoteCommitReference != null && GitUtils.isValidRef(remoteCommitReference)) {
-            String onlyFetchCommitArg =
-                onlyFetchCommit
+          if (remoteCommitReference != null) {
+            if (!GitUtils.isValidRef(remoteCommitReference)) {
+              return (Void) null;
+            }
+            String boundaryArg =
+                shallowUntilCommit
                     ? "--no-write-fetch-head"
                     : String.format("--shallow-since='%s'", latestCommitsSince);
             String commitSha = getSha(remoteCommitReference);
@@ -157,7 +161,7 @@ public void unshallow(@Nullable String remoteCommitReference, boolean onlyFetchC
                 "--update-shallow",
                 "--filter=blob:none",
                 "--recurse-submodules=no",
-                onlyFetchCommitArg,
+                boundaryArg,
                 remote,
                 commitSha);
           } else {