Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
907a1b0
refactor(cli,utils): migrate ReturnCode and MapUtils to Java
DerDaehne Jul 14, 2026
663d31e
refactor(utils): migrate DockerImageParser to Java
DerDaehne Jul 14, 2026
d272533
refactor(utils): migrate NetworkingUtils to Java
DerDaehne Jul 14, 2026
3d26816
refactor(utils): migrate CommandExecutor and InsecureCredentialProvid…
DerDaehne Jul 14, 2026
65fd5e4
refactor(utils): migrate AirGappedUtils to Java
DerDaehne Jul 14, 2026
75e4968
refactor(utils): migrate ClusterResourcesCopyFilter to Java
DerDaehne Jul 14, 2026
9a378d7
refactor(utils): migrate AllowListFreemarkerObjectWrapper to Java
DerDaehne Jul 14, 2026
a62004b
refactor(utils): migrate TemplatingEngine to Java
DerDaehne Jul 14, 2026
e9a8ad5
refactor(utils): migrate FileSystemUtils to Java
DerDaehne Jul 14, 2026
42ce46f
refactor(config): migrate ScmProviderType and ConfigConstants to Java
DerDaehne Jul 14, 2026
2253e7c
refactor(config): migrate Credentials to Java
DerDaehne Jul 14, 2026
4b5904a
refactor(config): migrate SCM configs to Java
DerDaehne Jul 14, 2026
1c5e627
refactor(config): migrate JsonSchema logic to Java
DerDaehne Jul 14, 2026
0a901ba
refactor(config): migrate Schema models to Java
DerDaehne Jul 14, 2026
365fd6c
fix(test): resolve GString cast and template exception propagation
DerDaehne Jul 14, 2026
bce6931
refactor(config): migrate Config to Java
DerDaehne Jul 14, 2026
4a21c4f
refactor(infra): migrate RBAC models to Java
DerDaehne Jul 14, 2026
e1b2a7b
refactor(infra): migrate RbacDefinition to Java
DerDaehne Jul 14, 2026
b0c124b
refactor(infra): migrate HelmClient to Java
DerDaehne Jul 14, 2026
2707d6c
refactor(infra): migrate K8sClient to Java
DerDaehne Jul 14, 2026
51c659a
refactor(infra): migrate GitRepo and GitRepoFactory to Java
DerDaehne Jul 14, 2026
024aa56
refactor(infra): migrate SCM-Manager REST-clients to Java
DerDaehne Jul 14, 2026
5170320
refactor(infra): migrate Jenkins REST-clients to Java
DerDaehne Jul 14, 2026
21b9421
refactor(tools): migrate Tool base classes to Java
DerDaehne Jul 14, 2026
261e432
refactor(tools): migrate simple infrastructure tools to Java
DerDaehne Jul 14, 2026
0ffa924
refactor(tools): migrate ArgoCD and ScmManager to Java
DerDaehne Jul 14, 2026
b4735d9
refactor(tools): migrate Jenkins, Vault and Monitoring to Java
DerDaehne Jul 14, 2026
d2fba1a
Handle transient Git lock files during writable directory traversal
avetgit Jul 15, 2026
9f71e6e
refactor(app): migrate Application Orchestration and CLI to Java
DerDaehne Jul 16, 2026
526cf75
fix(tools): resolve Java migration test and compilation failures
DerDaehne Jul 16, 2026
470ed2e
refactor: migrate all remaining Groovy classes to Java 17
DerDaehne Jul 16, 2026
a277bcb
chore(docker): update helm charts downloader and Dockerfile for Java 17
DerDaehne Jul 16, 2026
39f09e9
refactor: modernize codebase with Lombok, Java 17 Records, and clean …
DerDaehne Jul 16, 2026
052f1fb
refactor(config): use Lombok to remove boilerplate in Config.java
DerDaehne Jul 16, 2026
a9d5ee6
refactor: address multiple code review findings in Groovy to Java mig…
DerDaehne Jul 17, 2026
37cc192
refactor: resolve 25 SonarQube issues on branch PR-541
DerDaehne Jul 17, 2026
96f8503
refactor: address critical security vulnerabilities and code smells
DerDaehne Jul 17, 2026
d7db561
feat: integrate Renovate monitoring for Config.java helm charts
DerDaehne Jul 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ RUN /jenkins/download-plugins.sh /dist/gitops/jenkins-plugins
# -----------------------------------------------------------------------------
# 3.7: Download Helm Charts
# -----------------------------------------------------------------------------
COPY src/main/groovy/com/cloudogu/gitops/config/Config.groovy /tmp/
COPY src/main/groovy/com/cloudogu/gitops/config/scm/ScmTenantSchema.groovy /tmp/
COPY src/main/java/com/cloudogu/gitops/config/Config.java /tmp/
COPY src/main/java/com/cloudogu/gitops/config/scm/ScmTenantSchema.java /tmp/
COPY scripts/downloadHelmCharts.sh /tmp/
RUN cd /dist/gitops && /tmp/downloadHelmCharts.sh /tmp/Config.groovy /tmp/ScmTenantSchema.groovy
RUN cd /dist/gitops && /tmp/downloadHelmCharts.sh /tmp/Config.java /tmp/ScmTenantSchema.java

