From 057c58413dd70f15f012af815de3ea9485ea0b25 Mon Sep 17 00:00:00 2001 From: Mohamed Karray Date: Wed, 19 Sep 2018 18:28:42 +0200 Subject: [PATCH 01/23] bugfixing --- .../sonia/scm/it/RepositoryAccessITCase.java | 2 +- .../BranchChangesetCollectionToDtoMapper.java | 23 +++++++++++++++++++ .../api/v2/resources/BranchRootResource.java | 18 +++++++++++---- .../api/v2/resources/TagToTagDtoMapper.java | 2 +- .../v2/resources/BranchRootResourceTest.java | 9 +++++--- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java index 398921a692..161f15d87a 100644 --- a/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java +++ b/scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java @@ -165,7 +165,7 @@ public class RepositoryAccessITCase { .isNotNull() .contains(String.format("%s/sources/%s", repositoryUrl, changeset.getId())); - assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.changesets.href")) + assertThat(response.body().jsonPath().getString("_embedded.tags.find{it.name=='" + tagName + "'}._links.changeset.href")) .as("assert single tag changesets link") .isNotNull() .contains(String.format("%s/changesets/%s", repositoryUrl, changeset.getId())); diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java new file mode 100644 index 0000000000..9db35c10eb --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java @@ -0,0 +1,23 @@ +package sonia.scm.api.v2.resources; + +import sonia.scm.PageResult; +import sonia.scm.repository.Changeset; +import sonia.scm.repository.Repository; + +import javax.inject.Inject; + +public class BranchChangesetCollectionToDtoMapper extends ChangesetCollectionToDtoMapper { + + @Inject + public BranchChangesetCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) { + super(changesetToChangesetDtoMapper, resourceLinks); + } + + public CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository, String branch) { + return this.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository, branch)); + } + + protected String createSelfLink(Repository repository, String branch) { + return resourceLinks.branch().history(repository.getNamespaceAndName(), branch); + } +} diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java index 9763f11def..cc773e41e7 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java @@ -3,6 +3,7 @@ package sonia.scm.api.v2.resources; import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.rs.TypeHint; +import sonia.scm.NotFoundException; import sonia.scm.PageResult; import sonia.scm.repository.Branches; import sonia.scm.repository.Changeset; @@ -25,6 +26,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import java.io.IOException; +import java.text.MessageFormat; public class BranchRootResource { @@ -32,14 +34,14 @@ public class BranchRootResource { private final BranchToBranchDtoMapper branchToDtoMapper; private final BranchCollectionToDtoMapper branchCollectionToDtoMapper; - private final ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper; + private final BranchChangesetCollectionToDtoMapper branchChangesetCollectionToDtoMapper; @Inject - public BranchRootResource(RepositoryServiceFactory serviceFactory, BranchToBranchDtoMapper branchToDtoMapper, BranchCollectionToDtoMapper branchCollectionToDtoMapper, ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper) { + public BranchRootResource(RepositoryServiceFactory serviceFactory, BranchToBranchDtoMapper branchToDtoMapper, BranchCollectionToDtoMapper branchCollectionToDtoMapper, BranchChangesetCollectionToDtoMapper changesetCollectionToDtoMapper) { this.serviceFactory = serviceFactory; this.branchToDtoMapper = branchToDtoMapper; this.branchCollectionToDtoMapper = branchCollectionToDtoMapper; - this.changesetCollectionToDtoMapper = changesetCollectionToDtoMapper; + this.branchChangesetCollectionToDtoMapper = changesetCollectionToDtoMapper; } /** @@ -98,6 +100,14 @@ public class BranchRootResource { @DefaultValue("0") @QueryParam("page") int page, @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws Exception { try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) { + boolean branchExists = repositoryService.getBranchesCommand() + .getBranches() + .getBranches() + .stream() + .anyMatch(branch -> branchName.equals(branch.getName())); + if (!branchExists){ + throw new NotFoundException(MessageFormat.format("The branch {0} is not found", branchName)); + } Repository repository = repositoryService.getRepository(); RepositoryPermissions.read(repository).check(); ChangesetPagingResult changesets = repositoryService.getLogCommand() @@ -107,7 +117,7 @@ public class BranchRootResource { .getChangesets(); if (changesets != null && changesets.getChangesets() != null) { PageResult pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal()); - return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build(); + return Response.ok(branchChangesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository, branchName)).build(); } else { return Response.ok().build(); } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java index 917b4b7789..ee0488e037 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/TagToTagDtoMapper.java @@ -28,7 +28,7 @@ public abstract class TagToTagDtoMapper { Links.Builder linksBuilder = linkingTo() .self(resourceLinks.tag().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getName())) .single(link("sources", resourceLinks.source().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision()))) - .single(link("changesets", resourceLinks.changeset().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision()))); + .single(link("changeset", resourceLinks.changeset().self(namespaceAndName.getNamespace(), namespaceAndName.getName(), target.getRevision()))); target.add(linksBuilder.build()); } } diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java index 13ed9cddcd..4994c11b08 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java @@ -67,7 +67,7 @@ public class BranchRootResourceTest extends RepositoryTestBase { @InjectMocks private BranchToBranchDtoMapperImpl branchToDtoMapper; - private ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper; + private BranchChangesetCollectionToDtoMapper changesetCollectionToDtoMapper; private BranchRootResource branchRootResource; @@ -90,7 +90,7 @@ public class BranchRootResourceTest extends RepositoryTestBase { @Before public void prepareEnvironment() throws Exception { - changesetCollectionToDtoMapper = new ChangesetCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks); + changesetCollectionToDtoMapper = new BranchChangesetCollectionToDtoMapper(changesetToChangesetDtoMapper, resourceLinks); BranchCollectionToDtoMapper branchCollectionToDtoMapper = new BranchCollectionToDtoMapper(branchToDtoMapper, resourceLinks); branchRootResource = new BranchRootResource(serviceFactory, branchToDtoMapper, branchCollectionToDtoMapper, changesetCollectionToDtoMapper); super.branchRootResource = Providers.of(branchRootResource); @@ -152,6 +152,10 @@ public class BranchRootResourceTest extends RepositoryTestBase { when(logCommandBuilder.setPagingLimit(anyInt())).thenReturn(logCommandBuilder); when(logCommandBuilder.setBranch(anyString())).thenReturn(logCommandBuilder); when(logCommandBuilder.getChangesets()).thenReturn(changesetPagingResult); + Branches branches = mock(Branches.class); + List branchList = Lists.newArrayList(new Branch("master",id)); + when(branches.getBranches()).thenReturn(branchList); + when(branchesCommandBuilder.getBranches()).thenReturn(branches); MockHttpRequest request = MockHttpRequest.get(BRANCH_URL + "/changesets/"); MockHttpResponse response = new MockHttpResponse(); dispatcher.invoke(request, response); @@ -161,6 +165,5 @@ public class BranchRootResourceTest extends RepositoryTestBase { assertTrue(response.getContentAsString().contains(String.format("\"name\":\"%s\"", authorName))); assertTrue(response.getContentAsString().contains(String.format("\"mail\":\"%s\"", authorEmail))); assertTrue(response.getContentAsString().contains(String.format("\"description\":\"%s\"", commit))); - assertTrue(response.getContentAsString().contains(String.format("\"description\":\"%s\"", commit))); } } From e95802490ef5f3f3cfc2e845d07e06c75c981ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 09:07:12 +0200 Subject: [PATCH 02/23] new branch --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 50a2374544..e737e47ecc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,8 @@ node() { // No specific label properties([ // Keep only the last 10 build to preserve space - buildDiscarder(logRotator(numToKeepStr: '10')) + buildDiscarder(logRotator(numToKeepStr: '10')), + disableConcurrentBuilds() ]) timeout(activity: true, time: 20, unit: 'MINUTES') { From 9c8b88587c6385a6f6df9ec7675d80b41a31d731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 10:40:09 +0200 Subject: [PATCH 03/23] Workaround missing cleanup on other tests --- .../sonia/scm/repository/DefaultRepositoryManagerTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java index b7d231cf38..a67c275bc0 100644 --- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java +++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java @@ -38,6 +38,7 @@ import com.github.sdorra.shiro.SubjectAware; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.apache.shiro.authz.UnauthorizedException; +import org.apache.shiro.util.ThreadContext; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -94,6 +95,10 @@ import static org.mockito.Mockito.when; ) public class DefaultRepositoryManagerTest extends ManagerTestBase { + { + ThreadContext.unbindSubject(); + } + @Rule public ShiroRule shiro = new ShiroRule(); From 89377c665c238980047cf2cad463d7ecd5612278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 11:20:46 +0200 Subject: [PATCH 04/23] Fix violation of LSP --- .../BranchChangesetCollectionToDtoMapper.java | 9 ++++--- .../ChangesetCollectionToDtoMapper.java | 19 ++++----------- .../ChangesetCollectionToDtoMapperBase.java | 24 +++++++++++++++++++ .../FileHistoryCollectionToDtoMapper.java | 11 +++++---- 4 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java index 9db35c10eb..afe8ad318b 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchChangesetCollectionToDtoMapper.java @@ -6,18 +6,21 @@ import sonia.scm.repository.Repository; import javax.inject.Inject; -public class BranchChangesetCollectionToDtoMapper extends ChangesetCollectionToDtoMapper { +public class BranchChangesetCollectionToDtoMapper extends ChangesetCollectionToDtoMapperBase { + + private final ResourceLinks resourceLinks; @Inject public BranchChangesetCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) { - super(changesetToChangesetDtoMapper, resourceLinks); + super(changesetToChangesetDtoMapper); + this.resourceLinks = resourceLinks; } public CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository, String branch) { return this.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository, branch)); } - protected String createSelfLink(Repository repository, String branch) { + private String createSelfLink(Repository repository, String branch) { return resourceLinks.branch().history(repository.getNamespaceAndName(), branch); } } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapper.java index 2f7ac86e14..24ee9b0ce1 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapper.java @@ -5,31 +5,22 @@ import sonia.scm.repository.Changeset; import sonia.scm.repository.Repository; import javax.inject.Inject; -import java.util.Optional; -import java.util.function.Supplier; -public class ChangesetCollectionToDtoMapper extends PagedCollectionToDtoMapper { +public class ChangesetCollectionToDtoMapper extends ChangesetCollectionToDtoMapperBase { - private final ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper; - protected final ResourceLinks resourceLinks; + private final ResourceLinks resourceLinks; @Inject public ChangesetCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) { - super("changesets"); - this.changesetToChangesetDtoMapper = changesetToChangesetDtoMapper; + super(changesetToChangesetDtoMapper); this.resourceLinks = resourceLinks; } public CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository) { - return this.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository)); + return super.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository)); } - public CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository, Supplier selfLinkSupplier) { - return super.map(pageNumber, pageSize, pageResult, selfLinkSupplier.get(), Optional.empty(), changeset -> changesetToChangesetDtoMapper.map(changeset, repository)); - } - - protected String createSelfLink(Repository repository) { + private String createSelfLink(Repository repository) { return resourceLinks.changeset().all(repository.getNamespace(), repository.getName()); } } - diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java new file mode 100644 index 0000000000..b83f957c09 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java @@ -0,0 +1,24 @@ +package sonia.scm.api.v2.resources; + +import sonia.scm.PageResult; +import sonia.scm.repository.Changeset; +import sonia.scm.repository.Repository; + +import javax.inject.Inject; +import java.util.Optional; +import java.util.function.Supplier; + +class ChangesetCollectionToDtoMapperBase extends PagedCollectionToDtoMapper { + + private final ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper; + + ChangesetCollectionToDtoMapperBase(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper) { + super("changesets"); + this.changesetToChangesetDtoMapper = changesetToChangesetDtoMapper; + } + + CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository, Supplier selfLinkSupplier) { + return super.map(pageNumber, pageSize, pageResult, selfLinkSupplier.get(), Optional.empty(), changeset -> changesetToChangesetDtoMapper.map(changeset, repository)); + } +} + diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryCollectionToDtoMapper.java index 692b2f57b1..af7fb2ed83 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryCollectionToDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileHistoryCollectionToDtoMapper.java @@ -6,19 +6,22 @@ import sonia.scm.repository.Repository; import javax.inject.Inject; -public class FileHistoryCollectionToDtoMapper extends ChangesetCollectionToDtoMapper { +public class FileHistoryCollectionToDtoMapper extends ChangesetCollectionToDtoMapperBase { + private final ResourceLinks resourceLinks; + @Inject public FileHistoryCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) { - super(changesetToChangesetDtoMapper, resourceLinks); + super(changesetToChangesetDtoMapper); + this.resourceLinks = resourceLinks; } public CollectionDto map(int pageNumber, int pageSize, PageResult pageResult, Repository repository, String revision, String path) { return super.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository, revision, path)); } - protected String createSelfLink(Repository repository, String revision, String path) { - return super.resourceLinks.fileHistory().self(repository.getNamespace(), repository.getName(), revision, path); + private String createSelfLink(Repository repository, String revision, String path) { + return resourceLinks.fileHistory().self(repository.getNamespace(), repository.getName(), revision, path); } } From a89353adff0f42327abb9088f23e9e2ed51f4e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 11:38:32 +0200 Subject: [PATCH 05/23] Replace custom exception messages with generic ones --- scm-core/src/main/java/sonia/scm/NotFoundException.java | 5 ----- .../java/sonia/scm/api/v2/resources/BranchRootResource.java | 2 +- .../sonia/scm/api/v2/resources/PermissionRootResource.java | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/NotFoundException.java b/scm-core/src/main/java/sonia/scm/NotFoundException.java index 0d8c14c61b..8a7ae642bd 100644 --- a/scm-core/src/main/java/sonia/scm/NotFoundException.java +++ b/scm-core/src/main/java/sonia/scm/NotFoundException.java @@ -7,9 +7,4 @@ public class NotFoundException extends Exception { public NotFoundException() { } - - - public NotFoundException(String message) { - super(message); - } } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java index cc773e41e7..491e0312b1 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java @@ -106,7 +106,7 @@ public class BranchRootResource { .stream() .anyMatch(branch -> branchName.equals(branch.getName())); if (!branchExists){ - throw new NotFoundException(MessageFormat.format("The branch {0} is not found", branchName)); + throw new NotFoundException("branch", branchName); } Repository repository = repositoryService.getRepository(); RepositoryPermissions.read(repository).check(); diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java index 2a587bc2fe..b7f6df8c2d 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java @@ -162,7 +162,7 @@ public class PermissionRootResource { RepositoryPermissions.permissionWrite(repository).check(); String extractedPermissionName = getPermissionName(permissionName); if (!isPermissionExist(new PermissionDto(extractedPermissionName, isGroupPermission(permissionName)), repository)) { - throw new NotFoundException("the permission " + extractedPermissionName + " does not exist"); + throw new NotFoundException("permission", extractedPermissionName); } permission.setGroupPermission(isGroupPermission(permissionName)); if (!extractedPermissionName.equals(permission.getName())) { From 5d2c8591d3bd45f17cf87e861fbd74123ca145ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 11:44:26 +0200 Subject: [PATCH 06/23] Remove unused import --- .../scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java | 1 - 1 file changed, 1 deletion(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java index b83f957c09..e29a0a92b2 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperBase.java @@ -4,7 +4,6 @@ import sonia.scm.PageResult; import sonia.scm.repository.Changeset; import sonia.scm.repository.Repository; -import javax.inject.Inject; import java.util.Optional; import java.util.function.Supplier; From 4c468c57432dd48b00dc182fbccd38e17db93400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 12:16:27 +0200 Subject: [PATCH 07/23] Remove unused import --- .../main/java/sonia/scm/api/v2/resources/BranchRootResource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java index 491e0312b1..7414f5c21f 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java @@ -26,7 +26,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import java.io.IOException; -import java.text.MessageFormat; public class BranchRootResource { From 166969b1034a018c9dce7166a1ccb604af9c2b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 21 Sep 2018 10:19:14 +0000 Subject: [PATCH 08/23] Close branch bugfix/changesets_links_v2 From 75dbad23cd960a748c1d29f89d966db3004368dc Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 23 Sep 2018 20:59:56 +0200 Subject: [PATCH 09/23] added dockerfile and helm chart for k8s installation --- .dockerignore | 3 ++ Dockerfile | 24 ++++++++++++ helm/.helmignore | 21 +++++++++++ helm/Chart.yaml | 5 +++ helm/templates/NOTES.txt | 19 ++++++++++ helm/templates/_helpers.tpl | 32 ++++++++++++++++ helm/templates/deployment.yaml | 69 ++++++++++++++++++++++++++++++++++ helm/templates/ingress.yaml | 38 +++++++++++++++++++ helm/templates/pvc.yaml | 24 ++++++++++++ helm/templates/service.yaml | 19 ++++++++++ helm/values.yaml | 67 +++++++++++++++++++++++++++++++++ 11 files changed, 321 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 helm/.helmignore create mode 100644 helm/Chart.yaml create mode 100644 helm/templates/NOTES.txt create mode 100644 helm/templates/_helpers.tpl create mode 100644 helm/templates/deployment.yaml create mode 100644 helm/templates/ingress.yaml create mode 100644 helm/templates/pvc.yaml create mode 100644 helm/templates/service.yaml create mode 100644 helm/values.yaml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..d8c2ee7b5f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +Dockerfile +.hg +helm diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..3d95dc98df --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM maven:3.5.4-jdk-8 as builder +COPY . /usr/src + +WORKDIR /usr/src +RUN mvn clean install + +FROM openjdk:8u171-jdk-alpine3.8 + +ENV SCM_HOME /var/lib/scm + +COPY --from=builder /usr/src/scm-server/target/scm-server-app.tar.gz /opt/scm-server-app.tar.gz +RUN set -x \ + && mkdir /var/lib/scm \ + && addgroup -g 1000 -S scm \ + && adduser -D -H -u 1000 -h /opt/scm-server -G scm scm \ + && tar xfz /opt/scm-server-app.tar.gz -C /opt \ + && chown -R scm:scm /opt/scm-server /var/lib/scm \ + && apk add --no-cache bash mercurial + +EXPOSE 8080 +USER scm +WORKDIR /opt/scm-server + +ENTRYPOINT [ "/opt/scm-server/bin/scm-server" ] diff --git a/helm/.helmignore b/helm/.helmignore new file mode 100644 index 0000000000..f0c1319444 --- /dev/null +++ b/helm/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/helm/Chart.yaml b/helm/Chart.yaml new file mode 100644 index 0000000000..80f0b22a93 --- /dev/null +++ b/helm/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for Kubernetes +name: scm-manager +version: 0.1.0 diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt new file mode 100644 index 0000000000..a58c8f124a --- /dev/null +++ b/helm/templates/NOTES.txt @@ -0,0 +1,19 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range .Values.ingress.hosts }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "scm-manager.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ include "scm-manager.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "scm-manager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "scm-manager.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl new file mode 100644 index 0000000000..23d4e1b03e --- /dev/null +++ b/helm/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "scm-manager.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scm-manager.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "scm-manager.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml new file mode 100644 index 0000000000..ae950f3fad --- /dev/null +++ b/helm/templates/deployment.yaml @@ -0,0 +1,69 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} + spec: + initContainers: + - name: volume-permissions + image: alpine:3.8 + command: ['sh', '-c', 'chown 1000:1000 /data'] + volumeMounts: + - name: data + mountPath: /data + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: /scm + port: http + readinessProbe: + httpGet: + path: /scm + port: http + volumeMounts: + - name: data + mountPath: /var/lib/scm + resources: +{{ toYaml .Values.resources | indent 12 }} + volumes: + - name: data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ include "scm-manager.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml new file mode 100644 index 0000000000..66912c9d96 --- /dev/null +++ b/helm/templates/ingress.yaml @@ -0,0 +1,38 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "scm-manager.fullname" . -}} +{{- $ingressPath := .Values.ingress.path -}} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +{{- with .Values.ingress.annotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ . | quote }} + http: + paths: + - path: {{ $ingressPath }} + backend: + serviceName: {{ $fullName }} + servicePort: http + {{- end }} +{{- end }} diff --git a/helm/templates/pvc.yaml b/helm/templates/pvc.yaml new file mode 100644 index 0000000000..0e7d0f6db4 --- /dev/null +++ b/helm/templates/pvc.yaml @@ -0,0 +1,24 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + accessModes: + - {{ .Values.persistence.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.size | quote }} +{{- if .Values.persistence.storageClass }} +{{- if (eq "-" .Values.persistence.storageClass) }} + storageClassName: "" +{{- else }} + storageClassName: "{{ .Values.persistence.storageClass }}" +{{- end }} +{{- end }} +{{- end -}} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml new file mode 100644 index 0000000000..f3a8207908 --- /dev/null +++ b/helm/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: 8080 + protocol: TCP + name: http + selector: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 0000000000..e168b86c6d --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,67 @@ +# Default values for scm-manager. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: cloudogu/scm-manager + tag: latest + pullPolicy: IfNotPresent + +nameOverride: "" +fullnameOverride: "" + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: true + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + path: / + hosts: + - scm-manager.local + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +persistence: + enabled: true + ## ghost data Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteOnce + size: 10Gi + +resources: + requests: + memory: 1Gi + cpu: 500m + limits: + memory: 2Gi + cpu: 1 + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} From c0aaf2f5cbff1641a37f96d1d18c68420b0d84f5 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 13:03:02 +0200 Subject: [PATCH 10/23] added docker image build step --- .dockerignore | 6 +-- Dockerfile | 28 ++++++-------- Jenkinsfile | 8 ++++ helm/.helmignore | 21 ----------- helm/Chart.yaml | 5 --- helm/templates/NOTES.txt | 19 ---------- helm/templates/_helpers.tpl | 32 ---------------- helm/templates/deployment.yaml | 69 ---------------------------------- helm/templates/ingress.yaml | 38 ------------------- helm/templates/pvc.yaml | 24 ------------ helm/templates/service.yaml | 19 ---------- helm/values.yaml | 67 --------------------------------- 12 files changed, 23 insertions(+), 313 deletions(-) delete mode 100644 helm/.helmignore delete mode 100644 helm/Chart.yaml delete mode 100644 helm/templates/NOTES.txt delete mode 100644 helm/templates/_helpers.tpl delete mode 100644 helm/templates/deployment.yaml delete mode 100644 helm/templates/ingress.yaml delete mode 100644 helm/templates/pvc.yaml delete mode 100644 helm/templates/service.yaml delete mode 100644 helm/values.yaml diff --git a/.dockerignore b/.dockerignore index d8c2ee7b5f..0609164d73 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ -Dockerfile -.hg -helm +# ignore everything except scm-server.tar.gz +** +!scm-server/target/*.tar.gz diff --git a/Dockerfile b/Dockerfile index 3d95dc98df..781a3e890b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,20 @@ -FROM maven:3.5.4-jdk-8 as builder -COPY . /usr/src +FROM openjdk:8u171-alpine3.8 -WORKDIR /usr/src -RUN mvn clean install +ENV SCM_HOME=/var/lib/scm -FROM openjdk:8u171-jdk-alpine3.8 - -ENV SCM_HOME /var/lib/scm - -COPY --from=builder /usr/src/scm-server/target/scm-server-app.tar.gz /opt/scm-server-app.tar.gz RUN set -x \ - && mkdir /var/lib/scm \ - && addgroup -g 1000 -S scm \ - && adduser -D -H -u 1000 -h /opt/scm-server -G scm scm \ - && tar xfz /opt/scm-server-app.tar.gz -C /opt \ - && chown -R scm:scm /opt/scm-server /var/lib/scm \ - && apk add --no-cache bash mercurial + && apk add --no-cache mercurial bash \ + && addgroup -S -g 1000 scm \ + && adduser -S -s /bin/false -G scm -h /opt/scm-server -D -H -u 1000 scm \ + && mkdir ${SCM_HOME} \ + && chown scm:scm ${SCM_HOME} +ADD scm-server/target/scm-server-app.tar.gz /opt +RUN chown -R scm:scm /opt/scm-server + +WORKDIR /opt/scm-server +VOLUME [ "${SCM_HOME}", "/opt/scm-server/var/log" ] EXPOSE 8080 USER scm -WORKDIR /opt/scm-server ENTRYPOINT [ "/opt/scm-server/bin/scm-server" ] diff --git a/Jenkinsfile b/Jenkinsfile index 50a2374544..f05302ad00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,6 +44,14 @@ node() { // No specific label currentBuild.result = 'UNSTABLE' } } + + stage('Build Docker Image') { + // TODO only on mainBranch + def image = docker.build("cloudogu/scm-manger:2.0.0-dev-b${BUILD_NUMBER}") + withRegistry('index.docker.io', 'hub.docker.com-cesmarvin') { + image.push() + } + } } // Archive Unit and integration test results, if any diff --git a/helm/.helmignore b/helm/.helmignore deleted file mode 100644 index f0c1319444..0000000000 --- a/helm/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index 80f0b22a93..0000000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes -name: scm-manager -version: 0.1.0 diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt deleted file mode 100644 index a58c8f124a..0000000000 --- a/helm/templates/NOTES.txt +++ /dev/null @@ -1,19 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "scm-manager.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ include "scm-manager.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "scm-manager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "scm-manager.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 -{{- end }} diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl deleted file mode 100644 index 23d4e1b03e..0000000000 --- a/helm/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "scm-manager.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "scm-manager.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "scm-manager.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml deleted file mode 100644 index ae950f3fad..0000000000 --- a/helm/templates/deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1beta2 -kind: Deployment -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} - spec: - initContainers: - - name: volume-permissions - image: alpine:3.8 - command: ['sh', '-c', 'chown 1000:1000 /data'] - volumeMounts: - - name: data - mountPath: /data - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 8080 - protocol: TCP - livenessProbe: - httpGet: - path: /scm - port: http - readinessProbe: - httpGet: - path: /scm - port: http - volumeMounts: - - name: data - mountPath: /var/lib/scm - resources: -{{ toYaml .Values.resources | indent 12 }} - volumes: - - name: data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ include "scm-manager.fullname" . }} - {{- else }} - emptyDir: {} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml deleted file mode 100644 index 66912c9d96..0000000000 --- a/helm/templates/ingress.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "scm-manager.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- with .Values.ingress.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ . | quote }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} -{{- end }} diff --git a/helm/templates/pvc.yaml b/helm/templates/pvc.yaml deleted file mode 100644 index 0e7d0f6db4..0000000000 --- a/helm/templates/pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml deleted file mode 100644 index f3a8207908..0000000000 --- a/helm/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "scm-manager.fullname" . }} - labels: - app: {{ include "scm-manager.name" . }} - chart: {{ include "scm-manager.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: 8080 - protocol: TCP - name: http - selector: - app: {{ include "scm-manager.name" . }} - release: {{ .Release.Name }} diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index e168b86c6d..0000000000 --- a/helm/values.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# Default values for scm-manager. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: cloudogu/scm-manager - tag: latest - pullPolicy: IfNotPresent - -nameOverride: "" -fullnameOverride: "" - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: true - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - path: / - hosts: - - scm-manager.local - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -persistence: - enabled: true - ## ghost data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 10Gi - -resources: - requests: - memory: 1Gi - cpu: 500m - limits: - memory: 2Gi - cpu: 1 - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} From db2c7fd509dfc06d40c1df189d759187f4a407c3 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 13:04:03 +0200 Subject: [PATCH 11/23] build only on nodes with label docker --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f05302ad00..249916c008 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ @Library('github.com/cloudogu/ces-build-lib@59d3e94') import com.cloudogu.ces.cesbuildlib.* -node() { // No specific label +node('docker') { // Change this as when we go back to default - necessary for proper SonarQube analysis mainBranch = "2.0.0-m3" From 4fb1fd59ba6f40363fe99f9feadefde30930bec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 24 Sep 2018 14:18:24 +0200 Subject: [PATCH 12/23] Fix docker name --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f05302ad00..9fcd0713f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,8 +47,8 @@ node() { // No specific label stage('Build Docker Image') { // TODO only on mainBranch - def image = docker.build("cloudogu/scm-manger:2.0.0-dev-b${BUILD_NUMBER}") - withRegistry('index.docker.io', 'hub.docker.com-cesmarvin') { + def image = docker.build("cloudogu/scm-manager:2.0.0-dev-b${BUILD_NUMBER}") + docker.withRegistry('', 'hub.docker.com-cesmarvin') { image.push() } } From a9e590d4748a52e2494ee95ef671ef28c6c9bee6 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 14:34:37 +0200 Subject: [PATCH 13/23] push latest tag of docker image --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0feee25001..76dd1ffadf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,9 +47,10 @@ node('docker') { stage('Build Docker Image') { // TODO only on mainBranch - def image = docker.build("cloudogu/scm-manager:2.0.0-dev-b${BUILD_NUMBER}") + def image = docker.build('cloudogu/scm-manager') docker.withRegistry('', 'hub.docker.com-cesmarvin') { - image.push() + image.push("2.0.0-dev-b${BUILD_NUMBER}") + image.push('latest') } } } From 7aeec361203ab14159ea84b7fb904baa253bb6b0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 14:45:15 +0200 Subject: [PATCH 14/23] rename docker build stage to docker --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 76dd1ffadf..2edd9e797b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ node('docker') { } } - stage('Build Docker Image') { + stage('Docker') { // TODO only on mainBranch def image = docker.build('cloudogu/scm-manager') docker.withRegistry('', 'hub.docker.com-cesmarvin') { From 210a23ef32c239b0d410bc14b00d40c346a4dba2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 14:45:48 +0200 Subject: [PATCH 15/23] added helm chart for k8s deployment --- deployments/helm/.helmignore | 21 +++++++ deployments/helm/Chart.yaml | 5 ++ deployments/helm/templates/NOTES.txt | 19 ++++++ deployments/helm/templates/_helpers.tpl | 32 ++++++++++ deployments/helm/templates/deployment.yaml | 70 ++++++++++++++++++++++ deployments/helm/templates/ingress.yaml | 38 ++++++++++++ deployments/helm/templates/pvc.yaml | 24 ++++++++ deployments/helm/templates/service.yaml | 19 ++++++ deployments/helm/values.yaml | 65 ++++++++++++++++++++ 9 files changed, 293 insertions(+) create mode 100644 deployments/helm/.helmignore create mode 100644 deployments/helm/Chart.yaml create mode 100644 deployments/helm/templates/NOTES.txt create mode 100644 deployments/helm/templates/_helpers.tpl create mode 100644 deployments/helm/templates/deployment.yaml create mode 100644 deployments/helm/templates/ingress.yaml create mode 100644 deployments/helm/templates/pvc.yaml create mode 100644 deployments/helm/templates/service.yaml create mode 100644 deployments/helm/values.yaml diff --git a/deployments/helm/.helmignore b/deployments/helm/.helmignore new file mode 100644 index 0000000000..f0c1319444 --- /dev/null +++ b/deployments/helm/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/deployments/helm/Chart.yaml b/deployments/helm/Chart.yaml new file mode 100644 index 0000000000..c5b5fff4cc --- /dev/null +++ b/deployments/helm/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +appVersion: "1.0" +description: A Helm chart for SCM-Manager +name: scm-manager +version: 0.1.0 diff --git a/deployments/helm/templates/NOTES.txt b/deployments/helm/templates/NOTES.txt new file mode 100644 index 0000000000..a58c8f124a --- /dev/null +++ b/deployments/helm/templates/NOTES.txt @@ -0,0 +1,19 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range .Values.ingress.hosts }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "scm-manager.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ include "scm-manager.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "scm-manager.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "scm-manager.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/deployments/helm/templates/_helpers.tpl b/deployments/helm/templates/_helpers.tpl new file mode 100644 index 0000000000..23d4e1b03e --- /dev/null +++ b/deployments/helm/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "scm-manager.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "scm-manager.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "scm-manager.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/deployments/helm/templates/deployment.yaml b/deployments/helm/templates/deployment.yaml new file mode 100644 index 0000000000..c960711d31 --- /dev/null +++ b/deployments/helm/templates/deployment.yaml @@ -0,0 +1,70 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: 1 # could not be scaled + selector: + matchLabels: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} + spec: + initContainers: + - name: volume-permissions + image: alpine:3.8 + imagePullPolicy: IfNotPresent + command: ['sh', '-c', 'chown 1000:1000 /data'] + volumeMounts: + - name: data + mountPath: /data + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: /scm + port: http + readinessProbe: + httpGet: + path: /scm + port: http + resources: +{{ toYaml .Values.resources | indent 12 }} + volumeMounts: + - name: data + mountPath: /var/lib/scm + volumes: + - name: data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ include "scm-manager.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/deployments/helm/templates/ingress.yaml b/deployments/helm/templates/ingress.yaml new file mode 100644 index 0000000000..66912c9d96 --- /dev/null +++ b/deployments/helm/templates/ingress.yaml @@ -0,0 +1,38 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "scm-manager.fullname" . -}} +{{- $ingressPath := .Values.ingress.path -}} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +{{- with .Values.ingress.annotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ . | quote }} + http: + paths: + - path: {{ $ingressPath }} + backend: + serviceName: {{ $fullName }} + servicePort: http + {{- end }} +{{- end }} diff --git a/deployments/helm/templates/pvc.yaml b/deployments/helm/templates/pvc.yaml new file mode 100644 index 0000000000..0e7d0f6db4 --- /dev/null +++ b/deployments/helm/templates/pvc.yaml @@ -0,0 +1,24 @@ +{{- if .Values.persistence.enabled -}} +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + accessModes: + - {{ .Values.persistence.accessMode | quote }} + resources: + requests: + storage: {{ .Values.persistence.size | quote }} +{{- if .Values.persistence.storageClass }} +{{- if (eq "-" .Values.persistence.storageClass) }} + storageClassName: "" +{{- else }} + storageClassName: "{{ .Values.persistence.storageClass }}" +{{- end }} +{{- end }} +{{- end -}} diff --git a/deployments/helm/templates/service.yaml b/deployments/helm/templates/service.yaml new file mode 100644 index 0000000000..f3a8207908 --- /dev/null +++ b/deployments/helm/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: {{ include "scm-manager.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: 8080 + protocol: TCP + name: http + selector: + app: {{ include "scm-manager.name" . }} + release: {{ .Release.Name }} diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml new file mode 100644 index 0000000000..d54088aa8b --- /dev/null +++ b/deployments/helm/values.yaml @@ -0,0 +1,65 @@ +# Default values for scm-manager. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# replicaCount: 1 + +image: + repository: cloudogu/scm-manager + # TODO change after release, to something more stable + tag: latest + pullPolicy: Always + +nameOverride: "" +fullnameOverride: "" + +service: + type: LoadBalancer + port: 80 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + path: / + hosts: + - scm-manager.local + tls: [] + # - secretName: scm-manager-tls + # hosts: + # - scm-manager.local + +## Enable persistence using Persistent Volume Claims +## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ +## +persistence: + enabled: true + ## ghost data Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteOnce + size: 12Gi + +resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: + cpu: 2000m + memory: 2048Mi + requests: + cpu: 50m + memory: 256Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} From fd6181e957e6a520d0e3369edce909f05d2b4869 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 16:39:08 +0200 Subject: [PATCH 16/23] use Recreate upgrade strategy --- deployments/helm/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployments/helm/templates/deployment.yaml b/deployments/helm/templates/deployment.yaml index c960711d31..adebd7c5f0 100644 --- a/deployments/helm/templates/deployment.yaml +++ b/deployments/helm/templates/deployment.yaml @@ -9,6 +9,8 @@ metadata: heritage: {{ .Release.Service }} spec: replicas: 1 # could not be scaled + strategy: + type: Recreate selector: matchLabels: app: {{ include "scm-manager.name" . }} From 9e69603de15370366e1d4e030faa43a7d3c4bdbf Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 24 Sep 2018 17:13:47 +0200 Subject: [PATCH 17/23] added commit hash to docker image tag and trigger deployment job --- Jenkinsfile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2edd9e797b..24eaa4b7b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,14 +45,24 @@ node('docker') { } } + def commitHash = getCommitHash() + def dockerImageTag = "2.0.0-dev-${commitHash.substring(0,7)}-${BUILD_NUMBER}" + stage('Docker') { // TODO only on mainBranch def image = docker.build('cloudogu/scm-manager') docker.withRegistry('', 'hub.docker.com-cesmarvin') { - image.push("2.0.0-dev-b${BUILD_NUMBER}") + image.push(dockerImageTag) image.push('latest') } } + + stage('Deployment') { + build job: 'scm-manager/next-scm.cloudogu.com', propagate: false, wait: false, parameters: [ + string(name: 'changeset', value: commitHash), + string(name: 'imageTag', value: dockerImageTag) + ] + } } // Archive Unit and integration test results, if any @@ -123,6 +133,10 @@ String getCommitAuthorComplete() { new Sh(this).returnStdOut 'hg log --branch . --limit 1 --template "{author}"' } +String getCommitHash() { + new Sh(this).returnStdOut 'hg log --branch . --limit 1 --template "{node}"' +} + String getCommitAuthorEmail() { def matcher = getCommitAuthorComplete() =~ "<(.*?)>" matcher ? matcher[0][1] : "" From d8a1089750962773bc67cccc55eaaa279b48db2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 25 Sep 2018 09:22:25 +0200 Subject: [PATCH 18/23] Run docker build and deployment only for main branch --- Jenkinsfile | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 24eaa4b7b6..4769a0bd3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,20 +48,21 @@ node('docker') { def commitHash = getCommitHash() def dockerImageTag = "2.0.0-dev-${commitHash.substring(0,7)}-${BUILD_NUMBER}" - stage('Docker') { - // TODO only on mainBranch - def image = docker.build('cloudogu/scm-manager') - docker.withRegistry('', 'hub.docker.com-cesmarvin') { - image.push(dockerImageTag) - image.push('latest') + if (isMainBranch()) { + stage('Docker') { + def image = docker.build('cloudogu/scm-manager') + docker.withRegistry('', 'hub.docker.com-cesmarvin') { + image.push(dockerImageTag) + image.push('latest') + } } - } - stage('Deployment') { - build job: 'scm-manager/next-scm.cloudogu.com', propagate: false, wait: false, parameters: [ - string(name: 'changeset', value: commitHash), - string(name: 'imageTag', value: dockerImageTag) - ] + stage('Deployment') { + build job: 'scm-manager/next-scm.cloudogu.com', propagate: false, wait: false, parameters: [ + string(name: 'changeset', value: commitHash), + string(name: 'imageTag', value: dockerImageTag) + ] + } } } @@ -81,7 +82,7 @@ Maven setupMavenBuild() { // Keep this version number in sync with .mvn/maven-wrapper.properties Maven mvn = new MavenInDocker(this, "3.5.2-jdk-8") - if (mainBranch.equals(env.BRANCH_NAME)) { + if (isMainBranch()) { // Release starts javadoc, which takes very long, so do only for certain branches mvn.additionalArgs += ' -DperformRelease' // JDK8 is more strict, we should fix this before the next release. Right now, this is just not the focus, yet. @@ -108,7 +109,7 @@ void analyzeWith(Maven mvn) { "-Dsonar.pullrequest.bitbucketcloud.repository=scm-manager " } else { mvnArgs += " -Dsonar.branch.name=${env.BRANCH_NAME} " - if (!mainBranch.equals(env.BRANCH_NAME)) { + if (!isMainBranch()) { // Avoid exception "The main branch must not have a target" on main branch mvnArgs += " -Dsonar.branch.target=${mainBranch} " } @@ -117,6 +118,10 @@ void analyzeWith(Maven mvn) { } } +boolean isMainBranch() { + return mainBranch.equals(env.BRANCH_NAME) +} + boolean waitForQualityGateWebhookToBeCalled() { boolean isQualityGateSucceeded = true timeout(time: 2, unit: 'MINUTES') { // Needed when there is no webhook for example From faa2894417fd695c4496383543d8346077b96772 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 25 Sep 2018 11:51:41 +0200 Subject: [PATCH 19/23] added configmap to configure scm-server This should also fix wrong generated hal links, if an https enabled ingress is used. --- deployments/helm/templates/configmap.yaml | 160 +++++++++++++++++++++ deployments/helm/templates/deployment.yaml | 5 + 2 files changed, 165 insertions(+) create mode 100644 deployments/helm/templates/configmap.yaml diff --git a/deployments/helm/templates/configmap.yaml b/deployments/helm/templates/configmap.yaml new file mode 100644 index 0000000000..dd52b6fa8c --- /dev/null +++ b/deployments/helm/templates/configmap.yaml @@ -0,0 +1,160 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "scm-manager.fullname" . }} + labels: + app: {{ include "scm-manager.name" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +data: + server-config.xml: | + + + + + + + 16384 + 16384 + + {{- if .Values.ingress.enabled -}} + + + + + {{- end }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /scm + + /var/webapp/scm-webapp.war + + + org.eclipse.jetty.servlet.Default.dirAllowed + false + + + /work/scm + + + + + / + + + + + + /var/webapp/docroot + + + + + + /work/docroot + + + + + + + + + + + + + + + + + + + + + logging.xml: | + + + + <-- + in a container environment we only need stdout + --> + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/deployments/helm/templates/deployment.yaml b/deployments/helm/templates/deployment.yaml index adebd7c5f0..928daa5f06 100644 --- a/deployments/helm/templates/deployment.yaml +++ b/deployments/helm/templates/deployment.yaml @@ -50,6 +50,8 @@ spec: volumeMounts: - name: data mountPath: /var/lib/scm + - name: config + mountPath: /opt/scm-server/conf volumes: - name: data {{- if .Values.persistence.enabled }} @@ -58,6 +60,9 @@ spec: {{- else }} emptyDir: {} {{- end }} + - name: config + configMap: + name: {{ include "scm-manager.fullname" . }} {{- with .Values.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} From 51d198deaafd09b3345f0c3a45f725506c86eb59 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 26 Sep 2018 14:09:46 +0000 Subject: [PATCH 20/23] Close branch feature/k8s From 11fca51f5fb6af21b9df79ef5a572bf44d5de2e9 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 27 Sep 2018 12:17:36 +0200 Subject: [PATCH 21/23] fix missing checkout/clone description on repository information page --- .../src/main/js/ProtocolInformation.js | 11 ++- .../src/main/js/ProtocolInformation.js | 10 +- .../src/main/js/ProtocolInformation.js | 6 +- .../packages/ui-components/src/index.js | 5 +- .../ui-components/src/repositories.js | 19 ++++ .../ui-components/src/repositories.test.js | 99 +++++++++++++++++++ .../packages/ui-types/src/hal.js | 5 +- 7 files changed, 142 insertions(+), 13 deletions(-) create mode 100644 scm-ui-components/packages/ui-components/src/repositories.js create mode 100644 scm-ui-components/packages/ui-components/src/repositories.test.js diff --git a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js index 3c1362ba80..d8eb4ae0e0 100644 --- a/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js +++ b/scm-plugins/scm-git-plugin/src/main/js/ProtocolInformation.js @@ -1,5 +1,6 @@ //@flow import React from "react"; +import { repositories } from "@scm-manager/ui-components"; import type { Repository } from "@scm-manager/ui-types"; type Props = { @@ -10,14 +11,16 @@ class ProtocolInformation extends React.Component { render() { const { repository } = this.props; - if (!repository._links.httpProtocol) { + const href = repositories.getProtocolLinkByType(repository, "http"); + if (!href) { return null; } + return (

Clone the repository

-          git clone {repository._links.httpProtocol.href}
+          git clone {href}

Create a new repository

@@ -30,7 +33,7 @@ class ProtocolInformation extends React.Component {
             

             git commit -m "added readme"
             

-            git remote add origin {repository._links.httpProtocol.href}
+            git remote add origin {href}
             

             git push -u origin master
             

@@ -39,7 +42,7 @@ class ProtocolInformation extends React.Component {
         
Push an existing repository

         
           
-            git remote add origin {repository._links.httpProtocol.href}
+            git remote add origin {href}
             

             git push -u origin master
             

diff --git a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
index 28c1e53a07..03fc41450a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-hg-plugin/src/main/js/ProtocolInformation.js
@@ -1,5 +1,6 @@
 //@flow
 import React from "react";
+import { repositories } from "@scm-manager/ui-components";
 import type { Repository } from "@scm-manager/ui-types";
 
 type Props = {
@@ -10,14 +11,15 @@ class ProtocolInformation extends React.Component {
 
   render() {
     const { repository } = this.props;
-    if (!repository._links.httpProtocol) {
+    const href = repositories.getProtocolLinkByType(repository, "http");
+    if (!href) {
       return null;
     }
     return (
       

         
Clone the repository

         
-          hg clone {repository._links.httpProtocol.href}
+          hg clone {href}
         

         
Create a new repository

         
@@ -26,7 +28,7 @@ class ProtocolInformation extends React.Component {
             

             echo "[paths]" > .hg/hgrc
             

-            echo "default = {repository._links.httpProtocol.href}" > .hg/hgrc
+            echo "default = {href}" > .hg/hgrc
             

             echo "# {repository.name}" > README.md
             

@@ -44,7 +46,7 @@ class ProtocolInformation extends React.Component {
           
             # add the repository url as default to your .hg/hgrc e.g:
             

-            default = {repository._links.httpProtocol.href}
+            default = {href}
             

             # push to remote repository
             

diff --git a/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js b/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
index ccff4118ba..0ba195887f 100644
--- a/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
+++ b/scm-plugins/scm-svn-plugin/src/main/js/ProtocolInformation.js
@@ -1,5 +1,6 @@
 //@flow
 import React from "react";
+import { repositories } from "@scm-manager/ui-components";
 import type { Repository } from "@scm-manager/ui-types";
 
 type Props = {
@@ -10,14 +11,15 @@ class ProtocolInformation extends React.Component {
 
   render() {
     const { repository } = this.props;
-    if (!repository._links.httpProtocol) {
+    const href = repositories.getProtocolLinkByType(repository, "http");
+    if (!href) {
       return null;
     }
     return (
       

         
Checkout the repository

         
-          svn checkout {repository._links.httpProtocol.href}
+          svn checkout {href}
         

       

     );
diff --git a/scm-ui-components/packages/ui-components/src/index.js b/scm-ui-components/packages/ui-components/src/index.js
index 4865540868..2e1c51b7dc 100644
--- a/scm-ui-components/packages/ui-components/src/index.js
+++ b/scm-ui-components/packages/ui-components/src/index.js
@@ -2,8 +2,9 @@
 
 import * as validation from "./validation.js";
 import * as urls from "./urls";
+import * as repositories from "./repositories.js";
 
-export { validation, urls };
+export { validation, urls, repositories };
 
 export { default as DateFromNow } from "./DateFromNow.js";
 export { default as ErrorNotification } from "./ErrorNotification.js";
@@ -18,6 +19,8 @@ export { default as ProtectedRoute } from "./ProtectedRoute.js";
 
 export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR } from "./apiclient.js";
 
+
+
 export * from "./buttons";
 export * from "./forms";
 export * from "./layout";
diff --git a/scm-ui-components/packages/ui-components/src/repositories.js b/scm-ui-components/packages/ui-components/src/repositories.js
new file mode 100644
index 0000000000..104cb9a691
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/repositories.js
@@ -0,0 +1,19 @@
+// @flow
+import type { Repository } from "@scm-manager/ui-types";
+
+// util methods for repositories
+
+export function getProtocolLinkByType(repository: Repository, type: string) {
+  let protocols = repository._links.protocol;
+  if (protocols) {
+    if (!Array.isArray(protocols)) {
+      protocols = [protocols];
+    }
+    for (let proto of protocols) {
+      if (proto.name === type) {
+        return proto.href;
+      }
+    }
+  }
+  return null;
+}
diff --git a/scm-ui-components/packages/ui-components/src/repositories.test.js b/scm-ui-components/packages/ui-components/src/repositories.test.js
new file mode 100644
index 0000000000..ccd972ad03
--- /dev/null
+++ b/scm-ui-components/packages/ui-components/src/repositories.test.js
@@ -0,0 +1,99 @@
+// @flow
+
+import type { Repository } from "@scm-manager/ui-types";
+import { getProtocolLinkByType, getTypePredicate } from "./repositories";
+
+describe("getProtocolLinkByType tests", () => {
+
+  it("should return the http protocol link", () => {
+
+    const repository: Repository = {
+      namespace: "scm",
+      name: "core",
+      type: "git",
+      _links: {
+        protocol: [{
+          name: "http",
+          href: "http://scm.scm-manager.org/repo/scm/core"
+        }]
+      }
+    };
+
+    const link = getProtocolLinkByType(repository, "http");
+    expect(link).toBe("http://scm.scm-manager.org/repo/scm/core");
+  });
+
+  it("should return the http protocol link from multiple protocols", () => {
+
+    const repository: Repository = {
+      namespace: "scm",
+      name: "core",
+      type: "git",
+      _links: {
+        protocol: [{
+          name: "http",
+          href: "http://scm.scm-manager.org/repo/scm/core"
+        },{
+          name: "ssh",
+          href: "git@scm.scm-manager.org:scm/core"
+        }]
+      }
+    };
+
+    const link = getProtocolLinkByType(repository, "http");
+    expect(link).toBe("http://scm.scm-manager.org/repo/scm/core");
+  });
+
+  it("should return the http protocol, even if the protocol is a single link", () => {
+
+    const repository: Repository = {
+      namespace: "scm",
+      name: "core",
+      type: "git",
+      _links: {
+        protocol: {
+          name: "http",
+          href: "http://scm.scm-manager.org/repo/scm/core"
+        }
+      }
+    };
+
+    const link = getProtocolLinkByType(repository, "http");
+    expect(link).toBe("http://scm.scm-manager.org/repo/scm/core");
+  });
+
+  it("should return null, if such a protocol does not exists", () => {
+
+    const repository: Repository = {
+      namespace: "scm",
+      name: "core",
+      type: "git",
+      _links: {
+        protocol: [{
+          name: "http",
+          href: "http://scm.scm-manager.org/repo/scm/core"
+        },{
+          name: "ssh",
+          href: "git@scm.scm-manager.org:scm/core"
+        }]
+      }
+    };
+
+    const link = getProtocolLinkByType(repository, "awesome");
+    expect(link).toBeNull();
+  });
+
+  it("should return null, if no protocols are available", () => {
+
+    const repository: Repository = {
+      namespace: "scm",
+      name: "core",
+      type: "git",
+      _links: {}
+    };
+
+    const link = getProtocolLinkByType(repository, "http");
+    expect(link).toBeNull();
+  });
+
+});
diff --git a/scm-ui-components/packages/ui-types/src/hal.js b/scm-ui-components/packages/ui-types/src/hal.js
index ab22203835..248c5e5453 100644
--- a/scm-ui-components/packages/ui-types/src/hal.js
+++ b/scm-ui-components/packages/ui-types/src/hal.js
@@ -1,9 +1,10 @@
 // @flow
 export type Link = {
-  href: string
+  href: string,
+  name?: string
 };
 
-export type Links = { [string]: Link };
+export type Links = { [string]: Link | Link[] };
 
 export type Collection = {
   _embedded: Object,

From 37188dfe6190ebd331be44546f2adb5bd01e873a Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra 
Date: Thu, 27 Sep 2018 11:13:21 +0000
Subject: [PATCH 22/23] Close branch feature/disable_concurrent_builds


From 517c82e5b95c1ad4f9688fe6ca1581b6653ba750 Mon Sep 17 00:00:00 2001
From: Mohamed Karray 
Date: Mon, 1 Oct 2018 14:19:45 +0200
Subject: [PATCH 23/23] exec yarn unlink on mvn clean

---
 scm-ui-components/package.json |  3 ++-
 scm-ui-components/pom.xml      | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/scm-ui-components/package.json b/scm-ui-components/package.json
index 6fe782506e..d0f1be6ff9 100644
--- a/scm-ui-components/package.json
+++ b/scm-ui-components/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "scripts": {
     "bootstrap": "lerna bootstrap",
-    "link": "lerna exec -- yarn link"
+    "link": "lerna exec -- yarn link",
+    "unlink": "lerna exec -- yarn unlink"
   },
   "devDependencies": {
     "lerna": "^3.2.1"
diff --git a/scm-ui-components/pom.xml b/scm-ui-components/pom.xml
index 19e8bc7a49..ba2c12d686 100644
--- a/scm-ui-components/pom.xml
+++ b/scm-ui-components/pom.xml
@@ -58,6 +58,16 @@
               
             
           
+          
+            unlink
+            clean
+            
+              run
+            
+            
+              
+            
+