Skip to content

Commit

Permalink
feat: Central Apiml Registry (#3051)
Browse files Browse the repository at this point in the history
Signed-off-by: at670475 <andrea.tabone@broadcom.com>
Signed-off-by: alexandr cumarav <alexandr.cumarav@broadcom.com>
Signed-off-by: Pavel Jareš <pavel.jares@broadcom.com>

Co-authored-by: Andrea Tabone <andrea.tabone@broadcom.com>
Co-authored-by: Jiri Aichler <jiri.aichler@broadcom.com>
Co-authored-by: Pavel Jareš <pavel.jares@broadcom.com>
  • Loading branch information
4 people authored Sep 8, 2023
1 parent 142716b commit 5d854c4
Show file tree
Hide file tree
Showing 26 changed files with 1,271 additions and 100 deletions.
6 changes: 5 additions & 1 deletion cloud-gateway-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ configurations.all {

dependencies {
api project(':common-service-core')
api project(':apiml-utility')

implementation libs.eh.cache
implementation libs.spring.cloud.starter.gateway

Expand All @@ -80,6 +82,7 @@ dependencies {
implementation libs.spring.expression
implementation libs.bcpkix
implementation libs.nimbusJoseJwt
implementation libs.janino

compileOnly libs.lombok
annotationProcessor libs.lombok
Expand All @@ -89,8 +92,9 @@ dependencies {
testAnnotationProcessor libs.lombok
testImplementation libs.spring.boot.starter.test
testImplementation libs.rest.assured

testImplementation libs.reactorTest
testImplementation libs.mockito.inline

}

bootJar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.util.pattern.PathPatternParser;
import org.zowe.apiml.message.core.MessageService;
import org.zowe.apiml.message.log.ApimlLogger;
import org.zowe.apiml.message.yaml.YamlMessageServiceInstance;
import org.zowe.apiml.security.HttpsConfig;
import org.zowe.apiml.security.HttpsConfigError;
import org.zowe.apiml.security.HttpsFactory;
import org.zowe.apiml.security.SecurityUtils;
import org.zowe.apiml.util.CorsUtils;
Expand Down Expand Up @@ -112,6 +114,7 @@ public class ConnectionsConfig {
@Value("${apiml.service.corsEnabled:false}")
private boolean corsEnabled;
private final ApplicationContext context;
private static final ApimlLogger apimlLog = ApimlLogger.of(ConnectionsConfig.class, YamlMessageServiceInstance.getInstance());

public ConnectionsConfig(ApplicationContext context) {
this.context = context;
Expand Down Expand Up @@ -171,9 +174,9 @@ SslContext sslContext() {
trustManagerFactory.init(trustStore);
return SslContextBuilder.forClient().keyManager(keyManagerFactory).trustManager(trustManagerFactory).build();
} catch (Exception e) {
log.error("Exception while creating SSL context", e);
System.exit(1);
return null;
apimlLog.log("org.zowe.apiml.common.sslContextInitializationError", e.getMessage());
throw new HttpsConfigError("Error initializing SSL Context: " + e.getMessage(), e,
HttpsConfigError.ErrorCode.HTTP_CLIENT_INITIALIZATION_FAILED, factory().getConfig());
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* 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.discovery.EurekaClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.zowe.apiml.services.BasicInfoService;
import org.zowe.apiml.eurekaservice.client.util.EurekaMetadataParser;

@Configuration
public class RegistryConfig {

@Bean
public EurekaMetadataParser eurekaMetadataParser() {
return new EurekaMetadataParser();
}

@Bean
public BasicInfoService basicInfoService(EurekaClient eurekaClient, EurekaMetadataParser eurekaMetadataParser) {
return new BasicInfoService(eurekaClient, eurekaMetadataParser);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
* 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.scheduled;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.zowe.apiml.cloudgatewayservice.service.GatewayIndexService;
import org.zowe.apiml.cloudgatewayservice.service.InstanceInfoService;
import org.zowe.apiml.product.constants.CoreService;
import org.zowe.apiml.services.BasicInfoService;
import org.zowe.apiml.services.ServiceInfo;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

import static org.zowe.apiml.constants.EurekaMetadataDefinition.APIML_ID;

/**
* Scheduled job to refresh registry of all registered gateways services.
* Behaviour of the job can be configured by the following settings:
* <pre>
* apiml:
* cloudGateway:
* cachePeriodSec: - default value 120 seconds
* maxSimultaneousRequests: - default value 20
* clientKeystore: - default value null
* clientKeystorePassword: - default value null
* clientKeystoreType: - default PKCS12
* serviceRegistryEnabled: - default value false
* </pre>
*/
@EnableScheduling
@Slf4j
@Component
@ConditionalOnExpression("${apiml.cloudGateway.serviceRegistryEnabled:false}")
@RequiredArgsConstructor
public class GatewayScanJob {

private final BasicInfoService basicInfoService;
private final EurekaRegistration serviceRegistration;
private final GatewayIndexService gatewayIndexerService;
private final InstanceInfoService instanceInfoService;
@Value("${apiml.service.apimlId:#{null}}")
private String currentApimlId;
@Value("${apiml.cloudGateway.maxSimultaneousRequests:20}")
private int maxSimultaneousRequests;

@Scheduled(initialDelay = 5000, fixedDelayString = "${apiml.cloudGateway.refresh-interval-ms:30000}")
public void startScanExternalGatewayJob() {

log.debug("Scan gateways job start");
doScanExternalGateway()
.subscribe();
addLocalServices();
}

private void addLocalServices() {
String apimlIdKey = Optional.ofNullable(currentApimlId).orElse(serviceRegistration.getInstanceId());
List<ServiceInfo> localServices = basicInfoService.getServicesInfo();
gatewayIndexerService.putApimlServices(apimlIdKey, localServices);
}

/**
* reactive entry point for the external gateways index refresh
*/
protected Flux<List<ServiceInfo>> doScanExternalGateway() {

Mono<List<ServiceInstance>> registeredGateways = instanceInfoService.getServiceInstance(CoreService.GATEWAY.getServiceId())
.map(gateways -> gateways.stream().filter(info -> !StringUtils.equals(info.getMetadata().getOrDefault(APIML_ID, "N/A"), currentApimlId)).collect(Collectors.toList()));

Flux<ServiceInstance> serviceInstanceFlux = registeredGateways.flatMapMany(Flux::fromIterable);

return serviceInstanceFlux
.flatMap(gatewayIndexerService::indexGatewayServices, maxSimultaneousRequests);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
/*
* 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.service;

import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableMap;
import io.netty.handler.ssl.SslContext;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.MediaType;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.reactive.function.client.WebClient;
import org.zowe.apiml.message.log.ApimlLogger;
import org.zowe.apiml.message.yaml.YamlMessageServiceInstance;
import org.zowe.apiml.services.ServiceInfo;
import reactor.core.publisher.Mono;
import reactor.netty.http.client.HttpClient;
import reactor.netty.tcp.SslProvider;

import javax.validation.constraints.NotNull;
import java.util.AbstractMap;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

import static java.util.Objects.nonNull;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.springframework.util.CollectionUtils.isEmpty;
import static org.zowe.apiml.cloudgatewayservice.service.WebClientHelper.load;
import static org.zowe.apiml.constants.EurekaMetadataDefinition.APIML_ID;

/**
* Maintain all registered gateways lookup data. Internal caches uses apimlId is a key.
* if apimlId key is not available then synthetic key is generated containing <code>SUBSTITUTE_</code> prefix and <code>instanceId</code>
*/
@Slf4j
@Service
public class GatewayIndexService {
private final ApimlLogger apimlLog = ApimlLogger.of(GatewayIndexService.class, YamlMessageServiceInstance.getInstance());
private final Cache<String, ServiceInstance> apimlGatewayLookup;
private final Cache<String, List<ServiceInfo>> apimlServicesCache;
private final WebClient defaultWebClient;
private SslContext customClientSslContext = null;

public GatewayIndexService(WebClient defaultWebClient,
@Value("${apiml.cloudGateway.cachePeriodSec:120}") int cachePeriodSec,
@Value("${apiml.cloudGateway.clientKeystore:#{null}}") String clientKeystorePath,
@Value("${apiml.cloudGateway.clientKeystorePassword:#{null}}") char[] clientKeystorePassword,
@Value("${apiml.cloudGateway.clientKeystoreType:PKCS12}") String keystoreType
) {
this.defaultWebClient = defaultWebClient;

apimlGatewayLookup = CacheBuilder.newBuilder().expireAfterWrite(cachePeriodSec, SECONDS).build();
apimlServicesCache = CacheBuilder.newBuilder().expireAfterWrite(cachePeriodSec, SECONDS).build();

if (isNotBlank(clientKeystorePath) && nonNull(clientKeystorePassword)) {
customClientSslContext = load(clientKeystorePath, clientKeystorePassword, keystoreType);
}
}

private WebClient buildWebClient(ServiceInstance registration) {
final String baseUrl = String.format("%s://%s:%d", registration.getScheme(), registration.getHost(), registration.getPort());
if (this.customClientSslContext != null) {
SslProvider sslProvider = SslProvider.builder().sslContext(customClientSslContext).build();
HttpClient httpClient = HttpClient.create()
.secure(sslProvider);

return WebClient.builder()
.baseUrl(baseUrl)
.clientConnector(new ReactorClientHttpConnector(httpClient))
.defaultHeader("Accept", MediaType.APPLICATION_JSON_VALUE)
.build();
}

return defaultWebClient.mutate()
.baseUrl(baseUrl)
.build();
}

public Mono<List<ServiceInfo>> indexGatewayServices(ServiceInstance registration) {
String apimlIdKey = extractApimlId(registration).orElse(buildAlternativeApimlIdKey(registration));
log.debug("Fetching registered gateway instance services: {}", apimlIdKey);
apimlGatewayLookup.put(apimlIdKey, registration);
return fetchServices(apimlIdKey, registration)
.doOnError(ex -> apimlLog.log("org.zowe.apiml.gateway.servicesRequestFailed", apimlIdKey, ex.getMessage()))
.onErrorComplete()
.doFinally(signal -> log.debug("\t {} completed with {}", apimlIdKey, signal));
}

/**
* Store entry in the Services Registry. Should be used to store services info from the current apiml instance
*
* @param apimlId unique apimlId
* @param services List of the services
*/
public void putApimlServices(@NotNull String apimlId, List<ServiceInfo> services) {
apimlServicesCache.put(apimlId, services);
}

private Mono<List<ServiceInfo>> fetchServices(String apimlId, ServiceInstance registration) {
WebClient webClient = buildWebClient(registration);
final ParameterizedTypeReference<List<ServiceInfo>> serviceInfoType = new ParameterizedTypeReference<List<ServiceInfo>>() {
};

return webClient.get().uri("/gateway/services")
.retrieve()
.bodyToMono(serviceInfoType)
.doOnNext(foreignServices -> apimlServicesCache.put(apimlId, foreignServices));
}

private String buildAlternativeApimlIdKey(ServiceInstance registration) {
return "SUBSTITUTE" + "_" + registration.getInstanceId();
}

private Optional<String> extractApimlId(ServiceInstance registration) {
return Optional.ofNullable(registration.getMetadata()).map(m -> m.get(APIML_ID));
}

/**
* list currently cached apiml registry with option to filter by the <code>apimlId</code> and <code>apiId</code>
*
* @param apimlId - filter for only services from the particular apiml instance, NULL - filter not applied
* @param apiId - filter for only services of particular type e.g. <code>zowe.apiml.apicatalog</code>
* @return full of filter immutable map of the registry
*/
public Map<String, List<ServiceInfo>> listRegistry(String apimlId, String apiId) {

Map<String, List<ServiceInfo>> allServices = ImmutableMap.<String, List<ServiceInfo>>builder()
.putAll(apimlServicesCache.asMap()).build();
return allServices.entrySet().stream()
.filter(entry -> apimlId == null || StringUtils.equals(apimlId, entry.getKey()))
.map(entry -> new AbstractMap.SimpleEntry<>(entry.getKey(), filterServicesByApiId(entry.getValue(), apiId)))
.collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue));
}

List<ServiceInfo> filterServicesByApiId(List<ServiceInfo> apimlIdServices, String apiId) {
if (!CollectionUtils.isEmpty(apimlIdServices)) {
return apimlIdServices.stream()
.filter(Objects::nonNull)
.filter(serviceInfo -> apiId == null || hasSameApiId(serviceInfo, apiId))
.collect(Collectors.toList());
}
return Collections.emptyList();
}

private boolean hasSameApiId(ServiceInfo serviceInfo, String apiId) {
if (serviceInfo.getApiml() != null && !isEmpty(serviceInfo.getApiml().getApiInfo())) {
return StringUtils.equals(apiId, serviceInfo.getApiml().getApiInfo().get(0).getApiId());
}
return false;
}
}
Loading

0 comments on commit 5d854c4

Please sign in to comment.