Skip to content

The Unified and Autonomous Development Platform

fix: K8s workspace provisioner mishaviors

Robin Shena770a4e66978
diff --git a/pom.xml b/pom.xml
index 5baed9d9aa..d063129525 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,7 +310,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.17.0</version>
+ <version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.3.4</commons.version>
- <agent.version>3.0.0</agent.version>
+ <commons.version>3.3.6</commons.version>
+ <agent.version>3.0.2</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/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 6759885e67..d7b4f51c37 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -1,7 +1,37 @@
package io.onedev.server.commandhandler;
+import static io.onedev.server.persistence.PersistenceUtils.callWithLock;
+import static io.onedev.server.persistence.PersistenceUtils.newSiteLibClassLoader;
+import static io.onedev.server.persistence.PersistenceUtils.openConnection;
+import static java.lang.Integer.parseInt;
+import static java.lang.String.valueOf;
+import static java.lang.System.lineSeparator;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.io.FileUtils.writeStringToFile;
+import static org.hibernate.cfg.AvailableSettings.DIALECT;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.Strings;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
+
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPlugin;
import io.onedev.commons.utils.ExplicitException;
@@ -12,33 +42,9 @@ import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.OneDev;
import io.onedev.server.data.migration.DataMigrator;
import io.onedev.server.data.migration.MigrationHelper;
+import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.exception.ExceptionUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Singleton;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.Callable;
-
-import static io.onedev.server.persistence.PersistenceUtils.*;
-import static java.lang.Integer.parseInt;
-import static java.lang.String.valueOf;
-import static java.lang.System.lineSeparator;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.io.FileUtils.writeStringToFile;
-import static org.hibernate.cfg.AvailableSettings.DIALECT;
@Singleton
public class Upgrade extends AbstractPlugin {
@@ -276,7 +282,7 @@ public class Upgrade extends AbstractPlugin {
File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, UTF_8);
if (hibernateProps.contains("sampledb")) {
- hibernateProps = StringUtils.replace(hibernateProps, "sampledb", "internaldb");
+ hibernateProps = Strings.CS.replace(hibernateProps, "sampledb", "internaldb");
writeStringToFile(hibernatePropsFile, hibernateProps, UTF_8);
}
} catch (IOException e) {
@@ -629,7 +635,7 @@ public class Upgrade extends AbstractPlugin {
}
}
if (runAsUserLine != null)
- serverScript = StringUtils.replace(serverScript, runAsUserLine, siteRunAsUserLine);
+ serverScript = Strings.CS.replace(serverScript, runAsUserLine, siteRunAsUserLine);
}
String siteFilesToSourceLine = null;
@@ -648,7 +654,7 @@ public class Upgrade extends AbstractPlugin {
}
}
if (filesToSourceLine != null)
- serverScript = StringUtils.replace(serverScript, filesToSourceLine, siteFilesToSourceLine);
+ serverScript = Strings.CS.replace(serverScript, filesToSourceLine, siteFilesToSourceLine);
}
}
if (serverScript != null)
@@ -923,18 +929,18 @@ public class Upgrade extends AbstractPlugin {
try {
File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
String wrapperConf = FileUtils.readFileToString(wrapperConfFile, UTF_8);
- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",
+ wrapperConf = Strings.CS.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",
"io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",
+ wrapperConf = Strings.CS.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",
"io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",
+ wrapperConf = Strings.CS.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",
"io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",
+ wrapperConf = Strings.CS.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",
"io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap",
+ wrapperConf = Strings.CS.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap",
"io.onedev.commons.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");
- wrapperConf = StringUtils.replace(wrapperConf, "-XX:+IgnoreUnrecognizedVMOptions",
+ wrapperConf = Strings.CS.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");
+ wrapperConf = Strings.CS.replace(wrapperConf, "-XX:+IgnoreUnrecognizedVMOptions",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED");
if (!wrapperConf.contains("java.base/jdk.internal.ref=ALL-UNNAMED")) {
wrapperConf += ""
@@ -985,46 +991,46 @@ public class Upgrade extends AbstractPlugin {
File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, UTF_8);
- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",
+ hibernateProps = Strings.CS.replace(hibernateProps, "hibernate.hikari.autoCommit=false",
"hibernate.hikari.autoCommit=true");
- hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");
- hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev");
+ hibernateProps = Strings.CS.replace(hibernateProps, "GitPlex", "OneDev");
+ hibernateProps = Strings.CS.replace(hibernateProps, "TurboDev", "OneDev");
if (!hibernateProps.contains("hsqldb.lob_file_scale")) {
- hibernateProps = StringUtils.replace(hibernateProps, "internaldb/onedev;",
+ hibernateProps = Strings.CS.replace(hibernateProps, "internaldb/onedev;",
"internaldb/onedev;hsqldb.lob_file_scale=4;");
}
if (!hibernateProps.contains("hsqldb.lob_compressed")) {
- hibernateProps = StringUtils.replace(hibernateProps, "internaldb/onedev;",
+ hibernateProps = Strings.CS.replace(hibernateProps, "internaldb/onedev;",
"internaldb/onedev;hsqldb.lob_compressed=true;");
}
if (!hibernateProps.contains("hsqldb.tx")) {
- hibernateProps = StringUtils.replace(hibernateProps, "internaldb/onedev;",
+ hibernateProps = Strings.CS.replace(hibernateProps, "internaldb/onedev;",
"internaldb/onedev;hsqldb.tx=mvcc;");
}
if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {
- hibernateProps = StringUtils.replace(hibernateProps,
+ hibernateProps = Strings.CS.replace(hibernateProps,
"hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",
"hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"
+ "hibernate.connection.autocommit=true");
}
- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.connection.autocommit=true", "");
- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.leakDetectionThreshold=1800000", "");
- hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.ehcache.EhCacheRegionFactory",
+ hibernateProps = Strings.CS.replace(hibernateProps, "hibernate.connection.autocommit=true", "");
+ hibernateProps = Strings.CS.replace(hibernateProps, "hibernate.hikari.leakDetectionThreshold=1800000", "");
+ hibernateProps = Strings.CS.replace(hibernateProps, "org.hibernate.cache.ehcache.EhCacheRegionFactory",
"com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");
- hibernateProps = StringUtils.replace(hibernateProps, "org.hibernate.cache.jcache.JCacheRegionFactory",
+ hibernateProps = Strings.CS.replace(hibernateProps, "org.hibernate.cache.jcache.JCacheRegionFactory",
"com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory");
if (!hibernateProps.contains("hibernate.cache.auto_evict_collection_cache=true")) {
hibernateProps += "hibernate.cache.auto_evict_collection_cache=true\r\n";
hibernateProps += "hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider\r\n";
hibernateProps += "hibernate.javax.cache.missing_cache_strategy=create\r\n";
}
- hibernateProps = StringUtils.replace(hibernateProps,
+ hibernateProps = Strings.CS.replace(hibernateProps,
"hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider",
"");
- hibernateProps = StringUtils.replace(hibernateProps,
+ hibernateProps = Strings.CS.replace(hibernateProps,
"hibernate.javax.cache.missing_cache_strategy=create",
"");
@@ -1055,21 +1061,21 @@ public class Upgrade extends AbstractPlugin {
logbackConfigFile = new File(upgradeDir, "conf/logback.xml");
logbackConfig = FileUtils.readFileToString(logbackConfigFile, UTF_8);
- logbackConfig = StringUtils.replace(logbackConfig,
+ logbackConfig = Strings.CS.replace(logbackConfig,
"<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",
"<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");
- logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");
- logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");
- logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");
+ logbackConfig = Strings.CS.replace(logbackConfig, "gitplex", "turbodev");
+ logbackConfig = Strings.CS.replace(logbackConfig, "com.turbodev", "io.onedev");
+ logbackConfig = Strings.CS.replace(logbackConfig, "turbodev", "onedev");
if (!logbackConfig.contains("MaskingPatternLayout")) {
- logbackConfig = StringUtils.replace(logbackConfig,
+ logbackConfig = Strings.CS.replace(logbackConfig,
"ch.qos.logback.classic.encoder.PatternLayoutEncoder",
"ch.qos.logback.core.encoder.LayoutWrappingEncoder");
- logbackConfig = StringUtils.replace(logbackConfig,
+ logbackConfig = Strings.CS.replace(logbackConfig,
"<pattern>",
"<layout class=\"io.onedev.commons.bootstrap.MaskingPatternLayout\">\n <pattern>");
- logbackConfig = StringUtils.replace(logbackConfig,
+ logbackConfig = Strings.CS.replace(logbackConfig,
"</pattern>",
"</pattern>\n </layout>");
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 522a2ec970..943dfb4b57 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -38,6 +38,7 @@ import java.util.regex.Pattern;
import javax.inject.Singleton;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.digest.BuiltinDigests;
@@ -69,9 +70,9 @@ import io.onedev.server.service.SettingService;
import io.onedev.server.ssh.SshKeyUtils;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.SiteSyncUtils;
import io.onedev.server.util.Pair;
import io.onedev.server.util.ParsedEmailAddress;
+import io.onedev.server.util.SiteSyncUtils;
import io.onedev.server.util.patternset.PatternSet;
import oshi.SystemInfo;
import oshi.hardware.HardwareAbstractionLayer;
@@ -108,24 +109,24 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.commons.hibernate.migration.VersionTable",
"com.gitplex.server.model.ModelVersion");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.entity.support.IntegrationPolicy",
"com.gitplex.server.model.support.IntegrationPolicy");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.entity.PullRequest_-IntegrationStrategy",
"com.gitplex.server.model.PullRequest_-IntegrationStrategy");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.entity.", "com.gitplex.server.model.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.setting.SpecifiedGit", "com.gitplex.server.git.config.SpecifiedGit");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.setting.SystemGit", "com.gitplex.server.git.config.SystemGit");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");
FileUtils.writeStringToFile(file, content, UTF_8);
@@ -238,7 +239,7 @@ public class DataMigrator {
File renamedFile = new File(dataDir, file.getName().replace("Accounts.xml", "Users.xml"));
FileUtils.moveFile(file, renamedFile);
String content = FileUtils.readFileToString(renamedFile, UTF_8);
- content = StringUtils.replace(content, "com.gitplex.server.model.Account",
+ content = Strings.CS.replace(content, "com.gitplex.server.model.Account",
"com.gitplex.server.model.User");
VersionedXmlDoc dom = VersionedXmlDoc.fromXML(content);
for (Element element : dom.getRootElement().elements()) {
@@ -267,7 +268,7 @@ public class DataMigrator {
File renamedFile = new File(dataDir, file.getName().replace("Depots.xml", "Projects.xml"));
FileUtils.moveFile(file, renamedFile);
String content = FileUtils.readFileToString(renamedFile, UTF_8);
- content = StringUtils.replace(content, "com.gitplex.server.model.Depot",
+ content = Strings.CS.replace(content, "com.gitplex.server.model.Depot",
"com.gitplex.server.model.Project");
VersionedXmlDoc dom = VersionedXmlDoc.fromXML(content);
for (Element element : dom.getRootElement().elements()) {
@@ -422,8 +423,8 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content, "gitplex", "turbodev");
- content = StringUtils.replace(content, "GitPlex", "TurboDev");
+ content = Strings.CS.replace(content, "gitplex", "turbodev");
+ content = Strings.CS.replace(content, "GitPlex", "TurboDev");
FileUtils.writeFile(file, content, UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -454,11 +455,11 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content, "com.turbodev", "io.onedev");
- content = StringUtils.replace(content, "com/turbodev", "io/onedev");
- content = StringUtils.replace(content, "turbodev.com", "onedev.io");
- content = StringUtils.replace(content, "turbodev", "onedev");
- content = StringUtils.replace(content, "TurboDev", "OneDev");
+ content = Strings.CS.replace(content, "com.turbodev", "io.onedev");
+ content = Strings.CS.replace(content, "com/turbodev", "io/onedev");
+ content = Strings.CS.replace(content, "turbodev.com", "onedev.io");
+ content = Strings.CS.replace(content, "turbodev", "onedev");
+ content = Strings.CS.replace(content, "TurboDev", "OneDev");
FileUtils.writeFile(file, content, UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -604,9 +605,9 @@ public class DataMigrator {
} else if (file.getName().startsWith("UserAuthorizations.xml") || file.getName().startsWith("GroupAuthorizations.xml")) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content, "ADMIN", "ADMINISTRATION");
- content = StringUtils.replace(content, "WRITE", "CODE_WRITE");
- content = StringUtils.replace(content, "READ", "CODE_READ");
+ content = Strings.CS.replace(content, "ADMIN", "ADMINISTRATION");
+ content = Strings.CS.replace(content, "WRITE", "CODE_WRITE");
+ content = Strings.CS.replace(content, "READ", "CODE_READ");
FileUtils.writeFile(file, content, UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -680,7 +681,7 @@ public class DataMigrator {
} catch (IOException e) {
throw new RuntimeException(e);
}
- content = StringUtils.replace(content, "io.onedev.server.security.authenticator.",
+ content = Strings.CS.replace(content, "io.onedev.server.security.authenticator.",
"io.onedev.server.model.support.authenticator.");
VersionedXmlDoc dom = VersionedXmlDoc.fromXML(content);
for (Element element : dom.getRootElement().elements()) {
@@ -1784,9 +1785,9 @@ public class DataMigrator {
if (file.getName().contains(".xml")) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content, "io.onedev.server.issue.",
+ content = Strings.CS.replace(content, "io.onedev.server.issue.",
"io.onedev.server.model.support.issue.");
- content = StringUtils.replace(content, "io.onedev.server.util.inputspec.",
+ content = Strings.CS.replace(content, "io.onedev.server.util.inputspec.",
"io.onedev.server.model.support.inputspec.");
FileUtils.writeFile(file, content, UTF_8);
} catch (IOException e) {
@@ -2038,16 +2039,16 @@ public class DataMigrator {
if (file.getName().startsWith("Settings.xml")) {
try {
String content = FileUtils.readFileToString(file, UTF_8.name());
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.administration.authenticator.ldap.",
"io.onedev.server.plugin.authenticator.ldap.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequest",
"io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequestTrigger");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.transitiontrigger.MergePullRequest",
"io.onedev.server.model.support.issue.transitiontrigger.MergePullRequestTrigger");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequest",
"io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequestTrigger");
FileUtils.writeFile(file, content, UTF_8);
@@ -2102,9 +2103,9 @@ public class DataMigrator {
} else if (file.getName().startsWith("PullRequestBuilds.xml")) {
try {
String content = FileUtils.readFileToString(file, UTF_8.name());
- content = StringUtils.replace(content, "PullRequestBuild", "PullRequestVerification");
+ content = Strings.CS.replace(content, "PullRequestBuild", "PullRequestVerification");
FileUtils.deleteFile(file);
- String newFileName = StringUtils.replace(file.getName(), "PullRequestBuild", "PullRequestVerification");
+ String newFileName = Strings.CS.replace(file.getName(), "PullRequestBuild", "PullRequestVerification");
FileUtils.writeFile(new File(dataDir, newFileName), content, UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -2291,9 +2292,9 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\" is before \"", "\" is until \"");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\" is after \"", "\" is since \"");
FileUtils.writeStringToFile(file, content, UTF_8);
} catch (IOException e) {
@@ -2356,16 +2357,16 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.fieldspec.",
"io.onedev.server.model.support.issue.field.spec.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.fieldsupply.",
"io.onedev.server.model.support.issue.field.supply.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"org.server.plugin.report.checkstyle.",
"io.onedev.server.plugin.report.checkstyle.");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"org.server.plugin.report.clover.",
"io.onedev.server.plugin.report.clover.");
@@ -2470,7 +2471,7 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.inputspec.numberinput.",
"io.onedev.server.model.support.inputspec.integerinput.");
FileUtils.writeStringToFile(file, content, UTF_8);
@@ -4964,7 +4965,7 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.inputspec.",
"io.onedev.server.buildspecmodel.inputspec.");
FileUtils.writeStringToFile(file, content, UTF_8);
@@ -5783,7 +5784,7 @@ public class DataMigrator {
String content;
try {
content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.util.channelnotification.",
"io.onedev.server.model.support.channelnotification.");
} catch (IOException e) {
@@ -5817,16 +5818,16 @@ public class DataMigrator {
String content;
try {
content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.administration.mailsetting.Office365Setting",
"io.onedev.server.plugin.mailservice.office365.Office365MailService");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.administration.mailsetting.GmailSetting",
"io.onedev.server.plugin.mailservice.gmail.GmailMailService");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.administration.mailsetting.OtherMailSetting",
"io.onedev.server.plugin.mailservice.smtpimap.SmtpImapMailService");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.administration.mailsetting.",
"io.onedev.server.model.support.administration.mailservice.");
} catch (IOException e) {
@@ -6045,16 +6046,16 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
var content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.field.supply.FieldSupply",
"io.onedev.server.model.support.issue.field.instance.FieldInstance");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.field.supply.Ignore",
"io.onedev.server.model.support.issue.field.instance.IgnoreValue");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.field.supply.ScriptingValue",
"io.onedev.server.model.support.issue.field.instance.ScriptingValue");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.field.supply.SpecifiedValue",
"io.onedev.server.model.support.issue.field.instance.SpecifiedValue");
FileUtils.writeStringToFile(file, content, UTF_8.name());
@@ -6112,7 +6113,7 @@ public class DataMigrator {
if (file.getName().startsWith("Packs.xml")) {
try {
var content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.ee.pack.",
"io.onedev.server.plugin.pack.");
FileUtils.writeStringToFile(file, content, UTF_8.name());
@@ -6578,15 +6579,15 @@ public class DataMigrator {
for (File file : dataDir.listFiles()) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\"Milestone\" is", "\"Iteration\" is");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\"Milestone\" is", "\"Iteration\" is");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\"Milestone\" is", "\"Iteration\" is");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"\"Milestone\" is", "\"Iteration\" is");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"non-pull-request commits", "on branch(\"**\")");
FileUtils.writeStringToFile(file, content, UTF_8);
} catch (IOException e) {
@@ -6598,7 +6599,7 @@ public class DataMigrator {
private void migrate168(File dataDir, Stack<Integer> versions) {
for (File file : dataDir.listFiles()) {
try {
- var content = StringUtils.replace(
+ var content = Strings.CS.replace(
FileUtils.readFileToString(file, UTF_8),
"on branch(\"**\")",
"on branch \"**\"");
@@ -6682,39 +6683,39 @@ public class DataMigrator {
private void migrate171(File dataDir, Stack<Integer> versions) {
for (File file : dataDir.listFiles()) {
try {
- var content = StringUtils.replace(
+ var content = Strings.CS.replace(
FileUtils.readFileToString(file, UTF_8),
"io.onedev.server.ee.dashboard.widgets.BuildListWidget",
"io.onedev.server.ee.dashboard.widgets.build.BuildListWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.BurnDownChartWidget",
"io.onedev.server.ee.dashboard.widgets.iteration.BurnDownChartWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.IssueListWidget",
"io.onedev.server.ee.dashboard.widgets.issue.IssueListWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.IterationListWidget",
"io.onedev.server.ee.dashboard.widgets.iteration.IterationListWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.MarkdownBlobWidget",
"io.onedev.server.ee.dashboard.widgets.markdown.MarkdownBlobWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.MarkdownWidget",
"io.onedev.server.ee.dashboard.widgets.markdown.MarkdownWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.ProjectListWidget",
"io.onedev.server.ee.dashboard.widgets.project.ProjectListWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.PullRequestListWidget",
"io.onedev.server.ee.dashboard.widgets.pullrequest.PullRequestListWidget");
- content = StringUtils.replace(
+ content = Strings.CS.replace(
content,
"io.onedev.server.ee.dashboard.widgets.projectoverview.ProjectOverviewWidget",
"io.onedev.server.ee.dashboard.widgets.project.ProjectOverviewWidget");
@@ -7780,10 +7781,10 @@ public class DataMigrator {
} else if (file.getName().startsWith("Settings.xml")) {
try {
String content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.model.support.issue.field.spec.WorkingPeriodField",
"io.onedev.server.model.support.issue.field.spec.IntegerField");
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.buildspecmodel.inputspec.workingperiodinput",
"io.onedev.server.buildspecmodel.inputspec.integerinput");
FileUtils.writeFile(file, content, UTF_8);
@@ -8202,7 +8203,7 @@ public class DataMigrator {
} else if (file.getName().startsWith("IssueChanges.xml")) {
try {
var content = FileUtils.readFileToString(file, UTF_8);
- content = StringUtils.replace(content,
+ content = Strings.CS.replace(content,
"io.onedev.server.util.Input",
"io.onedev.server.buildspecmodel.inputspec.Input");
FileUtils.writeStringToFile(file, content, UTF_8.name());
diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
index bf078d2592..4bfd902535 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -21,6 +21,7 @@ import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.Strings;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;
import org.bouncycastle.bcpg.HashAlgorithmTags;
@@ -779,9 +780,9 @@ public class GitUtils {
public static <T> T callWithClusterCredential(GitTask<T> task) {
File homeDir = FileUtils.createTempDir("githome");
-
+
ClusterService clusterService = OneDev.getInstance(ClusterService.class);
- SecretMasker.push(text -> StringUtils.replace(text, clusterService.getCredential(), "******"));
+ SecretMasker.push(text -> Strings.CS.replace(text, clusterService.getCredential(), "******"));
try {
Commandline git = newGit();
git.envs().put("HOME", homeDir.getAbsolutePath());
diff --git a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
index 12726b1b10..a36c36132f 100644
--- a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
+++ b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
@@ -33,7 +33,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +111,7 @@ public class DefaultLogService implements LogService, Serializable {
private void doLog(String message, StyleBuilder styleBuilder) {
message = Project.decodeFullRepoNameAsPath(message);
for (String maskSecret: loggingSupport.getMaskSecrets())
- message = StringUtils.replace(message, maskSecret, SecretInput.MASK);
+ message = Strings.CS.replace(message, maskSecret, SecretInput.MASK);
String maskedMessage = message;
write(loggingSupport.getIdentity().getLockName(), () -> {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 15831250e9..45f45ec5c5 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -5,7 +5,6 @@ import static io.onedev.server.model.Project.PROP_NAME;
import static io.onedev.server.model.Project.PROP_PATH;
import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
import static io.onedev.server.web.translation.Translation._T;
-import static org.apache.commons.lang3.StringUtils.replace;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -45,6 +44,7 @@ import javax.validation.constraints.Pattern;
import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
import org.apache.commons.collections4.map.ReferenceMap;
import org.apache.commons.lang3.SerializationUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.subject.Subject;
import org.apache.tika.mime.MediaType;
@@ -104,10 +104,7 @@ import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.build.ProjectBuildSetting;
-import io.onedev.server.model.support.workspace.NamedWorkspaceQuery;
-import io.onedev.server.model.support.workspace.ProjectWorkspaceSetting;
import io.onedev.server.model.support.code.BranchProtection;
-import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;
import io.onedev.server.model.support.code.GitPackConfig;
import io.onedev.server.model.support.code.TagProtection;
import io.onedev.server.model.support.issue.BoardSpec;
@@ -121,6 +118,9 @@ import io.onedev.server.model.support.pack.ProjectPackSetting;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
+import io.onedev.server.model.support.workspace.NamedWorkspaceQuery;
+import io.onedev.server.model.support.workspace.ProjectWorkspaceSetting;
+import io.onedev.server.model.support.workspace.spec.WorkspaceSpec;
import io.onedev.server.search.entity.SortField;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.BuildQueryPersonalizationService;
@@ -2187,7 +2187,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
public static String decodeFullRepoNameAsPath(String text) {
- return decodeRepoNameAsPath(replace(text, FAKED_GITHUB_REPO_OWNER + "/", ""));
+ return decodeRepoNameAsPath(Strings.CS.replace(text, FAKED_GITHUB_REPO_OWNER + "/", ""));
}
public static Collection<Project> getIndependents(Collection<Project> projects) {
diff --git a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
index 440d86e999..57e6d09f08 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/HibernateConfig.java
@@ -1,17 +1,24 @@
package io.onedev.server.persistence;
+import static io.onedev.commons.utils.FileUtils.loadProperties;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hibernate.cfg.AvailableSettings.DIALECT;
+import static org.hibernate.cfg.AvailableSettings.DRIVER;
+import static org.hibernate.cfg.AvailableSettings.PASS;
+import static org.hibernate.cfg.AvailableSettings.URL;
+import static org.hibernate.cfg.AvailableSettings.USER;
+
import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import com.google.common.hash.Hashing;
-import io.onedev.commons.utils.StringUtils;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.Strings;
import org.hibernate.cfg.Environment;
-import static io.onedev.commons.utils.FileUtils.loadProperties;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.hibernate.cfg.AvailableSettings.*;
+import com.google.common.hash.Hashing;
+
+import io.onedev.commons.utils.StringUtils;
public class HibernateConfig extends Properties {
@@ -49,7 +56,7 @@ public class HibernateConfig extends Properties {
}
String url = getProperty(URL);
- url = StringUtils.replace(url, "${installDir}", installDir.getAbsolutePath());
+ url = Strings.CS.replace(url, "${installDir}", installDir.getAbsolutePath());
if (url.contains(":sqlserver:") && !url.toLowerCase().contains("selectMethod=cursor".toLowerCase()))
url = StringUtils.stripEnd(url, ";") + ";selectMethod=cursor";
setProperty(URL, url);
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
index 7e5fa8a295..1a54fffc32 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
@@ -1,21 +1,24 @@
package io.onedev.server.search.commit;
+import static io.onedev.server.web.translation.Translation._T;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
+import org.eclipse.jgit.lib.PersonIdent;
+
import com.google.common.base.Preconditions;
+
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.service.UserService;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.commons.utils.match.WildcardUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jgit.lib.PersonIdent;
-
-import static io.onedev.server.web.translation.Translation._T;
-
-import java.util.ArrayList;
-import java.util.List;
+import io.onedev.server.service.UserService;
public abstract class PersonCriteria extends CommitCriteria {
@@ -61,10 +64,10 @@ public abstract class PersonCriteria extends CommitCriteria {
persons.add("<" + emailAddress.getValue() + ">");
}
} else {
- persons.add(StringUtils.replace(value, "*", ".*"));
+ persons.add(Strings.CS.replace(value, "*", ".*"));
}
} else {
- persons.add(StringUtils.replace(value, "*", ".*"));
+ persons.add(Strings.CS.replace(value, "*", ".*"));
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
index 291b217747..3de498d08a 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java
@@ -23,7 +23,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.SerializationUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.eclipse.jetty.websocket.api.Session;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
@@ -105,7 +105,7 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements Age
Properties props = new Properties();
props.load(is);
for (String dependency: Splitter.on(';').omitEmptyStrings().split(props.getProperty("dependencies")))
- agentLibs.add(StringUtils.replace(dependency, ":", "-") + ".jar");
+ agentLibs.add(Strings.CS.replace(dependency, ":", "-") + ".jar");
agentVersion = props.getProperty("version");
agentLibs.add(props.getProperty("id") + "-" + agentVersion + ".jar");
} catch (IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java b/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
index 31c00f3037..f4391f0f38 100644
--- a/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/KubernetesUtils.java
@@ -1,9 +1,13 @@
package io.onedev.server.util;
+import static io.onedev.k8shelper.KubernetesHelper.ENV_SERVER_URL;
+import static io.onedev.k8shelper.Test.TEST_PATH;
import static io.onedev.server.util.CollectionUtils.newLinkedHashMap;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.commons.codec.binary.Base64.encodeBase64String;
import java.io.File;
+import java.io.IOException;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
@@ -19,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.SystemUtils;
import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
@@ -31,6 +36,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
@@ -38,8 +44,12 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.k8shelper.Test;
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.util.KubernetesUtils.CollectLogExitCondition.CommandCompleted;
+import io.onedev.server.util.KubernetesUtils.CollectLogExitCondition.SeenMessage;
+import io.onedev.server.util.KubernetesUtils.CollectLogExitCondition.SeenMessageOrCommandCompleted;
/**
* Shared helpers for running {@code kubectl} and interpreting pod/container status from the API.
@@ -50,6 +60,12 @@ public final class KubernetesUtils {
private static final int POD_WATCH_TIMEOUT_SECONDS = 60;
+ private static final String TEST_INIT_CONTAINER_NAME = "k8s-test";
+
+ private static final String TEST_MAIN_CONTAINER_NAME = "main";
+
+ private static final String K8S_HELPER_CLASSPATH = "/k8s-helper/*";
+
public static Commandline newKubectl(@Nullable String kubeCtlPath, @Nullable String configFile) {
String kubectl = kubeCtlPath;
if (kubectl == null) {
@@ -83,9 +99,6 @@ public final class KubernetesUtils {
return def;
}
- /**
- * Logs a warning when the pod is unschedulable (resource pressure, affinity, etc.).
- */
public static void logPodUnschedulableWarnings(@Nullable JsonNode statusNode, TaskLogger taskLogger) {
if (statusNode == null || !statusNode.isObject())
return;
@@ -170,11 +183,11 @@ public final class KubernetesUtils {
}
public static void collectContainerLog(Supplier<Commandline> kubectlFactory, String namespace,
- String podName, String containerName, @Nullable String logEndMessage, TaskLogger taskLogger) {
+ String podName, String containerName, CollectLogExitCondition exitCondition, TaskLogger taskLogger) {
Thread thread = Thread.currentThread();
AtomicBoolean abortError = new AtomicBoolean(false);
AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
- AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);
+ AtomicBoolean seenMessageRef = new AtomicBoolean(false);
while (true) {
Commandline kubectl = kubectlFactory.get();
@@ -192,12 +205,12 @@ public final class KubernetesUtils {
if (line.contains("rpc error:") && line.contains("No such container:")
|| line.contains("Unable to retrieve container logs for")) {
logger.debug(line);
- } else if (logEndMessage != null && line.contains(logEndMessage)) {
- String lastLogMessage = StringUtils.substringBefore(line, logEndMessage);
+ } else if (exitCondition instanceof SeenMessage seenMessage && line.contains(seenMessage.getMessage())) {
+ String lastLogMessage = StringUtils.substringBefore(line, seenMessage.getMessage());
if (StringUtils.substringAfter(lastLogMessage, " ").length() != 0)
consume(lastLogMessage);
- if (!endOfLogSeenRef.get()) {
- endOfLogSeenRef.set(true);
+ if (!seenMessageRef.get()) {
+ seenMessageRef.set(true);
thread.interrupt();
}
} else if (line.startsWith("Error from server") || line.startsWith("error:")) {
@@ -226,13 +239,13 @@ public final class KubernetesUtils {
try {
kubectl.execute(new Logger(), new Logger()).checkReturnCode();
} catch (Throwable e) {
- if (!endOfLogSeenRef.get() && !abortError.get())
+ if (!seenMessageRef.get() && !abortError.get())
throw ExceptionUtils.unchecked(e);
}
- if (endOfLogSeenRef.get() || abortError.get()) {
+ if (seenMessageRef.get() || abortError.get()) {
Thread.interrupted();
break;
- } else if (logEndMessage == null) {
+ } else if (exitCondition instanceof CommandCompleted || exitCondition instanceof SeenMessageOrCommandCompleted) {
break;
} else {
try {
@@ -306,7 +319,7 @@ public final class KubernetesUtils {
abortRef.set(abortChecker.check(nodeName, containerStatusNodes));
- if (abortRef.get() != null)
+ if (abortRef.get() != null)
thread.interrupt();
}
}
@@ -423,22 +436,123 @@ public final class KubernetesUtils {
createResource(kubectlFactory, namespaceDef, new HashSet<>(), taskLogger);
}
+ public static boolean createTrustCertsConfigMap(Supplier<Commandline> kubectlFactory,
+ String name, String namespace, TaskLogger taskLogger) {
+ Map<String, String> configMapData = new LinkedHashMap<>();
+ File trustCertsDir = new File(Bootstrap.getConfDir(), "trust-certs");
+ if (trustCertsDir.exists()) {
+ int index = 1;
+ for (File file : trustCertsDir.listFiles()) {
+ if (file.isFile() && !file.isHidden()) {
+ try {
+ byte[] fileContent = FileUtils.readFileToByteArray(file);
+ configMapData.put((index++) + ".pem", encodeBase64String(fileContent));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+ if (!configMapData.isEmpty()) {
+ Map<Object, Object> configMapDef = newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "ConfigMap",
+ "metadata", newLinkedHashMap(
+ "name", name,
+ "namespace", namespace),
+ "binaryData", configMapData);
+ createResource(kubectlFactory, configMapDef, new HashSet<>(), taskLogger);
+ return true;
+ }
+ return false;
+ }
+
public static void testCluster(Supplier<Commandline> kubectlFactory, String namespace,
- String image, boolean alwaysPullImage, TaskLogger taskLogger) {
+ String image, String helperImage, String serverUrl, String testToken,
+ @Nullable String storageClass, String storageSize, boolean alwaysPullImage,
+ TaskLogger taskLogger) {
checkClusterAccess(kubectlFactory, taskLogger);
ensureNamespace(kubectlFactory, namespace, taskLogger);
String podName = "test-" + System.currentTimeMillis();
+ String pvcName = podName + "-pvc";
+ String volumeName = podName + "-vol";
+ String trustCertsConfigMapName = podName + "-trust-certs";
+ boolean trustCertsConfigMapCreated = false;
try {
- var podSpec = new LinkedHashMap<String, Object>();
- Map<Object, Object> containerSpec = newLinkedHashMap(
- "name", "default",
+ trustCertsConfigMapCreated = createTrustCertsConfigMap(kubectlFactory,
+ trustCertsConfigMapName, namespace, taskLogger);
+
+ taskLogger.log("Creating test PVC...");
+ Map<Object, Object> pvcSpecDef = newLinkedHashMap(
+ "accessModes", Lists.newArrayList("ReadWriteOnce"),
+ "resources", newLinkedHashMap(
+ "requests", newLinkedHashMap("storage", storageSize)));
+ if (StringUtils.isNotBlank(storageClass))
+ pvcSpecDef.put("storageClassName", storageClass);
+ Map<Object, Object> pvcDef = newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "PersistentVolumeClaim",
+ "metadata", newLinkedHashMap(
+ "name", pvcName,
+ "namespace", namespace),
+ "spec", pvcSpecDef);
+ createResource(kubectlFactory, pvcDef, new HashSet<>(), taskLogger);
+
+ var containerTestDirPath = TEST_PATH;
+ var containerTrustCertsDirPath = containerTestDirPath + "/trust-certs";
+
+ var volumeMounts = new ArrayList<Object>();
+ volumeMounts.add(newLinkedHashMap(
+ "name", volumeName,
+ "mountPath", containerTestDirPath));
+ if (trustCertsConfigMapCreated) {
+ volumeMounts.add(newLinkedHashMap(
+ "name", "trust-certs",
+ "mountPath", containerTrustCertsDirPath));
+ }
+
+ var initEnvs = new ArrayList<Object>();
+ initEnvs.add(newLinkedHashMap("name", ENV_SERVER_URL, "value", serverUrl));
+ initEnvs.add(newLinkedHashMap("name", Test.ENV_TEST_TOKEN, "value", testToken));
+
+ Map<Object, Object> initContainerSpec = newLinkedHashMap(
+ "name", TEST_INIT_CONTAINER_NAME,
+ "image", helperImage,
+ "command", Lists.newArrayList("java"),
+ "args", Lists.newArrayList("-classpath", K8S_HELPER_CLASSPATH,
+ "io.onedev.k8shelper.Test"),
+ "env", initEnvs,
+ "volumeMounts", volumeMounts);
+ if (alwaysPullImage)
+ initContainerSpec.put("imagePullPolicy", "Always");
+ setupSecurityContext(initContainerSpec, "0:0");
+
+ Map<Object, Object> mainContainerSpec = newLinkedHashMap(
+ "name", TEST_MAIN_CONTAINER_NAME,
"image", image,
"command", Lists.newArrayList("sh", "-c"),
- "args", Lists.newArrayList("echo hello from container"));
+ "args", Lists.newArrayList("echo hello from container"),
+ "volumeMounts", Lists.newArrayList(newLinkedHashMap(
+ "name", volumeName,
+ "mountPath", containerTestDirPath)));
if (alwaysPullImage)
- containerSpec.put("imagePullPolicy", "Always");
- podSpec.put("containers", Lists.<Object>newArrayList(containerSpec));
+ mainContainerSpec.put("imagePullPolicy", "Always");
+
+ var volumes = new ArrayList<Object>();
+ volumes.add(newLinkedHashMap(
+ "name", volumeName,
+ "persistentVolumeClaim", newLinkedHashMap("claimName", pvcName)));
+ if (trustCertsConfigMapCreated) {
+ volumes.add(newLinkedHashMap(
+ "name", "trust-certs",
+ "configMap", newLinkedHashMap("name", trustCertsConfigMapName)));
+ }
+
+ var podSpec = new LinkedHashMap<String, Object>();
+ podSpec.put("initContainers", Lists.<Object>newArrayList(initContainerSpec));
+ podSpec.put("containers", Lists.<Object>newArrayList(mainContainerSpec));
+ podSpec.put("volumes", volumes);
podSpec.put("restartPolicy", "Never");
Map<Object, Object> podDef = newLinkedHashMap(
@@ -450,28 +564,71 @@ public final class KubernetesUtils {
"spec", podSpec);
createResource(kubectlFactory, podDef, new HashSet<>(), taskLogger);
- watchPod(kubectlFactory, namespace, podName, (nodeName, containerStatusNodes) -> {
- var errors = getContainerErrors(containerStatusNodes);
- if (!errors.isEmpty()) {
- var error = errors.values().iterator().next();
- String msg;
- if (error instanceof Integer)
- msg = "Exited with code " + error;
- else
- msg = String.valueOf(error);
- return new PodWatchAbort(msg);
- }
- if (getStoppedContainers(containerStatusNodes).contains("default"))
- return new PodWatchAbort(null);
- return null;
- }, taskLogger);
+ try {
+ waitForContainerStart(kubectlFactory, namespace, podName, TEST_INIT_CONTAINER_NAME, taskLogger);
+ } catch (Throwable t) {
+ collectContainerLog(kubectlFactory, namespace, podName, TEST_INIT_CONTAINER_NAME,
+ new CommandCompleted(), taskLogger);
+ throw t;
+ }
+ collectContainerLog(kubectlFactory, namespace, podName, TEST_INIT_CONTAINER_NAME,
+ new CommandCompleted(), taskLogger);
+ waitForContainerStop(kubectlFactory, namespace, podName, TEST_INIT_CONTAINER_NAME, taskLogger);
- collectContainerLog(kubectlFactory, namespace, podName, "default", null, taskLogger);
+ try {
+ waitForContainerStart(kubectlFactory, namespace, podName, TEST_MAIN_CONTAINER_NAME, taskLogger);
+ } catch (Throwable t) {
+ collectContainerLog(kubectlFactory, namespace, podName, TEST_MAIN_CONTAINER_NAME,
+ new CommandCompleted(), taskLogger);
+ throw t;
+ }
+ collectContainerLog(kubectlFactory, namespace, podName, TEST_MAIN_CONTAINER_NAME,
+ new CommandCompleted(), taskLogger);
+ waitForContainerStop(kubectlFactory, namespace, podName, TEST_MAIN_CONTAINER_NAME, taskLogger);
} finally {
deleteResource(kubectlFactory, "pod", podName, namespace, true, taskLogger);
+ deleteResource(kubectlFactory, "pvc", pvcName, namespace, true, taskLogger);
+ if (trustCertsConfigMapCreated)
+ deleteResource(kubectlFactory, "configmap", trustCertsConfigMapName, namespace, true, taskLogger);
}
}
+ public static void waitForContainerStart(Supplier<Commandline> kubectlFactory, String namespace,
+ String podName, String containerName, TaskLogger taskLogger) {
+ watchPod(kubectlFactory, namespace, podName, (nodeName, containerStatusNodes) -> {
+ var error = getContainerErrors(containerStatusNodes).get(containerName);
+ if (error != null) {
+ String msg;
+ if (error instanceof Integer)
+ msg = "Container '" + containerName + "' exited with code " + error;
+ else
+ msg = "Container '" + containerName + "': " + error;
+ return new PodWatchAbort(msg);
+ }
+ if (getStartedContainers(containerStatusNodes).contains(containerName))
+ return new PodWatchAbort(null);
+ return null;
+ }, taskLogger);
+ }
+
+ public static void waitForContainerStop(Supplier<Commandline> kubectlFactory, String namespace,
+ String podName, String containerName, TaskLogger taskLogger) {
+ watchPod(kubectlFactory, namespace, podName, (nodeName, containerStatusNodes) -> {
+ var error = getContainerErrors(containerStatusNodes).get(containerName);
+ if (error != null) {
+ String msg;
+ if (error instanceof Integer)
+ msg = "Container '" + containerName + "' exited with code " + error;
+ else
+ msg = "Container '" + containerName + "': " + error;
+ return new PodWatchAbort(msg);
+ }
+ if (getStoppedContainers(containerStatusNodes).contains(containerName))
+ return new PodWatchAbort(null);
+ return null;
+ }, taskLogger);
+ }
+
public static String createResource(Supplier<Commandline> kubectlFactory,
Map<Object, Object> resourceDef, Collection<String> secretsToMask, TaskLogger taskLogger) {
File file = null;
@@ -482,7 +639,7 @@ public final class KubernetesUtils {
String maskedYaml = resourceYaml;
for (String secret : secretsToMask)
- maskedYaml = StringUtils.replace(maskedYaml, secret, SecretInput.MASK);
+ maskedYaml = Strings.CS.replace(maskedYaml, secret, SecretInput.MASK);
logger.trace("Creating resource:\n{}", maskedYaml);
FileUtils.writeFile(file, resourceYaml, UTF_8);
@@ -616,4 +773,32 @@ public final class KubernetesUtils {
}
+ public static interface CollectLogExitCondition {
+
+ public static class CommandCompleted implements CollectLogExitCondition {
+ }
+
+ public static class SeenMessage implements CollectLogExitCondition {
+
+ private final String message;
+
+ public SeenMessage(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ }
+
+ public static class SeenMessageOrCommandCompleted extends SeenMessage {
+
+ public SeenMessageOrCommandCompleted(String message) {
+ super(message);
+ }
+
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java
index 4dea67a859..433c31aa36 100644
--- a/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/StringConverter.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.xstream;
-import io.onedev.commons.utils.StringUtils;
+import org.apache.commons.lang3.Strings;
public class StringConverter extends com.thoughtworks.xstream.converters.basic.StringConverter {
@@ -13,7 +13,7 @@ public class StringConverter extends com.thoughtworks.xstream.converters.basic.S
public String toString(Object obj) {
String string = (String) obj;
if (string != null && string.indexOf('\0') != -1)
- string = StringUtils.replace(string, "\0", "");
+ string = Strings.CS.replace(string, "\0", "");
return super.toString(string);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index 177c0f9adf..732f444d49 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -14,6 +14,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang3.Strings;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -40,7 +41,6 @@ import com.ibm.icu.text.SpoofChecker;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.PlanarRange;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.ai.ChatTool;
import io.onedev.server.ai.ChatToolAware;
@@ -272,7 +272,7 @@ public class BlobTextDiffPanel extends Panel implements ChatToolAware {
expandSupport.appendEquals(builder, index, lastContextSize, contextSize,
block, change.getDiffBlocks().size(), new ExpandCallbackImpl());
- String expanded = StringUtils.replace(builder.toString(), "\n", "");
+ String expanded = Strings.CS.replace(builder.toString(), "\n", "");
String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
getMarkupId(), index, escapeJavaScript(expanded));
target.appendJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
index 57af8c22e4..b61aa64c12 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/text/PlainTextDiffPanel.java
@@ -8,6 +8,7 @@ import static org.unbescape.javascript.JavaScriptEscape.escapeJavaScript;
import java.text.MessageFormat;
import java.util.List;
+import org.apache.commons.lang3.Strings;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -18,7 +19,6 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.diff.DiffBlock;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
import io.onedev.server.util.diff.DiffUtils;
@@ -81,7 +81,7 @@ public class PlainTextDiffPanel extends Panel {
expandSupport.appendEquals(builder, index, lastContextSize, contextSize,
block, diffBlocks.size(), new ExpandCallbackImpl());
- String expanded = StringUtils.replace(builder.toString(), "\n", "");
+ String expanded = Strings.CS.replace(builder.toString(), "\n", "");
String script = String.format("onedev.server.plainTextDiff.expand('%s', %d, \"%s\");",
getMarkupId(), index, escapeJavaScript(expanded));
target.appendJavaScript(script);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 7a85111530..fc86392ccb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -14,14 +14,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.jspecify.annotations.Nullable;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import io.onedev.server.validation.validator.ProjectKeyValidator;
-import io.onedev.server.web.page.base.BasePage;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxChannel;
@@ -45,8 +43,10 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -56,16 +56,17 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.service.ProjectService;
import io.onedev.server.markdown.MarkdownService;
import io.onedev.server.model.Build;
-import io.onedev.server.model.Workspace;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.model.Workspace;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.FilenameUtils;
+import io.onedev.server.validation.validator.ProjectKeyValidator;
import io.onedev.server.validation.validator.ProjectPathValidator;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.avatar.AvatarService;
@@ -74,9 +75,9 @@ import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.markdown.SuggestionSupport.Selection;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import org.unbescape.javascript.JavaScriptEscape;
public class MarkdownEditor extends FormComponentPanel<String> {
@@ -142,7 +143,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
if (StringUtils.isNotBlank(input)) {
// Normalize line breaks to make source position tracking information comparable
// to textarea caret position when sync edit/preview scroll bar
- input = StringUtils.replace(input, "\r\n", "\n");
+ input = Strings.CS.replace(input, "\r\n", "\n");
return renderMarkdown(input);
} else {
return "<div class='message'>" + _T("Nothing to preview") + "</div>";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
index 3cb22c5303..fbc4ac36b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.blob.render.edit.plain;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.lang3.Strings;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -9,8 +10,6 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
-import io.onedev.commons.utils.StringUtils;
-
public class PlainEditPanel extends FormComponentPanel<byte[]> {
private final String fileName;
@@ -40,7 +39,7 @@ public class PlainEditPanel extends FormComponentPanel<byte[]> {
public void convertInput() {
String value = input.getConvertedInput();
if (value != null) {
- value = StringUtils.replace(value, "\r\n", "\n");
+ value = Strings.CS.replace(value, "\r\n", "\n");
setConvertedInput(value.getBytes(StandardCharsets.UTF_8));
} else {
setConvertedInput(new byte[0]);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index b5feb04796..72a0cddf32 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -5,6 +5,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang3.Strings;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -14,22 +15,21 @@ import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Sets;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.service.BuildService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.UserService;
import io.onedev.server.markdown.MarkdownService;
import io.onedev.server.model.Build;
-import io.onedev.server.model.Workspace;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.model.Workspace;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.BuildService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.Similarities;
@@ -174,7 +174,7 @@ class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
*/
String initialContent = input.getModelObject();
if (initialContent == null || !initialContent.contains("\r\n"))
- content = StringUtils.replace(content, "\r\n", "\n");
+ content = Strings.CS.replace(content, "\r\n", "\n");
setConvertedInput(content.getBytes(StandardCharsets.UTF_8));
} else {
setConvertedInput(new byte[0]);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
index 983ab83bf1..059f7eb017 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
@@ -5,6 +5,7 @@ import static io.onedev.server.web.translation.Translation._T;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.lang3.Strings;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -16,7 +17,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.onedev.commons.utils.PlanarRange;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
@@ -60,7 +60,7 @@ abstract class SourceFormComponent extends FormComponentPanel<byte[]> {
*/
String initialContent = input.getModelObject();
if (initialContent == null || !initialContent.contains("\r\n"))
- content = StringUtils.replace(content, "\r\n", "\n");
+ content = Strings.CS.replace(content, "\r\n", "\n");
setConvertedInput(content.getBytes(StandardCharsets.UTF_8));
} else {
setConvertedInput(new byte[0]);
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index 797b257e59..3ff2375776 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -527,10 +527,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
var localServer = clusterService.getLocalServerAddress();
while (!workspaceFutures.isEmpty() || thread != null) {
- if (thread == null) {
- for (var future: workspaceFutures.values())
- future.cancel(true);
- }
try {
if (clusterService.isLeaderServer()) {
Map<String, Collection<Long>> workspaceIds = new HashMap<>();
diff --git a/server-ee b/server-ee
index 10654a2e7a..07caf3b1ea 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 10654a2e7a969c01399621e63aaa288e9073a225
+Subproject commit 07caf3b1eadcb4f858164a1dd068adc0d8f91ef0
diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
index 956c7b240d..96a68f9199 100644
--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java
@@ -6,7 +6,6 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
-import org.jspecify.annotations.Nullable;
import javax.naming.AuthenticationException;
import javax.naming.CompositeName;
import javax.naming.Context;
@@ -24,8 +23,10 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import org.apache.commons.lang3.Strings;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -192,9 +193,9 @@ public class LdapAuthenticator extends Authenticator {
Collection<String> groupNames = null;
Collection<String> sshKeys = null;
- String userSearchFilter = StringUtils.replace(getUserSearchFilter(), "{0}",
+ String userSearchFilter = Strings.CS.replace(getUserSearchFilter(), "{0}",
escape(token.getUsername()));
- userSearchFilter = StringUtils.replace(userSearchFilter, "\\", "\\\\");
+ userSearchFilter = Strings.CS.replace(userSearchFilter, "\\", "\\\\");
logger.debug("Evaluated user search filter: " + userSearchFilter);
SearchControls searchControls = new SearchControls();
@@ -387,8 +388,8 @@ public class LdapAuthenticator extends Authenticator {
SearchGroupsUsingFilter groupRetrieval = (SearchGroupsUsingFilter) getGroupRetrieval();
String groupNameAttribute = groupRetrieval.getGroupNameAttribute();
Name groupSearchBase = new CompositeName().add(groupRetrieval.getGroupSearchBase());
- String groupSearchFilter = StringUtils.replace(groupRetrieval.getGroupSearchFilter(), "{0}", userDN);
- groupSearchFilter = StringUtils.replace(groupSearchFilter, "\\", "\\\\");
+ String groupSearchFilter = Strings.CS.replace(groupRetrieval.getGroupSearchFilter(), "{0}", userDN);
+ groupSearchFilter = Strings.CS.replace(groupSearchFilter, "\\", "\\\\");
logger.debug("Evaluated group search filter: " + groupSearchFilter);
SearchControls searchControls = new SearchControls();
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index e86aa8d62c..7e2151b23e 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -14,6 +14,7 @@ import static io.onedev.server.util.CollectionUtils.newHashMap;
import static io.onedev.server.util.CollectionUtils.newLinkedHashMap;
import static io.onedev.server.util.KubernetesUtils.collectContainerLog;
import static io.onedev.server.util.KubernetesUtils.createResource;
+import static io.onedev.server.util.KubernetesUtils.createTrustCertsConfigMap;
import static io.onedev.server.util.KubernetesUtils.deleteResource;
import static io.onedev.server.util.KubernetesUtils.getContainerErrors;
import static io.onedev.server.util.KubernetesUtils.getPrivilegedNamespaceDefinition;
@@ -29,23 +30,22 @@ import static java.util.stream.Collectors.toList;
import static org.apache.commons.codec.binary.Base64.encodeBase64String;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang3.RandomUtils;
import org.jspecify.annotations.Nullable;
@@ -59,9 +59,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.command.Commandline;
@@ -77,9 +75,9 @@ import io.onedev.k8shelper.RunImagetoolsFacade;
import io.onedev.k8shelper.ServiceFacade;
import io.onedev.k8shelper.SetupCacheFacade;
import io.onedev.server.OneDev;
-import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
+import io.onedev.server.cache.ServerJobCacheProvisioner;
import io.onedev.server.cluster.ClusterService;
import io.onedev.server.job.JobContext;
import io.onedev.server.job.JobRunnable;
@@ -97,6 +95,7 @@ import io.onedev.server.service.SettingService;
import io.onedev.server.terminal.CommandlineShell;
import io.onedev.server.terminal.Shell;
import io.onedev.server.util.KubernetesUtils;
+import io.onedev.server.util.KubernetesUtils.CollectLogExitCondition.SeenMessage;
import io.onedev.server.util.KubernetesUtils.PodWatchAbort;
import io.onedev.server.util.KubernetesUtils.PodWatchAbortChecker;
import io.onedev.server.web.util.Testable;
@@ -120,12 +119,10 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
private String clusterRole;
private List<RegistryLogin> registryLogins = new ArrayList<>();
-
- private boolean buildWithPV;
-
+
private String storageClass;
- private String storageSize;
+ private String storageSize = "10Gi";
private List<ServiceLocator> serviceLocators = new ArrayList<>();
@@ -156,22 +153,11 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
public void setRegistryLogins(List<RegistryLogin> registryLogins) {
this.registryLogins = registryLogins;
}
-
- @Editable(order=300, name="Build with Persistent Volume", description="Enable this to place intermediate " +
- "files required by job execution on dynamically allocated persistent volume instead of emptyDir")
- public boolean isBuildWithPV() {
- return buildWithPV;
- }
-
- public void setBuildWithPV(boolean buildWithPV) {
- this.buildWithPV = buildWithPV;
- }
@Editable(order=400, name="Build Volume Storage Class", placeholder = "Use default storage class", description = "" +
"Optionally specify a storage class to allocate build volume dynamically. Leave empty to use default storage class. " +
"<b class='text-warning'>NOTE:</b> Reclaim policy of the storage class should be set to <code>Delete</code>, " +
"as the volume is only used to hold temporary build files")
- @DependsOn(property="buildWithPV")
public String getStorageClass() {
return storageClass;
}
@@ -183,7 +169,6 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
@Editable(order=500, name="Build Volume Storage Size", description = "Specify storage size to request " +
"for the build volume. The size should conform to <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#setting-requests-and-limits-for-local-ephemeral-storage' target='_blank'>Kubernetes resource capacity format</a>, " +
"for instance <i>10Gi</i>")
- @DependsOn(property="buildWithPV")
@NotEmpty
public String getStorageSize() {
return storageSize;
@@ -409,7 +394,8 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
String namespace = getTestNamespace();
try {
testCluster(this::newKubectl, namespace, testData.getDockerImage(),
- isAlwaysPullImage(), jobLogger);
+ IMAGE_REPO + ":" + getVersion(), getServerUrl(), UUID.randomUUID().toString(),
+ getStorageClass(), getStorageSize(), isAlwaysPullImage(), jobLogger);
} finally {
deleteNamespace(namespace, jobLogger);
}
@@ -509,37 +495,6 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
createResource(this::newKubectl, clusterRoleBindingDef, new HashSet<>(), jobLogger);
}
- @Nullable
- private String createTrustCertsConfigMap(String namespace, TaskLogger jobLogger) {
- Map<String, String> configMapData = new LinkedHashMap<>();
- File trustCertsDir = new File(Bootstrap.getConfDir(), "trust-certs");
- if (trustCertsDir.exists()) {
- int index = 1;
- for (File file: trustCertsDir.listFiles()) {
- if (file.isFile() && !file.isHidden()) {
- try {
- byte[] fileContent = FileUtils.readFileToByteArray(file);
- configMapData.put((index++) + ".pem", encodeBase64String(fileContent));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- }
- if (!configMapData.isEmpty()) {
- Map<Object, Object> configMapDef = newLinkedHashMap(
- "apiVersion", "v1",
- "kind", "ConfigMap",
- "metadata", newLinkedHashMap(
- "name", "trust-certs",
- "namespace", namespace),
- "binaryData", configMapData);
- return createResource(this::newKubectl, configMapDef, new HashSet<>(), jobLogger);
- } else {
- return null;
- }
- }
-
private void startService(String namespace, JobContext jobContext, ServiceFacade jobService,
@Nullable String imagePullSecretName, TaskLogger jobLogger) {
jobLogger.log("Creating service pod from image " + jobService.getImage() + "...");
@@ -746,25 +701,24 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
startService(namespace, jobContext, jobService, imagePullSecretName, jobLogger);
}
- var trustCertsConfigMapName = createTrustCertsConfigMap(namespace, jobLogger);
+ var trustCertsConfigMapCreated = createTrustCertsConfigMap(this::newKubectl,
+ "trust-certs", namespace, jobLogger);
- if (isBuildWithPV()) {
- Map<Object, Object> pvcDef = newLinkedHashMap(
- "apiVersion", "v1",
- "kind", "PersistentVolumeClaim",
- "metadata", newLinkedHashMap(
- "name", "build-dir",
- "namespace", namespace));
- Map<Object, Object> pvcSpecDef = newLinkedHashMap(
- "accessModes", newArrayList("ReadWriteOnce"),
- "resources", newLinkedHashMap(
- "requests", newLinkedHashMap(
- "storage", getStorageSize())));
- if (getStorageClass() != null)
- pvcSpecDef.put("storageClassName", getStorageClass());
- pvcDef.put("spec", pvcSpecDef);
- createResource(this::newKubectl, pvcDef, Sets.newHashSet(), jobLogger);
- }
+ Map<Object, Object> pvcDef = newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "PersistentVolumeClaim",
+ "metadata", newLinkedHashMap(
+ "name", "build-dir",
+ "namespace", namespace));
+ Map<Object, Object> pvcSpecDef = newLinkedHashMap(
+ "accessModes", newArrayList("ReadWriteOnce"),
+ "resources", newLinkedHashMap(
+ "requests", newLinkedHashMap(
+ "storage", getStorageSize())));
+ if (getStorageClass() != null)
+ pvcSpecDef.put("storageClassName", getStorageClass());
+ pvcDef.put("spec", pvcSpecDef);
+ createResource(this::newKubectl, pvcDef, Sets.newHashSet(), jobLogger);
Map<String, Object> podSpec = new LinkedHashMap<>();
@@ -783,7 +737,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
"mountPath", containerTrustCertsDirPath);
var commonVolumeMounts = newArrayList(buildDirMount);
- if (trustCertsConfigMapName != null)
+ if (trustCertsConfigMapCreated)
commonVolumeMounts.add(trustCertsMount);
CompositeFacade entryFacade = new CompositeFacade(jobContext.getActions());
@@ -804,7 +758,8 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
"value", containerWorkDirPath
));
- Collection<String> cachePaths = new LinkedHashSet<>();
+ Map<String, String> cacheMounts = new LinkedHashMap<>();
+ var cacheConfigIndex = new AtomicInteger(1);
entryFacade.traverse((facade, position) -> {
String containerName = getContainerName(position);
containerNames.add(containerName);
@@ -824,7 +779,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
stepContainerSpec.put("imagePullPolicy", "Always");
if (commandFacade.isUseTTY())
stepContainerSpec.put("tty", true);
- var volumeMounts = buildVolumeMounts(cachePaths);
+ var volumeMounts = buildVolumeMounts(cacheMounts);
volumeMounts.addAll(commonVolumeMounts);
stepContainerSpec.put("volumeMounts", SerializationUtils.clone(volumeMounts));
stepContainerSpec.put("env", SerializationUtils.clone(commonEnvs));
@@ -838,17 +793,26 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
throw new ExplicitException("This step can only be executed by server docker executor or " +
"remote docker executor");
} else {
- if (facade instanceof SetupCacheFacade)
- cachePaths.addAll(((SetupCacheFacade) facade).getCacheConfig().getPaths());
+ if (facade instanceof SetupCacheFacade) {
+ var setupCacheFacade = (SetupCacheFacade) facade;
+ var cacheProvisioner = new ServerJobCacheProvisioner(
+ setupCacheFacade.getCacheConfig(), cacheConfigIndex.getAndIncrement(), jobContext);
+ for (var path: setupCacheFacade.getCacheConfig().getPaths()) {
+ var absolutePathIndex = cacheProvisioner.getAbsolutePathIndexes().get(path);
+ if (absolutePathIndex != null)
+ cacheMounts.put(path, cacheProvisioner.getSubPath(absolutePathIndex));
+ }
+ }
stepContainerSpec = newHashMap(
"name", containerName,
"image", helperImage);
if (isAlwaysPullImage())
stepContainerSpec.put("imagePullPolicy", "Always");
- var volumeMounts = buildVolumeMounts(cachePaths);
+ var volumeMounts = buildVolumeMounts(cacheMounts);
volumeMounts.addAll(commonVolumeMounts);
stepContainerSpec.put("volumeMounts", SerializationUtils.clone(volumeMounts));
stepContainerSpec.put("env", SerializationUtils.clone(commonEnvs));
+ setupSecurityContext(stepContainerSpec, "0:0");
}
if (stepContainerSpec != null) {
@@ -885,7 +849,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
"-classpath", k8sHelperClassPath,
"io.onedev.k8shelper.JobInit");
- ArrayList<Object> volumeMounts = buildVolumeMounts(cachePaths);
+ ArrayList<Object> volumeMounts = buildVolumeMounts(cacheMounts);
volumeMounts.addAll(commonVolumeMounts);
Map<Object, Object> initContainerSpec = newHashMap(
@@ -897,6 +861,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
"volumeMounts", SerializationUtils.clone(volumeMounts));
if (isAlwaysPullImage())
initContainerSpec.put("imagePullPolicy", "Always");
+ setupSecurityContext(initContainerSpec, "0:0");
Map<Object, Object> sidecarContainerSpec = newLinkedHashMap(
"name", "sidecar",
@@ -911,6 +876,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
sidecarContainerSpec.put("resources", newLinkedHashMap("requests", newLinkedHashMap(
"cpu", getCpuRequest(),
"memory", getMemoryRequest())));
+ setupSecurityContext(sidecarContainerSpec, "0:0");
containerSpecs.add(sidecarContainerSpec);
containerNames.add("sidecar");
@@ -925,23 +891,16 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
if (!getNodeSelector().isEmpty())
podSpec.put("nodeSelector", toMap(getNodeSelector()));
- Map<Object, Object> buildDirVolume;
- if (isBuildWithPV()) {
- buildDirVolume = newLinkedHashMap(
+ Map<Object, Object> buildDirVolume = newLinkedHashMap(
"name", "build-dir",
"persistentVolumeClaim", newLinkedHashMap(
"claimName", "build-dir"));
- } else {
- buildDirVolume = newLinkedHashMap(
- "name", "build-dir",
- "emptyDir", newLinkedHashMap());
- }
List<Object> volumes = newArrayList(buildDirVolume);
- if (trustCertsConfigMapName != null) {
+ if (trustCertsConfigMapCreated) {
volumes.add(newLinkedHashMap(
"name", "trust-certs",
"configMap", newLinkedHashMap(
- "name", trustCertsConfigMapName)));
+ "name", "trust-certs")));
}
podSpec.put("volumes", volumes);
@@ -1022,7 +981,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
logger.debug("Collecting log of container (pod: {}, container: {})...",
podFQN, containerName);
- collectContainerLog(this::newKubectl, namespace, POD_NAME, containerName, LOG_END_MESSAGE, jobLogger);
+ collectContainerLog(this::newKubectl, namespace, POD_NAME, containerName, new SeenMessage(LOG_END_MESSAGE), jobLogger);
logger.debug("Waiting for stop of container (pod: {}, container: {})...",
podFQN, containerName);
@@ -1084,17 +1043,14 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,
}
}
- private ArrayList<Object> buildVolumeMounts(Collection<String> cachePaths) {
+ private ArrayList<Object> buildVolumeMounts(Map<String, String> cacheMounts) {
var volumeMounts = new ArrayList<>();
- int index = 1;
- for (var path: cachePaths) {
- if (FilenameUtils.getPrefixLength(path) > 0) {
- var volumeMount = newLinkedHashMap(
- "name", "build-dir",
- "mountPath", path,
- "subPath", "cache/" + (index++));
- volumeMounts.add(volumeMount);
- }
+ for (var entry: cacheMounts.entrySet()) {
+ var volumeMount = newLinkedHashMap(
+ "name", "build-dir",
+ "mountPath", entry.getKey(),
+ "subPath", entry.getValue());
+ volumeMounts.add(volumeMount);
}
return volumeMounts;
}
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java
index 5f3a98e5d1..e3871e741c 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java
@@ -16,6 +16,7 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.Strings;
import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
@@ -223,7 +224,7 @@ public class ImportServer implements Serializable, Validatable {
URIBuilder builder = new URIBuilder(cloneUrl);
builder.setUserInfo(getUserName(), getAppPassword());
- SecretMasker.push(text -> StringUtils.replace(text, getAppPassword(), "******"));
+ SecretMasker.push(text -> Strings.CS.replace(text, getAppPassword(), "******"));
try {
if (dryRun) {
new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
index e01dcef5aa..9f229d40eb 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
@@ -19,7 +19,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
@@ -28,11 +27,13 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.Strings;
import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;
import org.joda.time.format.ISODateTimeFormat;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.html.HtmlEscape;
@@ -50,13 +51,6 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.BaseAuthorizationService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssuesImported;
@@ -74,6 +68,13 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.BaseAuthorizationService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
@@ -536,7 +537,7 @@ public class ImportServer implements Serializable, Validatable {
URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());
builder.setUserInfo("git", getAccessToken());
- SecretMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));
+ SecretMasker.push(text -> Strings.CS.replace(text, getAccessToken(), "******"));
try {
if (dryRun) {
new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index 511f3c1692..ae19fcea50 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -16,7 +16,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
@@ -25,11 +24,13 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.Strings;
import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.joda.time.format.ISODateTimeFormat;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.html.HtmlEscape;
@@ -47,13 +48,6 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.BaseAuthorizationService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssuesImported;
@@ -71,6 +65,13 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.BaseAuthorizationService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
@@ -586,7 +587,7 @@ public class ImportServer implements Serializable, Validatable {
URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());
builder.setUserInfo("git", getAccessToken());
- SecretMasker.push(text -> StringUtils.replace(text, getAccessToken(), "******"));
+ SecretMasker.push(text -> Strings.CS.replace(text, getAccessToken(), "******"));
try {
if (dryRun) {
new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index b0497c28a8..82e7adb1f2 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
import javax.ws.rs.client.Client;
@@ -29,10 +28,12 @@ import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.Strings;
import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
import org.glassfish.jersey.client.ClientProperties;
import org.joda.time.format.ISODateTimeFormat;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.html.HtmlEscape;
@@ -52,13 +53,6 @@ import io.onedev.server.attachment.AttachmentService;
import io.onedev.server.attachment.AttachmentTooLargeException;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.BaseAuthorizationService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IterationService;
-import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UserService;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssuesImported;
@@ -76,6 +70,13 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.BaseAuthorizationService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.IterationService;
+import io.onedev.server.service.ProjectService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
@@ -320,7 +321,7 @@ public class ImportServer implements Serializable, Validatable {
@Override
public String mask(String text) {
- return StringUtils.replace(text, getAccessToken(), "******");
+ return Strings.CS.replace(text, getAccessToken(), "******");
}
});
diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
index 57ca1ea41c..d8bddbd145 100644
--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java
@@ -3,12 +3,13 @@ package io.onedev.server.plugin.imports.url;
import java.io.Serializable;
import java.net.URISyntaxException;
-import org.jspecify.annotations.Nullable;
import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.NotEmpty;
+import org.apache.commons.lang3.Strings;
import org.apache.http.client.utils.URIBuilder;
import org.apache.shiro.authz.UnauthorizedException;
+import org.jspecify.annotations.Nullable;
import io.onedev.commons.bootstrap.SecretMasker;
import io.onedev.commons.utils.ExplicitException;
@@ -19,12 +20,12 @@ import io.onedev.server.annotation.ClassValidating;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Password;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.service.AuditService;
-import io.onedev.server.service.ProjectService;
import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.AuditService;
+import io.onedev.server.service.ProjectService;
import io.onedev.server.util.EditContext;
import io.onedev.server.validation.Validatable;
import io.onedev.server.web.component.taskbutton.TaskResult;
@@ -122,7 +123,7 @@ public class ImportServer implements Serializable, Validatable {
SecretMasker.push(text -> {
if (authentication != null)
- return StringUtils.replace(text, authentication.getPassword(), "******");
+ return Strings.CS.replace(text, authentication.getPassword(), "******");
else
return text;
});
diff --git a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
index 614350b6f8..f904486db1 100644
--- a/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
+++ b/server-plugin/server-plugin-sso-discord/src/main/java/io/onedev/server/plugin/sso/discord/oauth2/UserGuildsResponse.java
@@ -1,6 +1,6 @@
package io.onedev.server.plugin.sso.discord.oauth2;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -19,7 +19,7 @@ public class UserGuildsResponse extends Response {
JSONObject guildInfo = (JSONObject) guildsArray.get(idx);
String guildId = (String) guildInfo.get("id");
- if (StringUtils.equals(guildId, serverId)) {
+ if (Strings.CS.equals(guildId, serverId)) {
return guildInfo;
}
}