-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cloud Gateway - create additional registrations - Unit tests
Signed-off-by: alexandr cumarav <[email protected]>
- Loading branch information
Showing
5 changed files
with
199 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
...ateway-service/src/main/java/org/zowe/apiml/cloudgatewayservice/config/EurekaFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * This program and the accompanying materials are made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Copyright Contributors to the Zowe Project. | ||
| */ | ||
|
|
||
| package org.zowe.apiml.cloudgatewayservice.config; | ||
|
|
||
| import com.netflix.appinfo.ApplicationInfoManager; | ||
| import com.netflix.appinfo.EurekaInstanceConfig; | ||
| import com.netflix.appinfo.InstanceInfo; | ||
| import org.springframework.cloud.netflix.eureka.CloudEurekaClient; | ||
| import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; | ||
| import org.springframework.cloud.netflix.eureka.InstanceInfoFactory; | ||
| import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs; | ||
| import org.springframework.context.ApplicationContext; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| /** | ||
| * Eureka dependencies injection helper | ||
| */ | ||
| @Component | ||
| public class EurekaFactory { | ||
|
|
||
| /** | ||
| * Create new copy of instance info | ||
| * | ||
| * @param instanceConfig eureka instance config to copy from | ||
| */ | ||
| InstanceInfo createInstanceInfo(EurekaInstanceConfig instanceConfig) { | ||
| return new InstanceInfoFactory().create(instanceConfig); | ||
| } | ||
|
|
||
| public CloudEurekaClient createCloudEurekaClient(EurekaInstanceConfig eurekaInstanceConfig, InstanceInfo newInfo, EurekaClientConfigBean configBean, MutableDiscoveryClientOptionalArgs args, ApplicationContext context) { | ||
| ApplicationInfoManager perClientAppManager = new ApplicationInfoManager(eurekaInstanceConfig, newInfo, null); | ||
| return new CloudEurekaClient(perClientAppManager, configBean, args, context); | ||
| } | ||
| } |
142 changes: 142 additions & 0 deletions
142
...e/src/test/java/org/zowe/apiml/cloudgatewayservice/config/AdditionalRegistrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * This program and the accompanying materials are made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Copyright Contributors to the Zowe Project. | ||
| */ | ||
|
|
||
| package org.zowe.apiml.cloudgatewayservice.config; | ||
|
|
||
| import com.netflix.appinfo.ApplicationInfoManager; | ||
| import com.netflix.appinfo.EurekaInstanceConfig; | ||
| import com.netflix.appinfo.HealthCheckHandler; | ||
| import com.netflix.appinfo.InstanceInfo; | ||
| import com.netflix.discovery.EurekaClientConfig; | ||
| import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClientImpl; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Nested; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.ArgumentCaptor; | ||
| import org.mockito.Captor; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
| import org.springframework.cloud.netflix.eureka.CloudEurekaClient; | ||
| import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; | ||
| import org.springframework.context.ApplicationContext; | ||
| import org.zowe.apiml.config.AdditionalRegistration; | ||
| import org.zowe.apiml.security.HttpsFactory; | ||
|
|
||
| import java.util.AbstractMap; | ||
|
|
||
| import static java.util.Arrays.asList; | ||
| import static java.util.Collections.singletonList; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.lenient; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
| import static org.springframework.cloud.netflix.eureka.EurekaClientConfigBean.DEFAULT_ZONE; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| public class AdditionalRegistrationTest { | ||
|
|
||
| private ConnectionsConfig connectionsConfig; | ||
| @Mock | ||
| private CloudEurekaClient additionalClientOne; | ||
| @Mock | ||
| private CloudEurekaClient additionalClientTwo; | ||
| @Mock | ||
| private EurekaFactory eurekaFactory; | ||
| @Mock | ||
| ApplicationContext context; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| connectionsConfig = new ConnectionsConfig(context); | ||
| } | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| @Nested | ||
| class WhenInitializingAdditionalRegistrations { | ||
| private ConnectionsConfig configSpy; | ||
| @Mock | ||
| private ApplicationInfoManager manager; | ||
| @Mock | ||
| private EurekaClientConfig clientConfig; | ||
| @Mock | ||
| private HealthCheckHandler healthCheckHandler; | ||
| @Mock | ||
| private HttpsFactory httpsFactory; | ||
|
|
||
| @Captor | ||
| private ArgumentCaptor<EurekaClientConfigBean> clientConfigCaptor; | ||
|
|
||
| private final AdditionalRegistration registration = AdditionalRegistration.builder().discoveryServiceUrls("https://another-eureka-1").build(); | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| configSpy = Mockito.spy(connectionsConfig); | ||
| lenient().doReturn(httpsFactory).when(configSpy).factory(); | ||
| lenient().when(httpsFactory.createEurekaJerseyClientBuilder(any(), any())).thenReturn(mock(EurekaJerseyClientImpl.EurekaJerseyClientBuilder.class)); | ||
|
|
||
| lenient().when(eurekaFactory.createCloudEurekaClient(any(), any(), clientConfigCaptor.capture(), any(), any())).thenReturn(additionalClientOne, additionalClientTwo); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldCreateEurekaClientForAdditionalDiscoveryUrl() { | ||
|
|
||
| AdditionalEurekaClientsHolder holder = configSpy.additionalEurekaClientsHolder(manager, clientConfig, singletonList(registration), eurekaFactory, healthCheckHandler); | ||
|
|
||
| assertThat(holder.getDiscoveryClients()).hasSize(1); | ||
| EurekaClientConfigBean eurekaClientConfigBean = clientConfigCaptor.getValue(); | ||
| assertThat(eurekaClientConfigBean.getServiceUrl()).containsOnly(new AbstractMap.SimpleEntry<String, String>(DEFAULT_ZONE, "https://another-eureka-1")); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldCreateTwoAdditionalRegistrations() { | ||
| AdditionalRegistration secondRegistration = AdditionalRegistration.builder().discoveryServiceUrls("https://another-eureka-2").build(); | ||
| AdditionalEurekaClientsHolder holder = configSpy.additionalEurekaClientsHolder(manager, clientConfig, asList(registration, secondRegistration), eurekaFactory, healthCheckHandler); | ||
|
|
||
| assertThat(holder.getDiscoveryClients()).hasSize(2); | ||
| verify(additionalClientOne).registerHealthCheck(healthCheckHandler); | ||
| verify(additionalClientTwo).registerHealthCheck(healthCheckHandler); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldCreateInstanceInfoFromEurekaConfig() { | ||
| EurekaInstanceConfig config = mock(EurekaInstanceConfig.class); | ||
| when(config.getNamespace()).thenReturn(""); | ||
| when(config.getAppname()).thenReturn("CLOUD-GATEWAY"); | ||
|
|
||
| InstanceInfo instanceInfo = new EurekaFactory().createInstanceInfo(config); | ||
|
|
||
| assertThat(instanceInfo.getAppName()).isEqualTo("CLOUD-GATEWAY"); | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| class WhenClientHolderShutDown { | ||
| @Test | ||
| void shouldTriggerShutdownCallToWrappedClients() { | ||
| AdditionalEurekaClientsHolder holder = new AdditionalEurekaClientsHolder(asList(additionalClientOne, additionalClientTwo)); | ||
| holder.shutdown(); | ||
|
|
||
| verify(additionalClientOne).shutdown(); | ||
| verify(additionalClientTwo).shutdown(); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldHandleNullsOnShutdownCall() { | ||
| AdditionalEurekaClientsHolder holder = new AdditionalEurekaClientsHolder(null); | ||
| holder.shutdown(); | ||
|
|
||
| assertThat(holder.getDiscoveryClients()).isNull(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters