archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

HA support for markdown reports

Browse Source
This commit is contained in:
Robin Shen 2022-11-16 15:20:44 +08:00
parent ce432ac6ec
commit 9ea3011bbe
11 changed files with 190 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
View File

@ -73,9 +73,8 @@ public class PublishArtifactStep extends ServerSideStep {
@Override
public Void call() throws Exception {
File artifactsDir = build.getArtifactsDir();
OneDev.getInstance(StorageManager.class).initArtifactsDir(build.getProject().getId(), build.getNumber());
FileUtils.copyDirectory(inputDir, artifactsDir);
FileUtils.copyDirectory(inputDir, build.getArtifactsDir());
return null;
}

8
server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
View File

@ -1500,11 +1500,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public Void call() throws Exception {
if (dependency.getArtifactsDir().exists()) {
File artifactsDir = dependency.getArtifactsDir();
if (artifactsDir.exists()) {
PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
int baseLen = dependency.getArtifactsDir().getAbsolutePath().length()+1;
for (File file: FileUtils.listFiles(dependency.getArtifactsDir(),
patternSet.getIncludes(), patternSet.getExcludes())) {
int baseLen = artifactsDir.getAbsolutePath().length()+1;
for (File file: FileUtils.listFiles(artifactsDir, patternSet.getIncludes(), patternSet.getExcludes())) {
FileUtils.copyFile(file,
new File(targetDir, file.getAbsolutePath().substring(baseLen)));
}

2
server-core/src/main/java/io/onedev/server/model/PullRequest.java
View File

@ -811,7 +811,7 @@ public class PullRequest extends AbstractEntity
Project project = getTargetProject();
ObjectId headCommitId = ObjectId.fromString(getLatestUpdate().getHeadCommitHash());
ObjectId targetHeadCommitId = ObjectId.fromString(getLatestUpdate().getTargetHeadCommitHash());
return getGitService().getReachableCommits(project, Lists.newArrayList(headCommitId),
pendingCommits = getGitService().getReachableCommits(project, Lists.newArrayList(headCommitId),
Lists.newArrayList(targetHeadCommitId));
}
return pendingCommits;

32
server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
View File

@ -1,10 +1,16 @@
package io.onedev.server.web.page.project.builds.detail.dashboard;
import java.io.File;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;
@ -19,14 +25,28 @@ public class BuildDashboardPage extends BuildDetailPage {
super(params);
PageProvider pageProvider;
if (SecurityUtils.canAccessLog(getBuild()))
if (SecurityUtils.canAccessLog(getBuild())) {
pageProvider = new PageProvider(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));
else if (SecurityUtils.canReadCode(getProject()))
} else if (SecurityUtils.canReadCode(getProject())) {
pageProvider = new PageProvider(BuildPipelinePage.class, BuildPipelinePage.paramsOf(getBuild()));
else if (getBuild().getArtifactsDir().exists())
pageProvider = new PageProvider(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));
else
pageProvider = new PageProvider(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild()));
} else {
Long projectId = getBuild().getProject().getId();
Long buildNumber = getBuild().getNumber();
boolean hasArtifacts = OneDev.getInstance(ProjectManager.class).runOnProjectServer(projectId, new ClusterTask<Boolean>() {
@Override
public Boolean call() throws Exception {
File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);
return artifactsDir.exists() && artifactsDir.listFiles().length != 0;
}
});
if (hasArtifacts)
pageProvider = new PageProvider(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));
else
pageProvider = new PageProvider(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild()));
}
throw new RestartResponseException(pageProvider, RedirectPolicy.NEVER_REDIRECT);
}

2
server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
View File

@ -1230,7 +1230,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void populateItem(ListItem<PullRequestSummaryPart> item) {
PullRequestSummaryPart part = item.getModelObject();
item.add(new Label("head", part.getTitle()));
item.add(new Label("head", part.getReportName()));
item.add(part.render("body"));
}

16
server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestSummaryPart.java
View File

