Adapt classes to upstream changes in 7.5.1

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
redhat-developer · Dec 3, 2019 · c289334 · c289334
1 parent 4473003
commit c289334
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/...lti-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8AuthServiceClient.java b/...lti-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8AuthServiceClient.java
@@ -16,7 +16,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.inject.name.Named;
-import io.jsonwebtoken.Jwt;
+import io.jsonwebtoken.JwtParser;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -64,8 +64,10 @@ public class Fabric8AuthServiceClient extends KeycloakServiceClient {
 
   @Inject
   public Fabric8AuthServiceClient(
-      @Named("che.fabric8.auth.endpoint") String baseAuthUrl, KeycloakSettings keycloakSettings) {
-    super(keycloakSettings);
+      @Named("che.fabric8.auth.endpoint") String baseAuthUrl,
+      KeycloakSettings keycloakSettings,
+      JwtParser jwtParser) {
+    super(keycloakSettings, jwtParser);
     this.githubTokenEndpoint = baseAuthUrl + GITHUB_TOKEN_API_PATH;
     this.githubLinkEndpoint = baseAuthUrl + GITHUB_LINK_API_PATH;
   }
@@ -78,7 +80,7 @@ public Fabric8AuthServiceClient(
    */
   @Override
   public String getAccountLinkingURL(
-      @SuppressWarnings("rawtypes") Jwt token, String oauthProvider, String redirectAfterLogin) {
+      String token, String oauthProvider, String redirectAfterLogin) {
     String linkingEndpoint =
         UriBuilder.fromUri(githubLinkEndpoint)
             .queryParam("redirect", redirectAfterLogin)

diff --git a/...enant-manager/src/main/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactory.java b/...enant-manager/src/main/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactory.java
@@ -18,6 +18,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import okhttp3.EventListener;
 import org.eclipse.che.api.core.NotFoundException;
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
 import org.eclipse.che.api.workspace.server.WorkspaceRuntimes;
@@ -57,15 +58,17 @@ public Fabric8OpenShiftClientFactory(
           int maxConcurrentRequestsPerHost,
       @Named("che.infra.kubernetes.client.http.connection_pool.max_idle") int maxIdleConnections,
       @Named("che.infra.kubernetes.client.http.connection_pool.keep_alive_min")
-          int connectionPoolKeepAlive) {
+          int connectionPoolKeepAlive,
+      EventListener eventListener) {
     super(
         null,
         null,
         doTrustCerts != null ? doTrustCerts.booleanValue() : false,
         maxConcurrentRequests,
         maxConcurrentRequestsPerHost,
         maxIdleConnections,
-        connectionPoolKeepAlive);
+        connectionPoolKeepAlive,
+        eventListener);
     this.envProvider = envProvider;
     this.workspaceRuntimeProvider = workspaceRuntimeProvider;
     this.subjectsRegistry = subjectsRegistry;

diff --git a/...nt-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java b/...nt-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java
@@ -32,13 +32,14 @@
 import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment.PodData;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumesStrategy;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.CertificateProvisioner;
-import org.eclipse.che.workspace.infrastructure.kubernetes.provision.GitUserProfileProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.GitConfigProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ImagePullSecretProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.LogsVolumeMachineProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.PodTerminationGracePeriodProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ProxySettingsProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ServiceAccountProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.VcsSshKeysProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.VcsSslCertificateProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.env.EnvVarsConverter;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.limits.ram.RamLimitRequestProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.restartpolicy.RestartPolicyRewriter;
@@ -91,8 +92,9 @@ public RhCheInfraEnvironmentProvisioner(
       ServiceAccountProvisioner serviceAccountProvisioner,
       CertificateProvisioner certificateProvisioner,
       VcsSshKeysProvisioner vcsSshKeysProvisioner,
-      GitUserProfileProvisioner gitUserProfileProvisioner,
+      GitConfigProvisioner gitConfigProvisioner,
       OpenShiftPreviewUrlExposer previewUrlEndpointsProvisioner,
+      VcsSslCertificateProvisioner vcsSslCertificateProvisioner,
       @Named("che.infra.kubernetes.trust_certs") boolean trustCerts,
       @Named("che.fabric8.wsagent_routing_timeout") String wsAgentRoutingTimeout) {
     super(
@@ -111,8 +113,9 @@ public RhCheInfraEnvironmentProvisioner(
         serviceAccountProvisioner,
         certificateProvisioner,
         vcsSshKeysProvisioner,
-        gitUserProfileProvisioner,
-        previewUrlEndpointsProvisioner);
+        gitConfigProvisioner,
+        previewUrlEndpointsProvisioner,
+        vcsSslCertificateProvisioner);
 
     this.openshiftUserTokenProvider = openshiftUserTokenProvider;
     this.tenantDataProvider = tenantDataProvider;

diff --git a/...t-manager/src/test/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactoryTest.java b/...t-manager/src/test/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactoryTest.java
@@ -24,6 +24,7 @@
 import com.redhat.che.multitenant.toggle.CheServiceAccountTokenToggle;
 import io.fabric8.kubernetes.client.Config;
 import java.util.Optional;
+import okhttp3.EventListener;
 import org.eclipse.che.api.core.NotFoundException;
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
 import org.eclipse.che.api.workspace.server.WorkspaceRuntimes;
@@ -56,6 +57,7 @@ public class Fabric8OpenShiftClientFactoryTest {
   @Mock private KubernetesRuntimeStateCache runtimeStateCache;
   @Mock private CheServiceAccountTokenToggle cheServiceAccountTokenToggle;
   @Mock private KubernetesRuntimeState runtimeState;
+  @Mock private EventListener eventListener;
   @Mock private Subject currentSubject;
   @Mock private Subject ownerSubject;
 
@@ -94,7 +96,8 @@ public void setUp() throws Exception {
             1,
             1,
             1,
-            1);
+            1,
+            eventListener);
 
     EnvironmentContext.getCurrent().setSubject(currentSubject);
   }

diff --git a/...anager/src/test/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisionerTest.java b/...anager/src/test/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisionerTest.java
@@ -43,13 +43,14 @@
 import org.eclipse.che.workspace.infrastructure.kubernetes.environment.KubernetesEnvironment.PodData;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumesStrategy;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.CertificateProvisioner;
-import org.eclipse.che.workspace.infrastructure.kubernetes.provision.GitUserProfileProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.GitConfigProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ImagePullSecretProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.LogsVolumeMachineProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.PodTerminationGracePeriodProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ProxySettingsProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.ServiceAccountProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.VcsSshKeysProvisioner;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.VcsSslCertificateProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.env.EnvVarsConverter;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.limits.ram.RamLimitRequestProvisioner;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.restartpolicy.RestartPolicyRewriter;
@@ -86,14 +87,15 @@ public class RhCheInfraEnvironmentProvisionerTest {
   @Mock private ProxySettingsProvisioner proxySettingsProvisioner;
   @Mock private CertificateProvisioner certificateProvisioner;
   @Mock private VcsSshKeysProvisioner vcsSshKeysProvisioner;
-  @Mock private GitUserProfileProvisioner gitUserProfileProvisioner;
+  @Mock private GitConfigProvisioner gitConfigProvisioner;
   @Mock private OpenShiftPreviewUrlExposer openshiftPreviewUrlExposer;
 
   @Mock private OpenshiftUserTokenProvider openshiftUserTokenProvider;
   @Mock private TenantDataProvider tenantDataProvider;
   @Mock private RuntimeIdentity runtimeIdentity;
   @Mock private OpenShiftEnvironment openShiftEnvironment;
   @Mock private ServiceAccountProvisioner serviceAccountProvisioner;
+  @Mock private VcsSslCertificateProvisioner vcsSslCertificateProvisioner;
 
   private List<EnvVar> con1EnvVars;
   private List<EnvVar> con2EnvVars;
@@ -127,8 +129,9 @@ public void setUp() throws Exception {
             serviceAccountProvisioner,
             certificateProvisioner,
             vcsSshKeysProvisioner,
-            gitUserProfileProvisioner,
+            gitConfigProvisioner,
             openshiftPreviewUrlExposer,
+            vcsSslCertificateProvisioner,
             false,
             WSAGENT_ROUTER_TIMEOUT);