Fix GitLogParser in docker container

.github/workflows/test.yml

@@ -129,6 +129,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       working-directory: ./analysis
+      project-directory: .
 
     steps:
       - uses: actions/checkout@v3
@@ -147,6 +148,13 @@ jobs:
           ./gradlew jacocoTestReport
         working-directory: ${{env.working-directory}}
 
+      - name: Docker Test Analysis
+        run: |
+          docker build ./analysis -t local-ccsh --build-arg USER_UID=1001
+          current_version=$(node -pe "require('./analysis/node-wrapper/package.json').version")
+          docker run -w /home/nonroot-docker-user/cc/analysis/test -v $(pwd):/home/nonroot-docker-user/cc local-ccsh bash ./golden_test.sh ${current_version} /home/nonroot-docker-user/tmp-files/ /usr/local/bin/ccsh
+        working-directory: ${{env.project-directory}}
+
       - name: Setup Java JDK
         uses: actions/setup-java@v3.13.0
         with:

.prettierignore

@@ -35,3 +35,6 @@ out
 **/binScripts/**
 gh-pages/vendor
 gh-pages/visualization
+*.gradle.kts
+*.toml
+

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2018, MaibornWolff GmbH
+Copyright (c) 2024, MaibornWolff GmbH
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -9,10 +9,12 @@
 <h4 align="center">a beautiful tool to help you visualize and understand code in 3D.</h4>
 
 <p align="center">
-  <a href="">
-    <img src="https://github.com/MaibornWolff/codecharta/actions/workflows/release.yml/badge.svg"
-         alt="Build Status">
-  </a>
+    <a href="https://github.com/MaibornWolff/codecharta/actions/workflows/release-analysis.yml">
+        <img src="https://github.com/MaibornWolff/codecharta/actions/workflows/release-analysis.yml/badge.svg" alt="Release Analysis">
+    </a>
+    <a href="https://github.com/MaibornWolff/codecharta/actions/workflows/release-visualization.yml">
+        <img src="https://github.com/MaibornWolff/codecharta/actions/workflows/release-visualization.yml/badge.svg" alt="Release Visualization">
+    </a>
   <a href="https://sonarcloud.io/dashboard?id=maibornwolff-gmbh_codecharta_analysis">
     <img src="https://sonarcloud.io/api/project_badges/measure?project=maibornwolff-gmbh_codecharta_analysis&metric=alert_status" alt="Quality Gate Analysis"></a>
   <a href="https://sonarcloud.io/dashboard?id=maibornwolff-gmbh_codecharta_visualization">

analysis/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed 🐞
 
+-   Add default Docker user to mitigate `GitLogParser` issues during repo-scan [#3571](https://github.com/MaibornWolff/codecharta/pull/3571)
 -   Escaping and un-escaping windows paths, auto-detecting path separator for Unix and Windows
     paths [#3569](https://github.com/MaibornWolff/codecharta/pull/3569)
 

analysis/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get dist-upgrade -y
 RUN apt-get install git -y
 
 RUN apt-get install wget curl -y; \
-    wget -qO tokei.tar.gz https://github.com/XAMPPRocky/tokei/releases/latest/download/tokei-x86_64-unknown-linux-gnu.tar.gz; \
+    wget -qO tokei.tar.gz https://github.com/XAMPPRocky/tokei/releases/download/v12.1.2/tokei-x86_64-unknown-linux-gnu.tar.gz; \
     tar -xf tokei.tar.gz -C /usr/local/bin; \
     rm tokei.tar.gz;
 
@@ -24,7 +24,7 @@ RUN wget -qO codemaat.jar https://github.com/adamtornhill/code-maat/releases/dow
 
 RUN curl -sL https://deb.nodesource.com/setup_18.x -o /tmp/nodesource_setup.sh; \
     bash /tmp/nodesource_setup.sh; \
-    apt-get install nodejs make gcc build-essential -y; \
+    apt-get install nodejs make gcc build-essential -y;
 
 RUN wget -qO /tmp/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-linux.zip; \
     apt-get install unzip -y; \
@@ -34,4 +34,13 @@ RUN wget -qO /tmp/sonar-scanner.zip https://binaries.sonarsource.com/Distributio
     mkdir --parents /usr/local/conf ; cp ./conf/sonar-scanner.properties /usr/local/conf/; \
     cp -r ./jre/ /usr/local/jre; cd /; rm /tmp/sonar-scanner.zip; rm -rf /tmp/sonar-scanner-*-linux;
 
+ARG USERNAME=nonroot-docker-user
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME;
+
+USER $USERNAME
+
 CMD ["ccsh"]

analysis/import/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/importer/gitlogparser/subcommands/RepoScanCommand.kt

@@ -14,7 +14,7 @@ import java.util.concurrent.Callable
 @CommandLine.Command(
         name = RepoScanCommand.NAME,
         description = [RepoScanCommand.DESCRIPTION],
-        footer = ["Copyright(c) 2022, MaibornWolff GmbH"],
+        footer = ["Copyright(c) 2024, MaibornWolff GmbH"],
                     )
 class RepoScanCommand : Callable<Unit>, InteractiveParser {
 @CommandLine.Option(names = ["-h", "--help"], usageHelp = true, description = ["displays this help and exits"])

analysis/import/GitLogParser/src/main/kotlin/de/maibornwolff/codecharta/importer/gitlogparser/util/GitAdapter.kt

@@ -18,6 +18,11 @@ fun getGitLog() {
         process.directory(gitDirectory)
         process.redirectOutput(fileHandle)
         val runningProcess = process.start()
-        runningProcess.waitFor(3, TimeUnit.MINUTES)
+        if (runningProcess.waitFor(3, TimeUnit.MINUTES)) {
+            val exitCode = runningProcess.exitValue()
+            if (exitCode != 0) {
+                throw RuntimeException("Error while executing Git! Command was: ${process.command()}. Process returned with exit status $exitCode.")
+            }
+        }
     }
 }

analysis/import/GitLogParser/src/test/kotlin/de/maibornwolff/codecharta/importer/gitlogparser/util/GitAdapterTest.kt

@@ -1,5 +1,7 @@
 package de.maibornwolff.codecharta.importer.gitlogparser.util
 
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Assertions.assertThrowsExactly
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import java.io.File
@@ -17,6 +19,20 @@ class GitAdapterTest {
         assertTrue(gitFile.inputStream().bufferedReader().readLine().matches(commitRegex))
     }
 
+    @Test
+    fun `should throw error with exit code if non-zero`() {
+        val gitFile = File.createTempFile("git", ".log")
+        gitFile.deleteOnExit()
+
+        val assertion = assertThrowsExactly(RuntimeException::class.java) { GitAdapter(File(gitFile.parent), gitFile).getGitLog() }
+        Assertions.assertThat(assertion).hasMessageContainingAll(
+            "Error while executing Git! Command was",
+            "[git, log, --numstat, --raw, --topo-order, --reverse, -m]",
+            "Process returned with exit status",
+            "128",
+        )
+    }
+
     @Test
     fun `should produce a not empty git file list for the current directory`() {
         val gitLs = File.createTempFile("git", ".log")

analysis/node-wrapper/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2020, MaibornWolff GmbH
+Copyright (c) 2024, MaibornWolff GmbH
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without