@ -1,17 +1,21 @@
package io.onedev.server.web.page.project.pullrequests.detail;
import java.io.Serializable;
import org.apache.wicket.Component;
public abstract class PullRequestSummaryPart {
public abstract class PullRequestSummaryPart implements Serializable {
private final String title;
private static final long serialVersionUID = 1L;
public PullRequestSummaryPart(String title) {
this.title = title;
private final String reportName;
public PullRequestSummaryPart(String reportName) {
this.reportName = reportName;
}
public String getTitle() {
return title;
public String getReportName() {
return reportName;
}
public abstract Component render(String componentId);

63
server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportModule.java
View File

@ -58,11 +58,10 @@ public class MarkdownReportModule extends AbstractPluginModule {
@Override
public List<BuildTab> getTabs(Build build) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
Long projectId = build.getProject().getId();
Long buildNumber = build.getNumber();
return projectManager.runOnProjectServer(projectId, new GetBuildTabs(projectId, buildNumber)).stream()
return getProjectManager().runOnProjectServer(projectId, new GetBuildTabs(projectId, buildNumber)).stream()
.filter(it->SecurityUtils.canAccessReport(build, it.getTitle()))
.collect(Collectors.toList());
}
@ -79,23 +78,13 @@ public class MarkdownReportModule extends AbstractPluginModule {
@Override
public List<PullRequestSummaryPart> getParts(PullRequest request) {
List<PullRequestSummaryPart> parts = new ArrayList<>();
Long projectId = request.getProject().getId();
for (Build build: request.getCurrentBuilds()) {
parts.addAll(LockUtils.read(PublishPullRequestMarkdownReportStep.getReportLockKey(build), new Callable<List<PullRequestSummaryPart>>() {
@Override
public List<PullRequestSummaryPart> call() throws Exception {
List<PullRequestSummaryPart> parts = new ArrayList<>();
File categoryDir = new File(build.getDir(), PublishPullRequestMarkdownReportStep.CATEGORY);
if (categoryDir.exists()) {
for (File reportDir: categoryDir.listFiles()) {
if (SecurityUtils.canAccessReport(build, reportDir.getName()))
parts.add(new PullRequestSummaryMarkdownPart(reportDir));
}
}
return parts;
}
}));
Long buildNumber = build.getNumber();
for (PullRequestSummaryPart part: getProjectManager().runOnProjectServer(projectId, new GetPullRequestSummaryParts(projectId, buildNumber))) {
if (SecurityUtils.canAccessReport(build, part.getReportName()))
parts.add(part);
}
}
return parts;
}
@ -119,6 +108,10 @@ public class MarkdownReportModule extends AbstractPluginModule {
});
}
private ProjectManager getProjectManager() {
return OneDev.getInstance(ProjectManager.class);
}
private static class GetBuildTabs implements ClusterTask<List<BuildTab>> {
@ -140,7 +133,7 @@ public class MarkdownReportModule extends AbstractPluginModule {
@Override
public List<BuildTab> call() throws Exception {
List<BuildTab> tabs = new ArrayList<>();
File categoryDir = new File(Build.getDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.CATEGORY);
File categoryDir = new File(Build.getDir(projectId, buildNumber), PublishMarkdownReportStep.CATEGORY);
if (categoryDir.exists()) {
for (File reportDir: categoryDir.listFiles())
tabs.add(new MarkdownReportTab(reportDir.getName()));
@ -161,4 +154,36 @@ public class MarkdownReportModule extends AbstractPluginModule {
}
private static class GetPullRequestSummaryParts implements ClusterTask<List<PullRequestSummaryPart>> {
private static final long serialVersionUID = 1L;
private final Long projectId;
private final Long buildNumber;
private GetPullRequestSummaryParts(Long projectId, Long buildNumber) {
this.projectId = projectId;
this.buildNumber = buildNumber;
}
@Override
public List<PullRequestSummaryPart> call() throws Exception {
return LockUtils.read(PublishPullRequestMarkdownReportStep.getReportLockName(projectId, buildNumber), new Callable<List<PullRequestSummaryPart>>() {
@Override
public List<PullRequestSummaryPart> call() throws Exception {
List<PullRequestSummaryPart> parts = new ArrayList<>();
File categoryDir = new File(Build.getDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.CATEGORY);
if (categoryDir.exists()) {
for (File reportDir: categoryDir.listFiles())
parts.add(new PullRequestSummaryMarkdownPart(projectId, buildNumber, reportDir.getName()));
}
return parts;
}
});
}
}
}

42
server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java
View File

@ -1,7 +1,6 @@
package io.onedev.server.plugin.report.markdown;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@ -19,6 +18,9 @@ import com.google.common.base.Splitter;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.markdown.MarkdownViewer;
@ -57,14 +59,10 @@ public class MarkdownReportPage extends BuildDetailPage {
protected void onInitialize() {
super.onInitialize();
File file = new File(getBuild().getDir(),
PublishMarkdownReportStep.CATEGORY + "/" + reportName + "/" + filePath);
try {
String markdown = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
add(new MarkdownViewer("markdownReport", Model.of(markdown), null));
} catch (IOException e) {
throw new RuntimeException(e);
}
Long projectId = getBuild().getProject().getId();
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
String markdown = projectManager.runOnProjectServer(projectId, new GetMarkdownContent(projectId, getBuild().getNumber(), reportName, filePath));
add(new MarkdownViewer("markdownReport", Model.of(markdown), null));
}
@Override
@ -94,4 +92,30 @@ public class MarkdownReportPage extends BuildDetailPage {
}
return params;
}
private static class GetMarkdownContent implements ClusterTask<String> {
private final Long projectId;
private final Long buildNumber;
private final String reportName;
private final String filePath;
private GetMarkdownContent(Long projectId, Long buildNumber, String reportName, String filePath) {
this.projectId = projectId;
this.buildNumber = buildNumber;
this.reportName = reportName;
this.filePath = filePath;
}
@Override
public String call() throws Exception {
File file = new File(Build.getDir(projectId, buildNumber),
PublishMarkdownReportStep.CATEGORY + "/" + reportName + "/" + filePath);
return FileUtils.readFileToString(file, StandardCharsets.UTF_8);
}
}
}

48
server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java
View File

@ -11,6 +11,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
@ -30,16 +34,11 @@ public class MarkdownReportTab extends BuildTab {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
BuildDetailPage page = (BuildDetailPage) getPage();
String startPage = LockUtils.read(PublishMarkdownReportStep.getReportLockName(page.getBuild()), new Callable<String>() {
@Override
public String call() throws Exception {
File startPageFile = new File(page.getBuild().getDir(),
PublishMarkdownReportStep.CATEGORY + "/" + getTitle() + "/" + PublishMarkdownReportStep.START_PAGE);
return FileUtils.readFileToString(startPageFile, StandardCharsets.UTF_8);
}
});
Build build = page.getBuild();
Long projectId = build.getProject().getId();
Long buildNumber = build.getNumber();
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
String startPage = projectManager.runOnProjectServer(projectId, new GetStartPage(projectId, buildNumber, getTitle()));
PageParameters params = MarkdownReportPage.paramsOf(page.getBuild(), getTitle(), startPage);
return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);
@ -58,4 +57,33 @@ public class MarkdownReportTab extends BuildTab {
}
}
private static class GetStartPage implements ClusterTask<String> {
private Long projectId;
private Long buildNumber;
private String reportName;
private GetStartPage(Long projectId, Long buildNumber, String reportName) {
this.projectId = projectId;
this.buildNumber = buildNumber;
this.reportName = reportName;
}
@Override
public String call() throws Exception {
return LockUtils.read(PublishMarkdownReportStep.getReportLockName(projectId, buildNumber), new Callable<String>() {
@Override
public String call() throws Exception {
File startPageFile = new File(Build.getDir(projectId, buildNumber),
PublishMarkdownReportStep.CATEGORY + "/" + reportName + "/" + PublishMarkdownReportStep.START_PAGE);
return FileUtils.readFileToString(startPageFile, StandardCharsets.UTF_8);
}
});
}
}
}

6
server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
View File

@ -55,7 +55,7 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
@Override
public Map<String, byte[]> run(Build build, File workspace, TaskLogger logger) {
if (build.getRequest() != null) {
LockUtils.write(getReportLockKey(build), new Callable<Void>() {
LockUtils.write(getReportLockName(build.getProject().getId(), build.getNumber()), new Callable<Void>() {
@Override
public Void call() throws Exception {
@ -76,8 +76,8 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
return null;
}
public static String getReportLockKey(Build build) {
return PublishPullRequestMarkdownReportStep.class.getName() + ":" + build.getId();
public static String getReportLockName(Long projectId, Long buildNumber) {
return PublishPullRequestMarkdownReportStep.class.getName() + ":" + projectId + ":" + buildNumber;
}
}

43
server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PullRequestSummaryMarkdownPart.java
View File

@ -1,7 +1,6 @@
package io.onedev.server.plugin.report.markdown;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.apache.wicket.Component;
@ -9,28 +8,44 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.Model;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestSummaryPart;
public class PullRequestSummaryMarkdownPart extends PullRequestSummaryPart {
private final File reportDir;
private static final long serialVersionUID = 1L;
public PullRequestSummaryMarkdownPart(File reportDir) {
super(reportDir.getName());
this.reportDir = reportDir;
private final Long projectId;
private final Long buildNumber;
public PullRequestSummaryMarkdownPart(Long projectId, Long buildNumber, String reportName) {
super(reportName);
this.projectId = projectId;
this.buildNumber = buildNumber;
}
@Override
public Component render(String componentId) {
try {
File file = new File(reportDir, PublishPullRequestMarkdownReportStep.FILE);
String markdown = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
return new MarkdownViewer(componentId, Model.of(markdown), null)
.add(AttributeAppender.append("class", "mb-n3"));
} catch (IOException e) {
throw new RuntimeException(e);
}
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
String markdown = projectManager.runOnProjectServer(projectId, new ClusterTask<String>() {
private static final long serialVersionUID = 1L;
@Override
public String call() throws Exception {
File categoryDir = new File(Build.getDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.CATEGORY);
File file = new File(new File(categoryDir, getReportName()), PublishPullRequestMarkdownReportStep.FILE);
return FileUtils.readFileToString(file, StandardCharsets.UTF_8);
}
});
return new MarkdownViewer(componentId, Model.of(markdown), null)
.add(AttributeAppender.append("class", "mb-n3"));
}
}