Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring various methods receiving command line

Robin Shen9ff2b3e4e8a3
diff --git a/pom.xml b/pom.xml
index d02eddabec..8c3ee13cde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.2.9</commons.version>
- <agent.version>2.5.5</agent.version>
+ <commons.version>3.2.10</commons.version>
+ <agent.version>2.5.6</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
index 1a7fb62a1b..52af065579 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
@@ -152,6 +152,9 @@ public abstract class SyncRepository extends ServerSideStep {
return remoteUrlWithCredentials;
}
+ /**
+ * This method adds proxy arguments to provided git command line
+ */
protected static void configureProxy(Commandline git, @Nullable String proxy) {
if (proxy != null)
git.addArgs("-c", "http.proxy=" + proxy, "-c", "https.proxy=" + proxy);
diff --git a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
index 0692e775ef..acfbcfb0a1 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/RevListOptions.java
@@ -156,6 +156,9 @@ public class RevListOptions implements Serializable {
return this;
}
+ /**
+ * This method adds arguments to provided git command line based on current options
+ */
public void configure(Commandline git) {
boolean hasRevisions = false;
if (!revisions().isEmpty()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
index d6cb6082f5..6d15dd83fa 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/workspaceprovisioner/WorkspaceProvisioner.java
@@ -9,7 +9,6 @@ import static java.util.stream.Collectors.toMap;
import java.io.File;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -127,13 +126,6 @@ public abstract class WorkspaceProvisioner implements Serializable {
initRepository(git, infoLogger, warningLogger);
- var remoteAccessArgs = new ArrayList<String>();
- var trustCertsFile = new File(workspaceDir, "trust-certs.pem");
- remoteAccessArgs.addAll(setupGitCerts(git, Bootstrap.getTrustCertsDir(), trustCertsFile,
- runtimeWorkspaceDirPath + "/" + trustCertsFile.getName(), infoLogger, warningLogger));
- remoteAccessArgs.addAll(cloneInfo.setupGitAuth(git, workspaceDir, runtimeWorkspaceDirPath,
- infoLogger, warningLogger));
-
git.args("-c", "safe.directory=*", "config", "user.name", context.getUserName());
git.execute(infoLogger, warningLogger).checkReturnCode();
@@ -158,10 +150,16 @@ public abstract class WorkspaceProvisioner implements Serializable {
}, warningLogger).checkReturnCode();
+ git.clearArgs();
+ var trustCertsFile = new File(workspaceDir, "trust-certs.pem");
+ setupGitCerts(git, Bootstrap.getTrustCertsDir(), trustCertsFile,
+ runtimeWorkspaceDirPath + "/" + trustCertsFile.getName(), infoLogger, warningLogger);
+ cloneInfo.setupGitAuth(git, workspaceDir, runtimeWorkspaceDirPath,
+ infoLogger, warningLogger);
+
if (noCommits.get()) {
if (context.getBranch() != null) {
logger.log("Cloning repository...");
- git.args(remoteAccessArgs);
cloneRepository(git, context.getProjectGitDir(), cloneInfo.getCloneUrl(),
GitUtils.branch2ref(context.getBranch()), null,
context.getSpec().isRetrieveLfs(), false, 0,
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 5bfbe8eb50..175cac9d08 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -4,7 +4,6 @@ import static io.onedev.agent.AgentUtils.buildImage;
import static io.onedev.agent.AgentUtils.callWithRegistryLogins;
import static io.onedev.agent.AgentUtils.changeOwner;
import static io.onedev.agent.AgentUtils.createNetwork;
-import static io.onedev.agent.AgentUtils.deleteDir;
import static io.onedev.agent.AgentUtils.deleteNetwork;
import static io.onedev.agent.AgentUtils.getEntrypointArgs;
import static io.onedev.agent.AgentUtils.getOsIds;
@@ -548,16 +547,14 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te
initRepository(git, infoLogger, warningLogger);
- var remoteAccessArgs = new ArrayList<String>();
- remoteAccessArgs.addAll(setupGitCerts(git, Bootstrap.getTrustCertsDir(),
+ git.clearArgs();
+ setupGitCerts(git, Bootstrap.getTrustCertsDir(),
new File(hostBuildDir, "trust-certs.pem"),
- containerTrustCertsFilePath, infoLogger, warningLogger));
+ containerTrustCertsFilePath, infoLogger, warningLogger);
CloneInfo cloneInfo = checkoutFacade.getCloneInfo();
- remoteAccessArgs.addAll(cloneInfo.setupGitAuth(git, hostBuildDir, containerBuildDirPath,
- infoLogger, warningLogger));
-
- git.args(remoteAccessArgs);
+ cloneInfo.setupGitAuth(git, hostBuildDir, containerBuildDirPath,
+ infoLogger, warningLogger);
int cloneDepth = checkoutFacade.getCloneDepth();
@@ -608,7 +605,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te
} finally {
SecretMasker.pop();
synchronized (hostBuildDir) {
- deleteDir(hostBuildDir, newDocker(), Bootstrap.isInDocker(), jobLogger);
+ FileUtils.deleteDir(hostBuildDir);
}
}
}
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index e7886903b0..e45bdba083 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -230,18 +230,14 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
checkoutFacade.setupWorkingDir(git, workDir);
initRepository(git, infoLogger, warningLogger);
- var remoteAccessArgs = new ArrayList<String>();
-
+ git.clearArgs();
var trustCertsFile = new File(buildDir, "trust-certs.pem");
- remoteAccessArgs.addAll(setupGitCerts(git, Bootstrap.getTrustCertsDir(), trustCertsFile,
- trustCertsFile.getAbsolutePath(), infoLogger, warningLogger));
+ setupGitCerts(git, Bootstrap.getTrustCertsDir(), trustCertsFile,
+ trustCertsFile.getAbsolutePath(), infoLogger, warningLogger);
var cloneInfo = checkoutFacade.getCloneInfo();
- remoteAccessArgs.addAll(cloneInfo.setupGitAuth(git, buildDir, buildDir.getAbsolutePath(),
- infoLogger, warningLogger));
+ cloneInfo.setupGitAuth(git, buildDir, buildDir.getAbsolutePath(), infoLogger, warningLogger);
- git.args(remoteAccessArgs);
-
cloneRepository(git, jobContext.getProjectGitDir(), cloneInfo.getCloneUrl(),
jobContext.getRefName(), jobContext.getCommitId().name(),
checkoutFacade.isWithLfs(), checkoutFacade.isWithSubmodules(),