Content: No longer init repos with main branch

MIRROR mode had two flaws:

Source repos without main branch ended up with a main branch.

Source repos with default branch != main:
Main was not mirrored but only contained a README (created by SCMM
init).

Without the main Branch ScmmRepo.clone() ran into errors because it
explicitly checked out main.
Turn out without setNoCheckout(true) this is not possible.
setNoCheckout(true) lead to all files being marked as deleted right
after git clone.
Without it, the default branch is checkout out just like "git clone" on CLI.

Author: schnatterer

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

@@ -540,12 +540,12 @@ class Content extends Feature {
      * Checks whether the repo already exists and overwrite Mode matches.
      */
     boolean isValidForPush(ScmmRepo repo, RepoCoordinate repoCoordinate) {
-        def isRepoCreated = repo.create('', scmmApiClient)
+        def isRepoCreated = repo.create('', scmmApiClient, false)
         if (!isRepoCreated && OverwriteMode.INIT == repoCoordinate.repoConfig.overwriteMode) {
             log.warn("OverwriteMode ${OverwriteMode.INIT} set for repo '${repoCoordinate.fullRepoName}' " +
                     "and repo already exists in target:  Not pushing content!" +
                     "If you want to override, set ${OverwriteMode.UPGRADE} or ${OverwriteMode.RESET} .")
-            return false;
+            return false
         }
         return true
     }

src/main/groovy/com/cloudogu/gitops/scmm/ScmmRepo.groovy

@@ -95,24 +95,26 @@ class ScmmRepo {
         }
     }
 
-
     void cloneRepo() {
         log.debug("Cloning $scmmRepoTarget repo")
-        gitClone()
-        checkoutOrCreateBranch('main')
+        Git.cloneRepository()
+                .setURI(getGitRepositoryUrl())
+                .setDirectory(new File(absoluteLocalRepoTmpDir))
+                .setCredentialsProvider(getCredentialProvider())
+                .call()
     }
 
     /**
      * @return true if created, false if already exists. Throw exception on all other errors
      */
-    boolean create(String description, ScmmApiClient scmmApiClient) {
+    boolean create(String description, ScmmApiClient scmmApiClient, boolean initialize = true) {
         def namespace = scmmRepoTarget.split('/', 2)[0]
         def repoName = scmmRepoTarget.split('/', 2)[1]
 
         def repositoryApi = scmmApiClient.repositoryApi()
         def repo = new Repository(namespace, repoName, description)
         log.debug("Creating repo: ${namespace}/${repoName}")
-        def createResponse = repositoryApi.create(repo, true).execute()
+        def createResponse = repositoryApi.create(repo, initialize).execute()
         handleResponse(createResponse, repo)
 
         def permission = new Permission(config.scmm.gitOpsUsername as String, Permission.Role.WRITE)
@@ -218,33 +220,6 @@ class ScmmRepo {
                 .setCredentialsProvider(getCredentialProvider())
     }
 
-    void checkoutOrCreateBranch(String branch) {
-        log.debug("Checking out $branch for repo $scmmRepoTarget")
-        getGit()
-                .checkout()
-                .setCreateBranch(!branchExists(branch))
-                .setName(branch)
-                .call()
-    }
-
-    private boolean branchExists(String branch) {
-        return getGit()
-                .branchList()
-                .call()
-                .collect { it.name.replace("refs/heads/", "") }
-                .contains(branch)
-    }
-
-    protected Git gitClone() {
-        Git.cloneRepository()
-                .setURI(getGitRepositoryUrl())
-                .setDirectory(new File(absoluteLocalRepoTmpDir))
-                .setNoCheckout(true)
-                .setCredentialsProvider(getCredentialProvider())
-                .call()
-
-    }
-
     private CredentialsProvider getCredentialProvider() {
         if (scmProvider == "gitlab") {
             username = "oauth2"

src/test/groovy/com/cloudogu/gitops/features/ContentTest.groovy

@@ -578,7 +578,7 @@ class ContentTest {
         try (def git = Git.cloneRepository().setURI(url).setBranch('main').setDirectory(tmpDir).call()) {
 
 
-            verify(repo).create(eq(''), any(ScmmApiClient))
+            verify(repo).create(eq(''),  any(ScmmApiClient), eq(false))
 
             def commitMsg = git.log().call().iterator().next().getFullMessage()
             assertThat(commitMsg).isEqualTo("Initialize content repo ${expectedRepo}".toString())
@@ -639,7 +639,7 @@ class ContentTest {
         try (def git = Git.cloneRepository().setURI(url).setBranch('main').setDirectory(tmpDir).call()) {
 
 
-            verify(repo).create(eq(''), any(ScmmApiClient))
+            verify(repo).create(eq(''),  any(ScmmApiClient), eq(false))
 
             def commitMsg = git.log().call().iterator().next().getFullMessage()
             assertThat(commitMsg).isEqualTo("Initialize content repo ${expectedRepo}".toString())
@@ -700,7 +700,7 @@ class ContentTest {
         // clone repo, to ensure, changes in remote repo.
         try (def git = Git.cloneRepository().setURI(url).setBranch('main').setDirectory(tmpDir).call()) {
 
-            verify(repo).create(eq(''), any(ScmmApiClient))
+            verify(repo).create(eq(''),  any(ScmmApiClient), eq(false))
 
             def commitMsg = git.log().call().iterator().next().getFullMessage()
             assertThat(commitMsg).isEqualTo("Initialize content repo ${expectedRepo}".toString())

src/test/groovy/com/cloudogu/gitops/utils/TestScmmRepoProvider.groovy

@@ -4,9 +4,8 @@ import com.cloudogu.gitops.config.Config
 import com.cloudogu.gitops.scmm.ScmmRepo
 import com.cloudogu.gitops.scmm.ScmmRepoProvider
 import org.apache.commons.io.FileUtils
-import org.eclipse.jgit.api.Git
 
-import static org.mockito.Mockito.spy
+import static org.mockito.Mockito.spy 
 
 class TestScmmRepoProvider extends ScmmRepoProvider {
     Map<String, ScmmRepo> repos = [:]
@@ -45,24 +44,6 @@ class TestScmmRepoProvider extends ScmmRepoProvider {
                 return remoteGitRepopUrl
             }
 
-            @Override
-            protected Git gitClone() {
-                // Cloning from filepath does not work without setting branch
-                try {
-                    Git.cloneRepository()
-                            .setURI(getGitRepositoryUrl())
-                            .setDirectory(new File(absoluteLocalRepoTmpDir))
-                            .setNoCheckout(true)
-                            .setBranch('main')
-                            .call()
-
-                } catch (Exception e) {
-                    // test workaround for testing same repo again. Clean folder with .git and do it again.
-                    // it need 2-3 tries
-                    fileSystemUtils.deleteFilesExcept(new File(absoluteLocalRepoTmpDir))
-                    gitClone()
-                }
-            }
         }
         // Create a spy to enable verification while keeping real behavior
         ScmmRepo spyRepo = spy(repoNew)