Skip to content

The Unified and Autonomous Development Platform

feat: allow to add "-r" options to transfer directories for SCP step (#1416)

Robin Shenb1e14fbbf8d6
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
index 01c36ee551..3180f5c382 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SCPCommandStep.java
@@ -4,6 +4,7 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.ReservedOptions;
import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;
import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;
import io.onedev.server.model.Build;
@@ -26,6 +27,8 @@ public class SCPCommandStep extends CommandStep {
private String source;
private String target;
+
+ private String options;
@Editable(order=200, description="Specify a secret to be used as private key for SSH authentication")
@ChoiceProvider("getPrivateKeySecretChoices")
@@ -65,6 +68,16 @@ public class SCPCommandStep extends CommandStep {
this.target = target;
}
+ @Editable(order=500, description = "Optionally specify options for scp command. Multiple options need to be " +
+ "separated with space")
+ public String getOptions() {
+ return options;
+ }
+
+ public void setOptions(String options) {
+ this.options = options;
+ }
+
@Editable
@Override
public boolean isRunInContainer() {
@@ -74,7 +87,7 @@ public class SCPCommandStep extends CommandStep {
@Editable
@Override
public String getImage() {
- return "1dev/ssh-client:1.0.0";
+ return "1dev/ssh-client:1.0.1";
}
@Override
@@ -92,10 +105,14 @@ public class SCPCommandStep extends CommandStep {
"cat <<EOF>> /root/.ssh/id_rsa");
var privateKey = Build.get().getJobSecretAuthorizationContext().getSecretValue(getPrivateKeySecret());
commands.addAll(StringUtils.splitToLines(privateKey));
+ var scpBuilder = new StringBuilder("scp -o StrictHostKeyChecking=no ");
+ if (getOptions() != null)
+ scpBuilder.append(getOptions()).append(" ");
+ scpBuilder.append(getSource()).append(" ").append(getTarget());
commands.addAll(newArrayList(
"EOF",
"chmod 600 /root/.ssh/id_rsa",
- "scp -o StrictHostKeyChecking=no " + getSource() + " " + getTarget()));
+ scpBuilder.toString()));
return commands;
}
};
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
index 6ccbecc9e5..08e4d2e4be 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SSHCommandStep.java
@@ -94,7 +94,7 @@ public class SSHCommandStep extends CommandStep {
@Editable
@Override
public String getImage() {
- return "1dev/ssh-client:1.0.0";
+ return "1dev/ssh-client:1.0.1";
}
@Override