refactor: use deployment context as source of truth in tool config mappers

Author: avetgit

src/main/java/com/cloudogu/gitops/tools/MonitoringToolConfigMapper.java

@@ -41,19 +41,19 @@ public MonitoringToolConfig map(DeploymentContext context) {
 			.jenkinsActive(config.getJenkins().getActive())
 			.helm(ToolConfigMapperSupport.helmChart(monitoring.getHelm(), config.getApplication().getLocalHelmChartFolder()))
 			.imagePullSecret(ToolConfigMapperSupport.imagePullSecret(config.getRegistry()))
-			.templateConfig(templateConfig(config))
+			.templateConfig(templateConfig(config, context))
 			.build();
 	}
 
-	private static Map<String, Object> templateConfig(Config config) {
+	private static Map<String, Object> templateConfig(Config config, DeploymentContext context) {
 		Config.MonitoringSchema.MonitoringHelmSchema helm = config.getFeatures().getMonitoring().getHelm();
 		String scmManagerNamespace = config.getScm() == null || config.getScm().getScmManager() == null
 			? "scm-manager"
 			: config.getScm().getScmManager().getNamespace();
 		return new TemplateConfig()
 			.put("application.namePrefix", config.getApplication().getNamePrefix())
 			.put("application.namespaceIsolation", config.getApplication().getNamespaceIsolation())
-			.put("application.openshift", config.getApplication().getOpenshift())
+			.put("application.openshift", context.isOpenshift())
 			.put("application.podResources", config.getApplication().getPodResources())
 			.put("application.skipCrds", config.getApplication().getSkipCrds())
 			.put("application.password", config.getApplication().getPassword())

src/main/java/com/cloudogu/gitops/tools/VaultToolConfigMapper.java

@@ -26,15 +26,15 @@ public VaultToolConfig map(DeploymentContext context) {
 								  secrets.getVault().getHelm(), config.getApplication().getLocalHelmChartFolder()
 							  ))
 							  .imagePullSecret(ToolConfigMapperSupport.imagePullSecret(config.getRegistry()))
-							  .templateConfig(templateConfig(config))
+							  .templateConfig(templateConfig(config, context))
 							  .build();
 	}
 
-	private static Map<String, Object> templateConfig(Config config) {
+	private static Map<String, Object> templateConfig(Config config, DeploymentContext context) {
 		return new TemplateConfig()
 			.put("application.namePrefix", config.getApplication().getNamePrefix())
 			.put("application.namespaceIsolation", config.getApplication().getNamespaceIsolation())
-			.put("application.openshift", config.getApplication().getOpenshift())
+			.put("application.openshift", context.isOpenshift())
 			.put("application.password", config.getApplication().getPassword())
 			.put("application.podResources", config.getApplication().getPodResources())
 			.put("application.username", config.getApplication().getUsername())

src/main/java/com/cloudogu/gitops/tools/core/argocd/ArgoCDToolConfigMapper.java

@@ -37,30 +37,30 @@ public ArgoCDToolConfig map(DeploymentContext context) {
 							   .centralNamespace(config.getMultiTenant().getCentralArgocdNamespace())
 							   .clusterAdmin(config.getApplication().getClusterAdmin())
 							   .scmProviderType(config.getScm().getScmProviderType())
-							   .templateConfig(templateConfig(config))
-							   .rbacTemplateConfig(rbacTemplateConfig(config))
+							   .templateConfig(templateConfig(config, context))
+							   .rbacTemplateConfig(rbacTemplateConfig(config, context))
 							   .build();
 	}
 
-	private static Map<String, Object> rbacTemplateConfig(Config config) {
+	private static Map<String, Object> rbacTemplateConfig(Config config, DeploymentContext context) {
 		return new TemplateConfig()
-			.put("application.openshift", config.getApplication().getOpenshift())
+			.put("application.openshift", context.isOpenshift())
 			.put("features.monitoring.active", config.getFeatures().getMonitoring().getActive())
 			.put("features.secrets.active", config.getFeatures().getSecrets().getActive())
 			.values();
 	}
 
-	private static Map<String, Object> templateConfig(Config config) {
+	private static Map<String, Object> templateConfig(Config config, DeploymentContext context) {
 		String scmManagerNamespace = config.getScm() == null || config.getScm().getScmManager() == null
 			? "scm-manager"
 			: config.getScm().getScmManager().getNamespace();
 		return new TemplateConfig()
 			.put("application.clusterAdmin", config.getApplication().getClusterAdmin())
 			.put("application.insecure", config.getApplication().getInsecure())
-			.put("application.mirrorRepos", config.getApplication().getMirrorRepos())
+			.put("application.mirrorRepos", context.isAirgapped())
 			.put("application.namePrefix", config.getApplication().getNamePrefix())
 			.put("application.netpols", config.getApplication().getNetpols())
-			.put("application.openshift", config.getApplication().getOpenshift())
+			.put("application.openshift", context.isOpenshift())
 			.put("application.skipCrds", config.getApplication().getSkipCrds())
 			.put(
 				"content.helmReleases",

src/test/groovy/com/cloudogu/gitops/tools/MonitoringToolConfigMapperTest.groovy

@@ -22,7 +22,8 @@ class MonitoringToolConfigMapperTest {
 		config.application.namespaceIsolation = true
 		config.application.netpols = true
 		config.application.skipCrds = true
-		config.application.openshift = true
+		// Intentionally differs from the DeploymentContext to verify derived values come from the context.
+		config.application.openshift = false
 		config.application.podResources = true
 		config.application.password = 'application-password'
 		config.application.username = 'application-user'

src/test/groovy/com/cloudogu/gitops/tools/VaultToolConfigMapperTest.groovy

@@ -94,7 +94,8 @@ class VaultToolConfigMapperTest {
         config.application.namePrefix = 'test-'
         config.application.localHelmChartFolder = '/charts'
         config.application.namespaceIsolation = true
-        config.application.openshift = true
+        // Intentionally differs from the DeploymentContext to verify derived values come from the context.
+        config.application.openshift = false
         config.application.password = 'application-password'
         config.application.podResources = true
         config.application.username = 'application-user'

src/test/groovy/com/cloudogu/gitops/tools/core/argocd/ArgoCDToolConfigMapperTest.groovy

@@ -20,8 +20,9 @@ class ArgoCDToolConfigMapperTest {
 		config.application.netpols = true
 		config.application.clusterAdmin = true
 		config.application.insecure = true
-		config.application.mirrorRepos = true
-		config.application.openshift = true
+		// Intentionally differs from the DeploymentContext to verify derived values come from the context.
+		config.application.mirrorRepos = false
+		config.application.openshift = false
 		config.application.skipCrds = true
 		config.features.argocd.active = true
 		config.features.argocd.namespace = 'gitops'