Skip to content

Resolve env-var placeholders in Flink config.yaml #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ferenc-csaky merged 2 commits into from
Jul 22, 2026
+39 −1
Merged

Resolve env-var placeholders in Flink config.yaml #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cbe474
Resolve env-var placeholders in Flink config.yaml
velo Jul 21, 2026
54a8bea
Return new Configuration and drop noise in resolveEnvVars
velo Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion flink-sql-runner/src/main/java/com/datasqrl/flinkrunner/BaseRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Configuration initConfiguration() {
var conf = new Configuration();
if (StringUtils.isNotBlank(configDir)) {
log.info("Loading Flink configuration from '{}'", configDir);
conf = GlobalConfiguration.loadConfiguration(configDir);
conf = resolveEnvVars(GlobalConfiguration.loadConfiguration(configDir));
}

// Do not overwrite runtime given in YAML
Expand All @@ -102,6 +102,20 @@ Configuration initConfiguration() {
return conf;
}

private Configuration resolveEnvVars(Configuration source) {
var conf = new Configuration(source);
source
.toMap()
.forEach(
(key, value) -> {
var resolved = resolver.resolve(value);
if (!resolved.equals(value)) {
conf.setString(key, resolved);
}
});
return conf;
}

static String readTextFile(String path) throws IOException {
var f = new File(path);
if (!f.exists()) {
Expand Down
24 changes: 24 additions & 0 deletions flink-sql-runner/src/test/java/com/datasqrl/flinkrunner/CliRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.flink.api.common.RuntimeExecutionMode;
import org.apache.flink.configuration.ExecutionOptions;
Expand Down Expand Up @@ -171,4 +172,27 @@ void initConfiguration_shouldCreateNewConfigIfNoPathGiven(RuntimeExecutionMode m
assertThat(finalConf.keySet()).hasSize(1);
assertThat(finalConf.get(ExecutionOptions.RUNTIME_MODE)).isEqualTo(mode);
}

@Test
void initConfiguration_shouldResolveEnvVarPlaceholdersInConfig() throws IOException {
// Arrange — a secret injected via env var, e.g. the Iceberg maintenance lock password
Path configFile = tempDir.resolve("config.yaml");
Files.writeString(
configFile,
"flink-maintenance.lock.jdbc.password: ${ICEBERG_LOCK_PASSWORD}\ndummy.key: literal");

var resolver =
EnvVarResolver.builder().envVars(Map.of("ICEBERG_LOCK_PASSWORD", "s3cr3t")).build();
var cliRunner =
new CliRunner(
RuntimeExecutionMode.STREAMING, resolver, null, null, tempDir.toString(), null);

// Act
var finalConf = cliRunner.initConfiguration();

// Assert
assertThat(finalConf.toMap())
.containsEntry("flink-maintenance.lock.jdbc.password", "s3cr3t")
.containsEntry("dummy.key", "literal");
}
}
Loading