Content: Evaluate feature at the very end

Author: schnatterer

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

@@ -92,14 +92,14 @@ class GitopsPlaygroundCliMainScripted {
                         new Jenkins(config, executor, fileSystemUtils, new GlobalPropertyManager(jenkinsApiClient),
                                 new JobManager(jenkinsApiClient), new UserManager(jenkinsApiClient),
                                 new PrometheusConfigurator(jenkinsApiClient), helmStrategy, k8sClient, networkingUtils),
-                        new Content(config, k8sClient, scmmRepoProvider, scmmApiClient),
                         new ArgoCD(config, k8sClient, helmClient, fileSystemUtils, scmmRepoProvider),
                         new IngressNginx(config, fileSystemUtils, deployer, k8sClient, airGappedUtils),
                         new CertManager(config, fileSystemUtils, deployer, k8sClient, airGappedUtils),
                         new Mailhog(config, fileSystemUtils, deployer, k8sClient, airGappedUtils),
                         new PrometheusStack(config, fileSystemUtils, deployer, k8sClient, airGappedUtils, scmmRepoProvider),
                         new ExternalSecretsOperator(config, fileSystemUtils, deployer, k8sClient, airGappedUtils),
-                        new Vault(config, fileSystemUtils, k8sClient, deployer, airGappedUtils)
+                        new Vault(config, fileSystemUtils, k8sClient, deployer, airGappedUtils),
+                        new Content(config, k8sClient, scmmRepoProvider, scmmApiClient),
                 ]))
             }
         }

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

@@ -23,7 +23,7 @@ import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 
 @Slf4j
 @Singleton
-@Order(80)
+@Order(999) // We want to evaluate content last, to allow for changing all other repos
 class Content extends Feature {
 
     private Config config
@@ -176,7 +176,7 @@ class Content extends Feature {
                     new UsernamePasswordCredentialsProvider(repo.username, repo.password))
         }
         def git = cloneCommand.call()
-        
+
         if (repo.ref) {
             def actualRef = findRef(repo, git.repository)
             git.checkout().setName(actualRef).call()
@@ -188,7 +188,7 @@ class Content extends Feature {
         if (gitRepo.resolve(repoConfig.ref)) {
             return repoConfig.ref
         }
-        
+
         // Check tags or branches
         def remoteCommand = Git.lsRemoteRepository()
                 .setRemote(repoConfig.url)
@@ -207,7 +207,7 @@ class Content extends Feature {
             // This might lead to unexpected surprises for our users, so better fail explicitly
             throw new RuntimeException("Reference '${repoConfig.ref}' not found in repository '${repoConfig.url}'")
         }
-        
+
         // Jgit only checks out remote branches when they start in origin/ 🙄 
         return potentialRef.replace('refs/heads/', 'origin/')
     }

src/test/groovy/com/cloudogu/gitops/ApplicationTest.groovy

@@ -18,8 +18,8 @@ class ApplicationTest {
                 .registerSingleton(config)
                 .getBean(Application)
         def features = application.features.collect { it.class.simpleName }
-
-        assertThat(features).isEqualTo(["Registry", "ScmManager", "Jenkins", "Content", "ArgoCD", "IngressNginx", "CertManager", "Mailhog", "PrometheusStack", "ExternalSecretsOperator", "Vault"])
+        
+        assertThat(features).isEqualTo(["Registry", "ScmManager", "Jenkins", "ArgoCD", "IngressNginx", "CertManager", "Mailhog", "PrometheusStack", "ExternalSecretsOperator", "Vault",  "Content"])
     }
 
     @Test