diff options
author | 2021-05-06 10:27:19 +0200 | |
---|---|---|
committer | 2021-05-18 09:23:13 +0200 | |
commit | 9779ca13ed180fc69cdad5336b30a26edfd7d0fa (patch) | |
tree | 76bde46fd31315a1728d91670743552d3121e332 /rest-services/cbs-client/src/main/java | |
parent | 100e06241c0bce987b53ebe03b103eb19d282a81 (diff) |
Add to Java CBS-Client ability to resolve evns in app-config.yaml loaded from ConfigMap
Change-Id: Ic85c1511133594500bdf31b9d491cc70d34ff5d5
Issue-ID: DCAEGEN2-2716
Signed-off-by: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>
Diffstat (limited to 'rest-services/cbs-client/src/main/java')
4 files changed, 136 insertions, 0 deletions
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/exceptions/EnvironmentParsingException.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/exceptions/EnvironmentParsingException.java new file mode 100644 index 00000000..0113000d --- /dev/null +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/exceptions/EnvironmentParsingException.java @@ -0,0 +1,28 @@ +/* + * ============LICENSE_START==================================== + * DCAEGEN2-SERVICES-SDK + * ========================================================= + * Copyright (C) 2021 Nokia. All rights reserved. + * ========================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END===================================== + */ +package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.exceptions; + +import org.jetbrains.annotations.NotNull; + +public class EnvironmentParsingException extends RuntimeException { + public EnvironmentParsingException(final @NotNull String message) { + super(message); + } +} diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java index 875e20ed..42f53616 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java @@ -37,6 +37,7 @@ public class CbsClientConfigMap implements CbsClient { private static final Logger LOGGER = LoggerFactory.getLogger(CbsClientConfigMap.class); private final String configMapFilePath; + public CbsClientConfigMap (String configMapFilePath) { this.configMapFilePath = configMapFilePath; } @@ -44,6 +45,7 @@ public class CbsClientConfigMap implements CbsClient { @Override public @NotNull Mono<JsonObject> get(CbsRequest request) { return Mono.just(this.loadConfigMapFile()) + .map(CbsClientEnvironmentParsing::processEnvironmentVariables) .doOnNext(this::logConfigMapOutput); } @@ -67,6 +69,8 @@ public class CbsClientConfigMap implements CbsClient { return new Yaml().load(new FileReader(configMapFilePath).getContent()); } + + private void logConfigMapOutput(JsonObject jsonObject) { LOGGER.info("Got successful output from ConfigMap file"); LOGGER.debug("ConfigMap output: {}", jsonObject); diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientEnvironmentParsing.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientEnvironmentParsing.java new file mode 100644 index 00000000..17144f1a --- /dev/null +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientEnvironmentParsing.java @@ -0,0 +1,103 @@ +/* + * ============LICENSE_START======================================================= + * DCAEGEN2-SERVICES-SDK + * ================================================================================ + * Copyright (C) 2021 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.exceptions.EnvironmentParsingException; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * <p>Config Binding Service client environment variables parsing.</p> + * + * @since 1.8.4 + */ +public class CbsClientEnvironmentParsing { + + private static final Pattern shellEnvPattern = Pattern.compile("\\$\\{(.+?)}"); + + private CbsClientEnvironmentParsing() {} + + /** + * <p> + * This method will do a lookup of shell variables in provided jsonObject and replace it with found environment variables. + * </p> + * <p> + * In case of failure during resolving environment variables, EnvironmentParsingException is thrown. + * </p> + * + * @param jsonObject + * @return JsonObject + * @since 1.8.4 + */ + public static JsonObject processEnvironmentVariables(JsonObject jsonObject) { + JsonObject jsonObjectCopy = jsonObject.deepCopy(); + processJsonObject(jsonObjectCopy); + return jsonObjectCopy; + } + private static void processJsonObject(JsonObject jsonObject) { + for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) { + processJsonObjectEntry(jsonObject, entry); + } + } + private static void processJsonObjectEntry(JsonObject jsonObject, Map.Entry<String, JsonElement> entry) { + if (entry.getValue().isJsonArray()) { + processJsonArray(entry.getValue().getAsJsonArray()); + } else if (entry.getValue().isJsonObject()) { + processJsonObject(entry.getValue().getAsJsonObject()); + } else { + Matcher matcher = getMatcher(entry.getValue().getAsString()); + if (matcher.find()) { + jsonObject.addProperty(entry.getKey(), getValueFromSystemEnv(matcher.group(1))); + } + } + } + + private static void processJsonArray(JsonArray jsonArray) { + for (int i = 0; i < jsonArray.size(); i++) { + if (jsonArray.get(i).isJsonObject()) { + processJsonObject(jsonArray.get(i).getAsJsonObject()); + } else if (jsonArray.get(i).isJsonArray()) { + processJsonArray(jsonArray.get(i).getAsJsonArray()); + } else { + Matcher matcher = getMatcher(jsonArray.get(i).getAsString()); + if (matcher.find()) { + jsonArray.set(i, new JsonPrimitive(getValueFromSystemEnv(matcher.group(1)))); + } + } + } + } + + private static Matcher getMatcher(String value) { + return shellEnvPattern.matcher(value); + } + + private static String getValueFromSystemEnv( String envName) { + String envValue = System.getenv(envName); + if (envValue == null || "".equals(envValue)) { + throw new EnvironmentParsingException("Cannot read " + envName + " from environment."); + } + return envValue; + } +} diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java index 4559a902..3eda6d8a 100644 --- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java +++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java @@ -61,6 +61,7 @@ public class CbsClientRest implements CbsClient { .flatMap(httpClient::call) .doOnNext(HttpResponse::throwIfUnsuccessful) .map(resp -> resp.bodyAsJson(JsonObject.class)) + .map(CbsClientEnvironmentParsing::processEnvironmentVariables) .doOnNext(this::logCbsResponse); } |