ScmManager Setup

Author: nihussmann

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

@@ -705,7 +705,6 @@ class Config {
         INIT, RESET, UPGRADE
     }
 
-
     private static final ObjectMapper objectMapper = new ObjectMapper()
             .registerModule(new SimpleModule().addSerializer(GString, new JsonSerializer<GString>() {
                 @Override

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManager.groovy

@@ -10,7 +10,8 @@ import com.cloudogu.gitops.git.providers.RepoUrlScope
 import com.cloudogu.gitops.git.providers.Scope
 import com.cloudogu.gitops.git.providers.scmmanager.api.Repository
 import com.cloudogu.gitops.git.providers.scmmanager.api.ScmManagerApiClient
-import com.cloudogu.gitops.utils.*
+import com.cloudogu.gitops.utils.K8sClient
+import com.cloudogu.gitops.utils.NetworkingUtils
 import groovy.util.logging.Slf4j
 import retrofit2.Response
 
@@ -33,12 +34,22 @@ class ScmManager implements GitProvider {
         this.helmStrategy = helmStrategy
         this.k8sClient = k8sClient
         this.networkingUtils = networkingUtils
-        this.scmManagerSetup = new ScmManagerSetup(this)
-        this.scmManagerSetup.setupHelm()
-        this.urls = new ScmManagerUrlResolver(this.config, this.scmmConfig, this.k8sClient, this.networkingUtils)
-        this.apiClient = new ScmManagerApiClient(this.urls.clientApiBase().toString(), this.scmmConfig.credentials, this.config.application.insecure)
-        this.scmManagerSetup.waitForScmmAvailable()
-        this.scmManagerSetup.setup()
+        init()
+    }
+
+    void init() {
+        //Setup for ScmManager
+        if (this.scmmConfig.internal) {
+            this.scmManagerSetup = new ScmManagerSetup(this)
+            this.scmManagerSetup.setupHelm()
+            this.urls = new ScmManagerUrlResolver(this.config, this.scmmConfig, this.k8sClient, this.networkingUtils)
+            this.apiClient = new ScmManagerApiClient(this.urls.clientApiBase().toString(), this.scmmConfig.credentials, this.config.application.insecure)
+            this.scmManagerSetup.waitForScmmAvailable()
+            this.scmManagerSetup.configure()
+        } else {
+            this.urls = new ScmManagerUrlResolver(this.config, this.scmmConfig, this.k8sClient, this.networkingUtils)
+            this.apiClient = new ScmManagerApiClient(this.urls.clientApiBase().toString(), this.scmmConfig.credentials, this.config.application.insecure)
+        }
     }
 
     // --- Git operations ---

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetup.groovy

@@ -42,11 +42,12 @@ class ScmManagerSetup {
         throw new RuntimeException("Timeout: SCM-Manager did not respond with 200 OK within ${timeoutSeconds} seconds")
     }
 
-    void setup() {
+    void configure() {
         installScmmPlugins()
         setSetupConfigs()
         configureJenkinsPlugin()
         addDefaultUsers()
+        log.info("ScmManager Setup finished!")
     }
 
     void setupHelm() {
@@ -158,9 +159,9 @@ class ScmManagerSetup {
                 disableGitTrigger             : false,
                 disableEventTrigger           : false,
                 url                           : this.scmManager.url
-        ]
+        ] as Map<String, String>
 
-        ScmManagerApiClient.handleApiResponse(scmManager.apiClient.pluginApi().configureJenkinsPlugin(jenkinsPluginConfig))
+        ScmManagerApiClient.handleApiResponse(this.scmManager.apiClient.pluginApi().configureJenkinsPlugin(jenkinsPluginConfig))
         log.debug("Successfully configured JenkinsPlugin in SCM-Manager.")
     }
 

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerUrlResolver.groovy

@@ -24,7 +24,6 @@ class ScmManagerUrlResolver {
         this.net = net
     }
 
-
     // ---------- Public API used by ScmManager ----------
 
     /** Client base …/scm (no trailing slash) */

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/api/PluginApi.groovy

@@ -1,6 +1,5 @@
 package com.cloudogu.gitops.git.providers.scmmanager.api
 
-import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Headers
@@ -11,9 +10,9 @@ import retrofit2.http.Query
 
 interface PluginApi {
     @POST("v2/plugins/available/{name}/install")
-    Call<ResponseBody> install(@Path("name") String name, @Query("restart") Boolean restart)
+    Call<Void> install(@Path("name") String name, @Query("restart") Boolean restart)
 
     @PUT("v2/config/jenkins/")
     @Headers("Content-Type: application/json")
-    Call<Void> configureJenkinsPlugin(@Body Map<String, Object> config)
+    Call<Void> configureJenkinsPlugin(@Body Map<String, String> config)
 }

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/api/RepositoryApi.groovy

@@ -7,7 +7,7 @@ import retrofit2.http.*
 
 interface RepositoryApi {
     @DELETE("v2/repositories/{namespace}/{name}")
-    Call<ResponseBody> delete(@Path("namespace") String namespace, @Path("name") String name)
+    Call<Void> delete(@Path("namespace") String namespace, @Path("name") String name)
 
     @POST("v2/repositories/")
     @Headers("Content-Type: application/vnd.scmm-repository+json;v=2")

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/api/ScmManagerApiClient.groovy

@@ -5,6 +5,7 @@ import com.cloudogu.gitops.config.Credentials
 import com.cloudogu.gitops.dependencyinjection.HttpClientFactory
 import groovy.util.logging.Slf4j
 import okhttp3.OkHttpClient
+import retrofit2.Call
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
@@ -40,7 +41,7 @@ class ScmManagerApiClient {
         return retrofit().create(PluginApi)
     }
 
-    static handleApiResponse(apiCall, String additionalMessage = "") {
+    static handleApiResponse(Call<Void> apiCall, String additionalMessage = "") {
         try {
             Response<Void> response = apiCall.execute()
 

src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/api/UsersApi.groovy

@@ -11,7 +11,7 @@ import retrofit2.http.Path
 
 interface UsersApi {
     @DELETE("v2/users/{id}")
-    Call<ResponseBody> delete(@Path("id") String id)
+    Call<Void> delete(@Path("id") String id)
 
     @Headers(["Content-Type: application/vnd.scmm-user+json;v=2"])
     @POST("v2/users")

src/test/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetupTest.groovy

@@ -0,0 +1,91 @@
+package com.cloudogu.gitops.git.providers.scmmanager
+
+import com.cloudogu.gitops.config.Config
+import com.cloudogu.gitops.features.deployment.HelmStrategy
+import com.cloudogu.gitops.git.providers.scmmanager.api.PluginApi
+import com.cloudogu.gitops.git.providers.scmmanager.api.ScmManagerApi
+import com.cloudogu.gitops.git.providers.scmmanager.api.ScmManagerApiClient
+import org.junit.jupiter.api.Test
+import retrofit2.Call
+import retrofit2.Response
+
+import static org.mockito.ArgumentMatchers.any
+import static org.mockito.ArgumentMatchers.eq
+import static org.mockito.Mockito.*
+
+class ScmManagerSetupTest {
+
+    ScmManager scmManager = mock(ScmManager.class)
+
+    HelmStrategy helmStrategy = mock(HelmStrategy.class)
+    ScmManagerApiClient apiClient = mock(ScmManagerApiClient.class)
+
+    PluginApi pluginApi = mock(PluginApi.class)
+    ScmManagerApi generalApi = mock(ScmManagerApi.class)
+
+    Config config = Config.fromMap([
+            application: [
+                    namePrefix: 'test',
+            ],
+            scm        : [
+                    scmManager: [
+                            internal      : true,
+                            url           : "",
+                            namespace     : "scm-manager",
+                            username      : "admin",
+                            password      : "admin",
+                            helm          : [
+                                    chart  : "scm-manager",
+                                    repoURL: "https://packages.scm-manager.org/repository/helm-v2-releases/",
+                                    version: "3.11.0",
+                                    values : [:]
+                            ],
+                            rootPath      : "repo",
+                            urlForJenkins : "http://scmm.scm-manager.svc.cluster.local/scm",
+                            ingress       : "scmm.master.localhost",
+                            skipRestart   : false,
+                            skipPlugins   : false,
+                            gitOpsUsername: ""
+                    ]
+            ]
+    ])
+
+    @Test
+    void 'Helm chart is installed correctly'() {
+        when(scmManager.getConfig()).thenReturn(config)
+        when(scmManager.getHelmStrategy()).thenReturn(helmStrategy)
+        when(scmManager.getScmmConfig()).thenReturn(config.scm.scmManager)
+        ScmManagerSetup scmManagerSetup = new ScmManagerSetup(scmManager)
+        scmManagerSetup.setupHelm()
+        verify(helmStrategy).deployFeature(
+                eq( "https://packages.scm-manager.org/repository/helm-v2-releases/"),
+                eq("scm-manager"),
+                any(),
+                eq("3.11.0"),
+                eq("scm-manager"),
+                eq("scmm"),
+                any()
+        )
+    }
+
+    @Test
+    void 'ScmManager Plugins are installed correctly'() {
+        when(scmManager.getConfig()).thenReturn(config)
+        when(scmManager.getHelmStrategy()).thenReturn(helmStrategy)
+        when(scmManager.getScmmConfig()).thenReturn(config.scm.scmManager)
+        when(scmManager.getApiClient()).thenReturn(apiClient)
+
+        Call<Void> apiCall = mock(Call.class)
+
+        when(pluginApi.install(any(),any())).thenReturn(apiCall)
+        when(generalApi.checkScmmAvailable()).thenReturn(apiCall)
+        when(apiClient.pluginApi()).thenReturn(pluginApi)
+        when(apiClient.generalApi()).thenReturn(generalApi)
+        when(apiCall.execute()).thenReturn(Response.success(null))
+        ScmManagerSetup scmManagerSetup = new ScmManagerSetup(scmManager)
+        scmManagerSetup.installScmmPlugins()
+        verify(pluginApi,atLeast(10)).install(any(),any())
+
+    }
+
+}