Skip to content

The Unified and Autonomous Development Platform

Better handles build error message to find out root of cause

Robin Shen030e71800d27
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index abd57c5ce1..7b2d82b585 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -443,9 +443,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public Boolean call() {
Build build = buildManager.load(buildId);
- if (e instanceof OneException)
+ if (e instanceof OneException)
build.setErrorMessage(e.getMessage());
- else
+ else
build.setErrorMessage(Throwables.getStackTraceAsString(e));
buildManager.save(build);
RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
@@ -544,20 +544,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private void log(Throwable e, JobLogger logger) {
- if (e.getMessage() != null)
+ if (e instanceof OneException)
logger.log(e.getMessage());
else
logger.log(e);
}
private RuntimeException maskSecrets(Throwable e, Collection<String> jobSecretsToMask) {
- String errorMessage = e.getMessage();
- if (errorMessage != null) {
+ if (e instanceof OneException) {
+ String errorMessage = e.getMessage();
for (String secret: jobSecretsToMask)
errorMessage = StringUtils.replace(errorMessage, secret, SecretInput.MASK);
- return new RuntimeException(errorMessage);
+ return new OneException(errorMessage);
} else {
- return ExceptionUtils.unchecked(e);
+ String stackTrace = Throwables.getStackTraceAsString(e);
+ for (String secret: jobSecretsToMask)
+ stackTrace = StringUtils.replace(stackTrace, secret, SecretInput.MASK);
+ return new OneException(stackTrace);
}
}
@@ -787,7 +790,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
build.setStatus(Build.Status.CANCELLED);
} catch (ExecutionException e) {
- if (e.getCause() != null)
+ if (e.getCause() instanceof OneException)
build.setStatus(Build.Status.FAILED, e.getCause().getMessage());
else
build.setStatus(Build.Status.FAILED, e.getMessage());
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
index 5f29fda394..eba8594786 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java
@@ -121,7 +121,7 @@ public class ProjectDependency implements Serializable {
private static List<InputSuggestion> suggestArtifacts(String matchWith) {
Project project = getInputProject();
String buildNumber = (String) EditContext.get().getInputValue("buildNumber");
- if (project != null && io.onedev.server.util.interpolative.Interpolative.fromString(buildNumber).getSegments(Segment.Type.VARIABLE).isEmpty()) {
+ if (project != null && io.onedev.server.util.interpolative.Interpolative.parse(buildNumber).getSegments(Segment.Type.VARIABLE).isEmpty()) {
if (buildNumber.startsWith("#"))
buildNumber = buildNumber.substring(1);
Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(buildNumber));
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
index 241f26a61b..2d579b5090 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java
@@ -109,7 +109,7 @@ public class VariableInterpolator implements Function<String, String> {
Method setter = BeanUtils.findSetter(getter);
if (setter != null) {
try {
- Object propertyValue = getter.invoke(enhanced);
+ Object propertyValue = getter.invoke(object);
if (propertyValue != null) {
if (propertyValue.getClass().getAnnotation(Editable.class) != null) {
setter.invoke(enhanced, installInterceptor(propertyValue));
@@ -145,15 +145,21 @@ public class VariableInterpolator implements Function<String, String> {
&& method.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {
Serializable propertyValue = (Serializable) methodProxy.invokeSuper(proxy, args);
Build build = Build.get();
- if (build == null) {
- throw new OneException("No build context in interpolator interceptor");
- } else if (propertyValue instanceof String) {
- return build.interpolate((String) propertyValue);
- } else if (propertyValue instanceof List) {
- List<String> interpolatedList = new ArrayList<>();
- for (String element: (List<String>) propertyValue)
- interpolatedList.add(build.interpolate(element));
- return interpolatedList;
+ try {
+ if (build == null) {
+ throw new RuntimeException("No build context");
+ } else if (propertyValue instanceof String) {
+ return build.interpolate((String) propertyValue);
+ } else if (propertyValue instanceof List) {
+ List<String> interpolatedList = new ArrayList<>();
+ for (String element: (List<String>) propertyValue)
+ interpolatedList.add(build.interpolate(element));
+ return interpolatedList;
+ }
+ } catch (Exception e) {
+ String message = String.format("Error doing interpolator intercepting (class: %s, method: %s)",
+ method.getDeclaringClass().getName(), method.getName());
+ throw new RuntimeException(message, e);
}
}
return methodProxy.invokeSuper(proxy, args);
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index a3d2d32978..a4bd929d1e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -675,7 +675,7 @@ public class Build extends AbstractEntity implements Referenceable {
public String interpolate(@Nullable String interpolativeString) {
if (interpolativeString != null)
- return StringUtils.unescape(Interpolative.fromString(interpolativeString).interpolateWith(new VariableInterpolator(this)));
+ return StringUtils.unescape(Interpolative.parse(interpolativeString).interpolateWith(new VariableInterpolator(this)));
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
index 86875f9595..cdfa7e6c76 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java
@@ -32,9 +32,27 @@ public class Interpolative implements Serializable {
this.segments = segments;
}
- public static Interpolative fromString(String interpolativeString) {
+ public static Interpolative parse(String interpolativeString) {
+ CharStream is = CharStreams.fromString(interpolativeString);
+ InterpolativeLexer lexer = new InterpolativeLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed interpolative");
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ InterpolativeParser parser = new InterpolativeParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ InterpolativeContext interpolativeContext = parser.interpolative();
+
List<Segment> segments = new ArrayList<>();
- for (SegmentContext segment: parse(interpolativeString).segment()) {
+ for (SegmentContext segment: interpolativeContext.segment()) {
if (segment.Literal() != null)
segments.add(new Segment(Type.LITERAL, segment.Literal().getText()));
else
@@ -61,24 +79,4 @@ public class Interpolative implements Serializable {
return builder.toString();
}
- public static InterpolativeContext parse(String interpolativeString) {
- CharStream is = CharStreams.fromString(interpolativeString);
- InterpolativeLexer lexer = new InterpolativeLexer(is);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new BaseErrorListener() {
-
- @Override
- public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
- int charPositionInLine, String msg, RecognitionException e) {
- throw new OneException("Malformed interpolative");
- }
-
- });
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- InterpolativeParser parser = new InterpolativeParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- return parser.interpolative();
- }
-
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java
index b382f0a645..dcfd25d913 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java
@@ -23,7 +23,7 @@ public class CommitHashValidator implements ConstraintValidator<CommitHash, Stri
@Override
public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null || interpolative && !Interpolated.get() && !Interpolative.fromString(value).getSegments(Segment.Type.VARIABLE).isEmpty())
+ if (value == null || interpolative && !Interpolated.get() && !Interpolative.parse(value).getSegments(Segment.Type.VARIABLE).isEmpty())
return true;
if (!ObjectId.isId(value)) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
index 3814e855bd..0e24dde817 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
@@ -27,7 +27,7 @@ public class DirectoryValidator implements ConstraintValidator<Directory, String
return true;
if (annotation.interpolative() && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
index dfbef2c8bf..dec35431f8 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
@@ -29,7 +29,7 @@ public class DnsNameValidator implements ConstraintValidator<DnsName, String> {
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java
index c5a4f10fae..4bd9849a06 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java
@@ -30,7 +30,7 @@ public class GroupNameValidator implements ConstraintValidator<GroupName, String
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java
index a060ab7186..a6be948e2b 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java
@@ -33,7 +33,7 @@ public class InterpolativeValidator implements ConstraintValidator<Interpolative
for (String each: values) {
try {
- io.onedev.server.util.interpolative.Interpolative.fromString(each);
+ io.onedev.server.util.interpolative.Interpolative.parse(each);
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java
index 1e4199695e..8ee2db26ad 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java
@@ -26,7 +26,7 @@ public class NumericValidator implements ConstraintValidator<Numeric, String> {
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java
index 71782fcfab..863650079c 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java
@@ -28,7 +28,7 @@ public class PathSegmentValidator implements ConstraintValidator<PathSegment, St
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java
index 10d9402b5a..c7c4143086 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java
@@ -28,7 +28,7 @@ public class PathValidator implements ConstraintValidator<Path, String> {
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
index 060ffadcc1..70ae58c956 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/PatternsValidator.java
@@ -26,7 +26,7 @@ public class PatternsValidator implements ConstraintValidator<Patterns, String>
if (value == null)
return true;
if (interpolative && !Interpolated.get()) try {
- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
index d298c58df9..021c2f6b40 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
@@ -30,7 +30,7 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java
index 444ac6d658..a6328a3625 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java
@@ -31,7 +31,7 @@ public class RegExValidator implements ConstraintValidator<RegEx, String> {
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/SecretNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/SecretNameValidator.java
index 16024ab632..f39b7279af 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/SecretNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/SecretNameValidator.java
@@ -30,7 +30,7 @@ public class SecretNameValidator implements ConstraintValidator<SecretName, Stri
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
index e29e599762..ee80550e1c 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
@@ -30,7 +30,7 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
index d510c3356d..0cf3849bfc 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
@@ -28,7 +28,7 @@ public class VariableNameValidator implements ConstraintValidator<VariableName,
return true;
if (interpolative && !Interpolated.get()) try {
- value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {
+ value = StringUtils.unescape(Interpolative.parse(value).interpolateWith(new Function<String, String>() {
@Override
public String apply(String t) {
diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java
index b2de2c4b7e..e623fb2311 100644
--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java
@@ -27,25 +27,25 @@ public class InterpolativePatternSetGrammarTest {
String interpolated;
expected = new PatternSet(Sets.newHashSet("\"hello\""), Sets.newHashSet("\"hello world\""));
- interpolated = Interpolative.fromString("\\\"hello\\\" -@\"\\\"hello world\\\"\"@").interpolateWith(interpolator);
+ interpolated = Interpolative.parse("\\\"hello\\\" -@\"\\\"hello world\\\"\"@").interpolateWith(interpolator);
actual = PatternSet.parse(interpolated);
assertEquals(expected.getIncludes(), actual.getIncludes());
assertEquals(expected.getExcludes(), actual.getExcludes());
expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());
- interpolated = Interpolative.fromString("@\"@hello world\"").interpolateWith(interpolator);
+ interpolated = Interpolative.parse("@\"@hello world\"").interpolateWith(interpolator);
actual = PatternSet.parse(interpolated);
assertEquals(expected.getIncludes(), actual.getIncludes());
assertEquals(expected.getExcludes(), actual.getExcludes());
expected = new PatternSet(Sets.newHashSet("@robin", "-@alive"), Sets.newHashSet("\"@"));
- interpolated = Interpolative.fromString("\\@robin \"-\\@alive\" -\\\"\\@").interpolateWith(interpolator);
+ interpolated = Interpolative.parse("\\@robin \"-\\@alive\" -\\\"\\@").interpolateWith(interpolator);
actual = PatternSet.parse(interpolated);
assertEquals(expected.getIncludes(), actual.getIncludes());
assertEquals(expected.getExcludes(), actual.getExcludes());
expected = new PatternSet(Sets.newHashSet("@robin", "hello world", "world"), Sets.newHashSet("hello"));
- interpolated = Interpolative.fromString("\\@robin @\"hello world\"@ -@hello world@").interpolateWith(interpolator);
+ interpolated = Interpolative.parse("\\@robin @\"hello world\"@ -@hello world@").interpolateWith(interpolator);
actual = PatternSet.parse(interpolated);
assertEquals(expected.getIncludes(), actual.getIncludes());
assertEquals(expected.getExcludes(), actual.getExcludes());