# -----------------------------------------------------------------------------
# 3.8: Prepare Application Files
Expand Down
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,13 @@
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -562,6 +569,11 @@
<version>3.15.0</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.36</version>
</path>
<path>
<groupId>com.cloudogu.versionName</groupId>
<artifactId>processor</artifactId>
Expand Down
10 changes: 10 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"customManagers": [
{
"customType": "regex",
"fileMatch": ["^src/main/java/com/cloudogu/gitops/config/Config\\.java$"],
"matchStrings": [
"// renovate: depName=(?<depName>[^\\s]+) registryUrl=(?<registryUrl>[^\\s]+)\\s+.*setVersion\\(\"(?<currentValue>[^\"]+)\"\\);"
],
"datasourceTemplate": "helm"
}
],
"baseBranchPatterns": [
"develop"
],
Expand Down
14 changes: 7 additions & 7 deletions scripts/downloadHelmCharts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#execute from root folder
set -o errexit -o nounset -o pipefail
charts=( 'kube-prometheus-stack' 'external-secrets' 'vault' 'traefik' 'cert-manager' 'jenkins' 'scm-manager')
CONFIG="${1:-src/main/groovy/com/cloudogu/gitops/config/Config.groovy}"
SCM_MANAGER_CONFIG="${2:-src/main/groovy/com/cloudogu/gitops/config/scm/ScmTenantSchema.groovy}"
CONFIG="${1:-src/main/java/com/cloudogu/gitops/config/Config.java}"
SCM_MANAGER_CONFIG="${2:-src/main/java/com/cloudogu/gitops/config/scm/ScmTenantSchema.java}"
CONFIG_FILES=("${CONFIG}")

if [[ "${CONFIG}" != "${SCM_MANAGER_CONFIG}" ]]; then
Expand All @@ -18,7 +18,7 @@ function extractChartProperty() {
local chartDetails="$1"
local property="$2"

echo "$chartDetails" | sed -nE "s/.*${property}[[:space:]]*:[[:space:]]*'([^']+)'.*/\1/p" | head -n1
echo "$chartDetails" | sed -nE "s/.*set${property}\(\"([^\"]+)\"\).*/\1/p" | head -n1
}

for chart in "${charts[@]}"; do
Expand All @@ -28,7 +28,7 @@ for chart in "${charts[@]}"; do
if [[ ! -f "${configFile}" ]]; then
continue
fi
chartDetails=$(grep -m1 -EA5 "chart[[:space:]]*:[[:space:]]*'${chart}'" "${configFile}" || true)
chartDetails=$(grep -m1 -EA5 "setChart\(\"${chart}\"\)" "${configFile}" || true)
if [[ -n "$chartDetails" ]]; then
chartConfig="${configFile}"
break
Expand All @@ -39,9 +39,9 @@ for chart in "${charts[@]}"; do
echo "Did not find chart details for chart $chart in files: ${CONFIG_FILES[*]}" >&2
exit 1
fi
repo=$(extractChartProperty "$chartDetails" "repoURL")
chart=$(extractChartProperty "$chartDetails" "chart")
version=$(extractChartProperty "$chartDetails" "version")
repo=$(extractChartProperty "$chartDetails" "RepoURL")
chart=$(extractChartProperty "$chartDetails" "Chart")
version=$(extractChartProperty "$chartDetails" "Version")

if [[ -z "$repo" || -z "$chart" || -z "$version" ]]; then
echo "Could not extract chart details from ${chartConfig}: repoURL='${repo}', chart='${chart}', version='${version}'" >&2
Expand Down
108 changes: 0 additions & 108 deletions src/main/groovy/com/cloudogu/gitops/application/Application.groovy

This file was deleted.

Loading