From 4079b739bc67c3294d3ae39f9bdb2c61d9e1642f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 17 Jun 2020 15:58:33 +0200 Subject: [PATCH 1/2] Mind custom directories for repository types in migration In the migration of the repositories from 1.x to 2.x we did not mind the possibility, that you could configure custom directories for the different repository types in 1.x. With this fix we read these configurations (when they exist) to find the correct repository directories. --- CHANGELOG.md | 1 + .../repository/BaseMigrationStrategy.java | 6 +- ...V1RepositoryMigrationLocationResolver.java | 82 ++++++++++ .../repository/V1RepositoryTypeConfig.java | 42 ++++++ ...positoryMigrationLocationResolverTest.java | 140 ++++++++++++++++++ .../scm/update/repository/scm-home.v1.zip | Bin 14520 -> 12618 bytes 6 files changed, 268 insertions(+), 3 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolver.java create mode 100644 scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryTypeConfig.java create mode 100644 scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolverTest.java diff --git a/CHANGELOG.md b/CHANGELOG.md index e89702b698..61b4078a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Close file lists in migration ([#1191](https://github.com/scm-manager/scm-manager/pull/1191)) - Use command in javahg.py from registrar (Upgrade to newer javahg version) ([#1192](https://github.com/scm-manager/scm-manager/pull/1192)) - Fixed wrong e-tag format ([sdorra/web-resource #1](https://github.com/sdorra/web-resources/pull/1)) +- Handles repositories in custom directories correctly in migration fron 1.x ([#1201](https://github.com/scm-manager/scm-manager/pull/1201)) ## [2.0.0] - 2020-06-04 ### Added diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java index ef2624eadd..300a01c2b3 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/BaseMigrationStrategy.java @@ -36,10 +36,10 @@ import java.util.stream.Stream; abstract class BaseMigrationStrategy implements MigrationStrategy.Instance { - private final SCMContextProvider contextProvider; + private final V1RepositoryMigrationLocationResolver locationResolver; BaseMigrationStrategy(SCMContextProvider contextProvider) { - this.contextProvider = contextProvider; + this.locationResolver = new V1RepositoryMigrationLocationResolver(contextProvider); } Path getSourceDataPath(String name, String type) { @@ -48,7 +48,7 @@ abstract class BaseMigrationStrategy implements MigrationStrategy.Instance { } Path getTypeDependentPath(String type) { - return contextProvider.getBaseDirectory().toPath().resolve("repositories").resolve(type); + return locationResolver.getTypeDependentPath(type); } void listSourceDirectory(Path sourceDirectory, Consumer> pathConsumer) { diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolver.java b/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolver.java new file mode 100644 index 0000000000..5c3b15cb78 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolver.java @@ -0,0 +1,82 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package sonia.scm.update.repository; + +import sonia.scm.SCMContextProvider; +import sonia.scm.migration.UpdateException; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import java.io.File; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +import static java.util.Optional.empty; +import static java.util.Optional.of; + +class V1RepositoryMigrationLocationResolver { + + private final Map typeDependentPaths = new HashMap<>(); + private final SCMContextProvider contextProvider; + + V1RepositoryMigrationLocationResolver(SCMContextProvider contextProvider) { + this.contextProvider = contextProvider; + typeDependentPaths.put("git", readConfiguredPath(contextProvider, "git", "git.xml")); + typeDependentPaths.put("hg", readConfiguredPath(contextProvider, "hg", "hg.xml")); + typeDependentPaths.put("svn", readConfiguredPath(contextProvider, "svn", "svn.xml")); + } + + Path getTypeDependentPath(String type) { + return typeDependentPaths.computeIfAbsent(type, t -> defaultPath(contextProvider, t)); + } + + private static Path readConfiguredPath(SCMContextProvider contextProvider, String type, String filename) { + return readConfig(contextProvider, filename) + .map(v1RepositoryTypeConfig -> v1RepositoryTypeConfig.getRepositoryDirectory().toPath()) + .orElseGet(() -> defaultPath(contextProvider, type)); + } + + private static Path defaultPath(SCMContextProvider contextProvider, String type) { + return contextProvider.getBaseDirectory().toPath().resolve("repositories").resolve(type); + } + + private static Optional readConfig(SCMContextProvider contextProvider, String filename) { + try { + JAXBContext jaxbContext = JAXBContext.newInstance(V1RepositoryTypeConfig.class); + File file = new File(new File(contextProvider.getBaseDirectory(), "config"), filename); + if (file.exists()) { + Object unmarshal = jaxbContext.createUnmarshaller().unmarshal(file); + if (unmarshal instanceof V1RepositoryTypeConfig) { + return of((V1RepositoryTypeConfig) unmarshal); + } + } + } catch (JAXBException e) { + throw new UpdateException(String.format("could not read configuration file %s for repository type configuration", filename), e); + } + return empty(); + } +} diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryTypeConfig.java b/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryTypeConfig.java new file mode 100644 index 0000000000..8e0734486e --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/update/repository/V1RepositoryTypeConfig.java @@ -0,0 +1,42 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package sonia.scm.update.repository; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import java.io.File; + +@XmlRootElement(name = "config") +@XmlAccessorType(XmlAccessType.FIELD) +public class V1RepositoryTypeConfig { + + private File repositoryDirectory; + + public File getRepositoryDirectory() { + return repositoryDirectory; + } +} + diff --git a/scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolverTest.java b/scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolverTest.java new file mode 100644 index 0000000000..98dcaf9192 --- /dev/null +++ b/scm-webapp/src/test/java/sonia/scm/update/repository/V1RepositoryMigrationLocationResolverTest.java @@ -0,0 +1,140 @@ +/* + * MIT License + * + * Copyright (c) 2020-present Cloudogu GmbH and Contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package sonia.scm.update.repository; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import sonia.scm.SCMContextProvider; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class V1RepositoryMigrationLocationResolverTest { + + @Mock + SCMContextProvider contextProvider; + + private Path scmBaseDirectory; + private Path configDirectory; + + @BeforeEach + void initContext(@TempDir Path temp) throws IOException { + scmBaseDirectory = temp.resolve("scm"); + configDirectory = scmBaseDirectory.resolve("config"); + Files.createDirectories(configDirectory); + when(contextProvider.getBaseDirectory()).thenReturn(scmBaseDirectory.toFile()); + } + + @Test + void shouldReturnDefaultPathIfNothingIsConfigured() { + V1RepositoryMigrationLocationResolver resolver = new V1RepositoryMigrationLocationResolver(contextProvider); + + Path path = resolver.getTypeDependentPath("git"); + + assertThat(path).isEqualTo(scmBaseDirectory.resolve("repositories").resolve("git")); + } + + @Test + void shouldReturnCustomPathIfAnotherPathIsConfiguredForGit(@TempDir Path temp) throws IOException { + Path otherGitDirectory = temp.resolve("other"); + Files.write(configDirectory.resolve("git.xml"), + asList("", + "", + " false", + " " + otherGitDirectory + "", + " ", + " false", + "" + ) + ); + + Path path = new V1RepositoryMigrationLocationResolver(contextProvider).getTypeDependentPath("git"); + + assertThat(path).isEqualTo(otherGitDirectory); + } + + @Test + void shouldReturnCustomPathIfAnotherPathIsConfiguredForHg(@TempDir Path temp) throws IOException { + Path otherHgDirectory = temp.resolve("other"); + Files.write(configDirectory.resolve("hg.xml"), + asList("", + "", + " false", + " /var/lib/scm/repositories/hg", + " " + otherHgDirectory + "", + " false", + " false", + " UTF-8", + " hg", + " python2", + " ", + " false", + " false", + "" + ) + ); + + Path path = new V1RepositoryMigrationLocationResolver(contextProvider).getTypeDependentPath("hg"); + + assertThat(path).isEqualTo(otherHgDirectory); + } + + @Test + void shouldReturnCustomPathIfAnotherPathIsConfiguredForSvn(@TempDir Path temp) throws IOException { + Path otherSvnDirectory = temp.resolve("other"); + Files.write(configDirectory.resolve("svn.xml"), + asList("", + "", + " false", + " /var/lib/scm/repositories/svn", + " " + otherSvnDirectory + "", + " false", + " NONE", + "" + ) + ); + + Path path = new V1RepositoryMigrationLocationResolver(contextProvider).getTypeDependentPath("svn"); + + assertThat(path).isEqualTo(otherSvnDirectory); + } + + @Test + void shouldReturnDefaultPathForUnknownRepositoryType() { + Path path = new V1RepositoryMigrationLocationResolver(contextProvider).getTypeDependentPath("other"); + + assertThat(path).isEqualTo(scmBaseDirectory.resolve("repositories").resolve("other")); + } +} diff --git a/scm-webapp/src/test/resources/sonia/scm/update/repository/scm-home.v1.zip b/scm-webapp/src/test/resources/sonia/scm/update/repository/scm-home.v1.zip index 4b21785f20ee59325f4b6208385143a4abe44e1d..4fe6be6caa771d35cda1225a3611f82a1691a445 100644 GIT binary patch literal 12618 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 Pv0rnsyXu93Fc|*>fMK>$ From e8642a451abcca220ccf2a0e849458be8b3bfc34 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 18 Jun 2020 07:27:06 +0200 Subject: [PATCH 2/2] fixed typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61b4078a10..a5ce10024f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Close file lists in migration ([#1191](https://github.com/scm-manager/scm-manager/pull/1191)) - Use command in javahg.py from registrar (Upgrade to newer javahg version) ([#1192](https://github.com/scm-manager/scm-manager/pull/1192)) - Fixed wrong e-tag format ([sdorra/web-resource #1](https://github.com/sdorra/web-resources/pull/1)) -- Handles repositories in custom directories correctly in migration fron 1.x ([#1201](https://github.com/scm-manager/scm-manager/pull/1201)) +- Handles repositories in custom directories correctly in migration from 1.x ([#1201](https://github.com/scm-manager/scm-manager/pull/1201)) ## [2.0.0] - 2020-06-04 ### Added