Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-21 22:16:55 +01:00
Code Issues Packages Projects Releases Activity

Fire RepositoryImportHookEvent instead of PostReceiveRepositoryHookEvent (#1561)

Browse Source 
We will fire an RepositoryImportHookEvent instead of PostReceiveRepositoryHookEvent for repository imports with metadata. The event is only fired if all parts of the repository could be successfully imported. The extra event is required to avoid heavy recalculations which can be triggered by the PostReceiveRepositoryHookEvent for example the scm-statistic-plugin uses the PostReceiveRepositoryHookEvent to calculate its statistics.

Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
This commit is contained in:
Sebastian Sdorra
2021-02-26 09:49:34 +01:00
committed by GitHub
parent c8621061bf
commit 888f5d699b
24 changed files with 252 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scm-webapp/src/test/java/sonia/scm/importexport/FullScmRepositoryImporterTest.java
View File

@@ -31,10 +31,15 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.event.ScmEventBus;
import sonia.scm.repository.ImportRepositoryHookEvent;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryHookEvent;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryPermission;
import sonia.scm.repository.RepositoryTestData;
@@ -52,6 +57,7 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection;
import java.util.function.Consumer;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -98,6 +104,15 @@ class FullScmRepositoryImporterTest {
@InjectMocks
private RepositoryImportStep repositoryImportStep;
@Mock
private ScmEventBus eventBus;
@Mock
private RepositoryHookEvent event;
@Captor
private ArgumentCaptor<Consumer<RepositoryHookEvent>> eventSinkCaptor;
private FullScmRepositoryImporter fullImporter;
@BeforeEach
@@ -108,7 +123,9 @@ class FullScmRepositoryImporterTest {
storeImportStep,
repositoryImportStep,
repositoryManager,
repositoryImportExportEncryption);
repositoryImportExportEncryption,
eventBus
);
}
@BeforeEach
@@ -147,7 +164,7 @@ class FullScmRepositoryImporterTest {
lenient().when(workdirProvider.createNewWorkdir(REPOSITORY.getId())).thenReturn(temp.toFile());
when(compatibilityChecker.check(any())).thenReturn(true);
when(repositoryManager.create(eq(REPOSITORY))).thenReturn(REPOSITORY);
when(repositoryManager.create(REPOSITORY)).thenReturn(REPOSITORY);
}
@Test
@@ -197,13 +214,22 @@ class FullScmRepositoryImporterTest {
}
@Test
void shouldDecryptStreamWhenPasswordSet() throws IOException {
void shouldFireImportRepositoryHookEvent() throws IOException {
InputStream stream = Resources.getResource("sonia/scm/repository/import/scm-import.tar.gz").openStream();
when(repositoryImportExportEncryption.decrypt(any(), eq("hg2tg"))).thenAnswer(invocation -> invocation.getArgument(0));
fullImporter.importFromStream(REPOSITORY, stream, "hg2tg");
// capture the event sink which is registered by RepositoryImportStep
// we use when here instead of verify, because for verify we have used it before
when(unbundleCommandBuilder.setPostEventSink(eventSinkCaptor.capture())).thenReturn(unbundleCommandBuilder);
// when the RepositoryImportStep calls unbundle we pass our mocked event to the captured sink
when(unbundleCommandBuilder.unbundle(any(InputStream.class))).then(ic -> {
eventSinkCaptor.getValue().accept(event);
// RepositoryImportStep does not evaluate the return value of unbundle
return null;
});
verify(updateEngine).update(REPOSITORY.getId());
fullImporter.importFromStream(REPOSITORY, stream, "");
verify(eventBus).post(any(ImportRepositoryHookEvent.class));
}
}
}