-
Notifications
You must be signed in to change notification settings - Fork 995
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- added support for app config files - removed AppPrivateConfig from the OpenMetadata server configuration
- Loading branch information
Showing
5 changed files
with
137 additions
and
25 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
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
74 changes: 74 additions & 0 deletions
74
openmetadata-service/src/main/java/org/openmetadata/service/apps/ConfigurationReader.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,74 @@ | ||
| package org.openmetadata.service.apps; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import joptsimple.internal.Strings; | ||
| import org.apache.commons.text.StringSubstitutor; | ||
| import org.openmetadata.schema.api.configuration.apps.AppPrivateConfig; | ||
| import org.openmetadata.service.util.JsonUtils; | ||
|
|
||
| public class ConfigurationReader { | ||
|
|
||
| private final Map<String, String> envMap; | ||
|
|
||
| public ConfigurationReader(Map<String, String> envMap) { | ||
| this.envMap = envMap; | ||
| } | ||
|
|
||
| public ConfigurationReader() { | ||
| this.envMap = System.getenv(); | ||
| } | ||
|
|
||
| public AppPrivateConfig readConfigFromResource(String appName) throws IOException { | ||
| String configFilePath = "applications/" + appName + "/config.yaml"; | ||
| try (InputStream inputStream = | ||
| ConfigurationReader.class.getClassLoader().getResourceAsStream(configFilePath)) { | ||
| if (inputStream == null) { | ||
| throw new IOException("Configuration file not found: " + configFilePath); | ||
| } | ||
| return JsonUtils.convertValue(readConfigFile(inputStream), AppPrivateConfig.class); | ||
| } | ||
| } | ||
|
|
||
| public Map<String, Object> readConfigFile(InputStream configStream) throws IOException { | ||
| ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); | ||
| Map<String, Object> config = mapper.readValue(configStream, Map.class); | ||
| resolveEnvVariablesInMap(config); | ||
| return mapper.convertValue(config, Map.class); | ||
| } | ||
|
|
||
| private void resolveEnvVariablesInMap(Map<String, Object> map) { | ||
| for (Map.Entry<String, Object> entry : map.entrySet()) { | ||
| if (entry.getValue() instanceof String) { | ||
| map.put(entry.getKey(), resolveEnvVariables((String) entry.getValue(), envMap)); | ||
| } else if (entry.getValue() instanceof Map) { | ||
| resolveEnvVariablesInMap((Map<String, Object>) entry.getValue()); | ||
| } else if (entry.getValue() instanceof List) { | ||
| resolveEnvVariablesInList((List<Object>) entry.getValue()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void resolveEnvVariablesInList(List<Object> list) { | ||
| for (int i = 0; i < list.size(); i++) { | ||
| Object element = list.get(i); | ||
| if (element instanceof String) { | ||
| list.set(i, resolveEnvVariables((String) element, envMap)); | ||
| } else if (element instanceof Map) { | ||
| resolveEnvVariablesInMap((Map<String, Object>) element); | ||
| } else if (element instanceof List) { | ||
| resolveEnvVariablesInList((List<Object>) element); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static String resolveEnvVariables(String value, Map<String, String> envMap) { | ||
| StringSubstitutor substitutor = new StringSubstitutor(envMap); | ||
| String resolved = substitutor.replace(value); | ||
| return resolved.equals("\"\"") ? Strings.EMPTY : resolved; | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
...ervice/src/test/java/org/openmetadata/service/resources/apps/ConfigurationReaderTest.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,39 @@ | ||
| package org.openmetadata.service.resources.apps; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.openmetadata.schema.api.configuration.apps.AppPrivateConfig; | ||
| import org.openmetadata.service.apps.ConfigurationReader; | ||
|
|
||
| public class ConfigurationReaderTest { | ||
|
|
||
| @Test | ||
| public void testReadConfigFile() throws IOException { | ||
| ConfigurationReader reader = | ||
| new ConfigurationReader( | ||
| Map.of( | ||
| "ENV_VAR", | ||
| "resolvedValue", | ||
| "NESTED_ENV_VAR", | ||
| "nestedValue", | ||
| "LIST_ENV_VAR", | ||
| "value1")); | ||
| AppPrivateConfig appConfig = reader.readConfigFromResource("TestApplication"); | ||
| assertNotNull(appConfig); | ||
| assertEquals("value1", appConfig.getParameters().getAdditionalProperties().get("key1")); | ||
| assertEquals("resolvedValue", appConfig.getParameters().getAdditionalProperties().get("key2")); | ||
| assertEquals("", appConfig.getParameters().getAdditionalProperties().get("emptyKey")); | ||
| assertEquals("default", appConfig.getParameters().getAdditionalProperties().get("defaultKey")); | ||
| Map<String, String> nested = | ||
| (Map<String, String>) appConfig.getParameters().getAdditionalProperties().get("nested"); | ||
| assertEquals("nestedValue", nested.get("nestedKey")); | ||
| List<String> list = | ||
| (List<String>) appConfig.getParameters().getAdditionalProperties().get("list"); | ||
| assertEquals("value1", list.get(1)); | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
openmetadata-service/src/test/resources/applications/TestApplication/config.yaml
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,10 @@ | ||
| parameters: | ||
| key1: value1 | ||
| key2: ${ENV_VAR} | ||
| emptyKey: ${UNDEFINED_ENV_VAR:-""} | ||
| defaultKey: ${UNDEFINED_ENV_VAR:-default} | ||
| nested: | ||
| nestedKey: ${NESTED_ENV_VAR} | ||
| list: | ||
| - elem1 | ||
| - ${LIST_ENV_VAR} |