Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support local-to-remote mirroring #717

Merged
merged 14 commits into from
Oct 27, 2022
Merged

Support local-to-remote mirroring #717

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
665b8d5
Support local-to-remote mirroring
minwoox Aug 22, 2022
665f77c
Update document
minwoox Aug 22, 2022
7085f03
Address comment by @ikhoon and add more test
minwoox Sep 26, 2022
6f9dfae
Add visible for testing annotation
minwoox Sep 26, 2022
065b28e
Close git
minwoox Sep 26, 2022
71ded38
Test deleing file
minwoox Sep 26, 2022
fb6a18f
Removing purging
minwoox Sep 26, 2022
9e4d658
Revert TempDir
minwoox Sep 26, 2022
5472052
Merge branch 'master' into cdToGit
minwoox Oct 5, 2022
e2c8db4
Address comments by @ikhoon
minwoox Oct 5, 2022
41a07b6
Merge branch 'master' into cdToGit
minwoox Oct 5, 2022
72a29e0
Address comments by @jrhee17
minwoox Oct 19, 2022
2bab7bf
Merge branch 'master' into cdToGit
minwoox Oct 19, 2022
52187d1
Address the comment by @ikhoon
minwoox Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions it/src/test/java/com/linecorp/centraldogma/it/mirror/git/GitMirrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;

Expand All @@ -63,7 +64,6 @@
import com.linecorp.centraldogma.server.MirrorException;
import com.linecorp.centraldogma.server.MirroringService;
import com.linecorp.centraldogma.server.storage.project.Project;
import com.linecorp.centraldogma.testing.internal.TemporaryFolderExtension;
import com.linecorp.centraldogma.testing.internal.TestUtil;
import com.linecorp.centraldogma.testing.junit.CentralDogmaExtension;

Expand Down Expand Up @@ -93,14 +93,8 @@ static void init() {
mirroringService = dogma.mirroringService();
}

@RegisterExtension
final TemporaryFolderExtension gitRepoDir = new TemporaryFolderExtension() {
@Override
protected boolean runForEachTest() {
return true;
}
};

@TempDir
File gitRepoDir;
private Git git;
private File gitWorkTree;
private String gitUri;
Expand All @@ -110,7 +104,7 @@ protected boolean runForEachTest() {
@BeforeEach
void initGitRepo(TestInfo testInfo) throws Exception {
final String repoName = TestUtil.normalizedDisplayName(testInfo);
gitWorkTree = new File(gitRepoDir.getRoot().toFile(), repoName).getAbsoluteFile();
gitWorkTree = new File(gitRepoDir, repoName).getAbsoluteFile();
final Repository gitRepo = new FileRepositoryBuilder().setWorkTree(gitWorkTree).build();
createGitRepo(gitRepo);

Expand Down Expand Up @@ -334,7 +328,7 @@ void remoteToLocal_submodule(TestInfo testInfo) throws Exception {
// Create a new repository for a submodule.
final String submoduleName = TestUtil.normalizedDisplayName(testInfo) + ".submodule";
final File gitSubmoduleWorkTree =
new File(gitRepoDir.getRoot().toFile(), submoduleName).getAbsoluteFile();
new File(gitRepoDir, submoduleName).getAbsoluteFile();
final Repository gitSubmoduleRepo =
new FileRepositoryBuilder().setWorkTree(gitSubmoduleWorkTree).build();
createGitRepo(gitSubmoduleRepo);
Expand Down Expand Up @@ -453,8 +447,8 @@ private void addToGitIndex(String path, String content) throws IOException, GitA
addToGitIndex(git, gitWorkTree, path, content);
}

private static void addToGitIndex(Git git, File gitWorkTree,
String path, String content) throws IOException, GitAPIException {
static void addToGitIndex(Git git, File gitWorkTree,
String path, String content) throws IOException, GitAPIException {
final File file = Paths.get(gitWorkTree.getAbsolutePath(), path.split("/")).toFile();
file.getParentFile().mkdirs();
Files.asCharSink(file, StandardCharsets.UTF_8).write(content);
Expand Down
Loading