decouple common feature config from the feature list

Author: mdroll

src/main/groovy/com/cloudogu/gitops/Feature.groovy

@@ -85,14 +85,14 @@ abstract class Feature {
     protected void validate() { }
 
     /**
-     * Hook for preConfigValidation. Optional.
+     * Hook for preConfigInit. Optional.
      * Feature should throw RuntimeException to stop immediately.
      */
-    void preConfigValidation(Config configToSet) { }
+    void preConfigInit(Config configToSet) { }
 
     /**
-     * Hook for postConfigValidation. Optional.
+     * Hook for postConfigInit. Optional.
      * Feature should throw RuntimeException to stop immediately.
      */
-    void postConfigValidation(Config configToSet) { }
+    void postConfigInit(Config configToSet) { }
 }

src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCli.groovy

@@ -24,6 +24,8 @@ import picocli.CommandLine
 
 import static com.cloudogu.gitops.config.ConfigConstants.APP_NAME
 import static com.cloudogu.gitops.utils.MapUtils.deepMerge
+
+
 /**
  * Provides the entrypoint to the application as well as all config parameters.
  * When changing parameters, make sure to update the Config for the config file as well
@@ -37,7 +39,7 @@ class GitopsPlaygroundCli {
     ApplicationConfigurator applicationConfigurator
 
     GitopsPlaygroundCli(K8sClient k8sClient = new K8sClient(new CommandExecutor(), new FileSystemUtils(), null),
-                        ApplicationConfigurator applicationConfigurator = new ApplicationConfigurator(null)) {
+                        ApplicationConfigurator applicationConfigurator = new ApplicationConfigurator()) {
         this.k8sClient = k8sClient
         this.applicationConfigurator = applicationConfigurator
     }
@@ -65,6 +67,8 @@ class GitopsPlaygroundCli {
         Application app = context.getBean(Application)
 
         def config = readConfigs(args)
+        runHook(app, 'preConfigInit', config)
+
         if (config.application.outputConfigFile) {
             println(config.toYaml(false))
             return ReturnCode.SUCCESS
@@ -74,8 +78,9 @@ class GitopsPlaygroundCli {
         // eg a simple docker run .. --help should not fail with connection refused
         config = applicationConfigurator.initConfig(config)
         log.debug("Actual config: ${config.toYaml(true)}")
+        runHook(app, 'postConfigInit', config)
 
-        runHook(app, 'postConfigValidation', config)
+        context = createApplicationContext()
         register(config, context)
 
         if (config.application.destroy) {
@@ -91,6 +96,7 @@ class GitopsPlaygroundCli {
             if (!confirm("Applying gitops playground to kubernetes cluster '${k8sClient.currentContext}'.", config)) {
                 return ReturnCode.NOT_CONFIRMED
             }
+            app = context.getBean(Application)
             app.start()
 
             printWelcomeScreen()
@@ -211,9 +217,6 @@ class GitopsPlaygroundCli {
         log.debug("Writing CLI params into config")
         Config mergedConfig = Config.fromMap(mergedConfigs)
         new CommandLine(mergedConfig).parseArgs(args)
-
-        def app = ApplicationContext.run().getBean(Application)
-        runHook(app, 'preConfigValidation', mergedConfig)
 
         return mergedConfig
     }

src/main/groovy/com/cloudogu/gitops/config/CommonFeatureConfig.groovy

@@ -6,8 +6,7 @@ import groovy.util.logging.Slf4j
 @Slf4j
 class CommonFeatureConfig extends Feature {
     @Override
-    void preConfigValidation(Config configToSet) {
-        log.debug("Common preConfigValidation")
+    void preConfigInit(Config configToSet) {
         validateScmmAndJenkinsAreBothSet(configToSet)
         validateMirrorReposHelmChartFolderSet(configToSet)
     }

src/main/groovy/com/cloudogu/gitops/features/Content.groovy

@@ -79,7 +79,7 @@ class Content extends Feature {
     }
 
     @Override
-    void preConfigValidation(Config configToSet) {
+    void preConfigInit(Config configToSet) {
         config.content.repos.each { repo ->
 
             if (!repo.url) {

src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy

@@ -77,7 +77,7 @@ class ArgoCD extends Feature {
     }
 
     @Override
-    void postConfigValidation(Config configToSet) {
+    void postConfigInit(Config configToSet) {
         // Exit early if not in operator mode or if env list is empty
         if (!configToSet.features.argocd.operator || !configToSet.features.argocd.env) {
             log.debug("Skipping features.argocd.env validation: operator mode is disabled or env list is empty.")

src/test/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliMainScriptedTest.groovy

@@ -74,7 +74,7 @@ class GitopsPlaygroundCliMainScriptedTest {
                 .enableAnnotationInfo()
                 .scan().withCloseable { scanResult ->
             scanResult.getAllClasses().each { ClassInfo classInfo ->
-                if (classInfo.name.endsWith("Test") || classInfo.isAbstract()) {
+                if (classInfo.name.endsWith("Test") || classInfo.isAbstract() || !classInfo.hasAnnotation(jakarta.inject.Singleton)) {
                     return
                 }