From c289334557c2a6efdade4329db093be4b2094fce Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Tue, 3 Dec 2019 14:49:45 -0500 Subject: [PATCH] Adapt classes to upstream changes in 7.5.1 Signed-off-by: Angel Misevski --- .../che/multitenant/Fabric8AuthServiceClient.java | 10 ++++++---- .../multitenant/Fabric8OpenShiftClientFactory.java | 7 +++++-- .../multitenant/RhCheInfraEnvironmentProvisioner.java | 11 +++++++---- .../Fabric8OpenShiftClientFactoryTest.java | 5 ++++- .../RhCheInfraEnvironmentProvisionerTest.java | 9 ++++++--- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8AuthServiceClient.java b/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8AuthServiceClient.java index f31b77abb..abaa728d5 100644 --- a/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8AuthServiceClient.java +++ b/plugins/fabric8-multi-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/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactory.java b/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactory.java index 970f4c0ff..a94c79d36 100644 --- a/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactory.java +++ b/plugins/fabric8-multi-tenant-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,7 +58,8 @@ 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, @@ -65,7 +67,8 @@ public Fabric8OpenShiftClientFactory( maxConcurrentRequests, maxConcurrentRequestsPerHost, maxIdleConnections, - connectionPoolKeepAlive); + connectionPoolKeepAlive, + eventListener); this.envProvider = envProvider; this.workspaceRuntimeProvider = workspaceRuntimeProvider; this.subjectsRegistry = subjectsRegistry; diff --git a/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java b/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java index be4313630..67ed14b28 100644 --- a/plugins/fabric8-multi-tenant-manager/src/main/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisioner.java +++ b/plugins/fabric8-multi-tenant-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/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactoryTest.java b/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactoryTest.java index 1c70745ee..cbc62086e 100644 --- a/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/Fabric8OpenShiftClientFactoryTest.java +++ b/plugins/fabric8-multi-tenant-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/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisionerTest.java b/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisionerTest.java index ccc9d270b..581791e78 100644 --- a/plugins/fabric8-multi-tenant-manager/src/test/java/com/redhat/che/multitenant/RhCheInfraEnvironmentProvisionerTest.java +++ b/plugins/fabric8-multi-tenant-manager/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,7 +87,7 @@ 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; @@ -94,6 +95,7 @@ public class RhCheInfraEnvironmentProvisionerTest { @Mock private RuntimeIdentity runtimeIdentity; @Mock private OpenShiftEnvironment openShiftEnvironment; @Mock private ServiceAccountProvisioner serviceAccountProvisioner; + @Mock private VcsSslCertificateProvisioner vcsSslCertificateProvisioner; private List con1EnvVars; private List con2EnvVars; @@ -127,8 +129,9 @@ public void setUp() throws Exception { serviceAccountProvisioner, certificateProvisioner, vcsSshKeysProvisioner, - gitUserProfileProvisioner, + gitConfigProvisioner, openshiftPreviewUrlExposer, + vcsSslCertificateProvisioner, false, WSAGENT_ROUTER_TIMEOUT);