jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(script): injectDefault need the runContext

Browse Source 
Otherwise you cannot render dynamic properties inside it
This commit is contained in:
Loïc Mathieu
2025-01-29 10:20:05 +01:00
parent afabdf883e
commit c5e7b42819
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
script/src/main/java/io/kestra/plugin/scripts/exec/AbstractExecScript.java
View File

@@ -121,6 +121,14 @@ public abstract class AbstractExecScript extends Task implements RunnableTask<Sc
)
public abstract Property<String> getContainerImage();
/**
* @deprecated use {@link #injectDefaults(RunContext, DockerOptions)}
*/
@Deprecated(forRemoval = true, since = "0.21")
protected DockerOptions injectDefaults(@NotNull DockerOptions original) {
return original;
}
/**
* Allow setting Docker options defaults values.
* To make it work, it is advised to set the 'docker' field like:
@@ -135,8 +143,9 @@ public abstract class AbstractExecScript extends Task implements RunnableTask<Sc
* protected DockerOptions docker = DockerOptions.builder().build();
* }</pre>
*/
protected DockerOptions injectDefaults(@NotNull DockerOptions original) {
return original;
protected DockerOptions injectDefaults(RunContext runContext, @NotNull DockerOptions original) {
// FIXME to keep backward compatibility, we call the old method from the new one by default
return injectDefaults(original);
}
protected CommandsWrapper commands(RunContext runContext) throws IllegalVariableEvaluationException {
@@ -151,7 +160,7 @@ public abstract class AbstractExecScript extends Task implements RunnableTask<Sc
.withRunnerType(this.getRunner())
.withContainerImage(runContext.render(this.getContainerImage()).as(String.class).orElse(null))
.withTaskRunner(this.getTaskRunner())
.withDockerOptions(this.getDocker() != null ? this.injectDefaults(this.getDocker()) : null)
.withDockerOptions(this.getDocker() != null ? this.injectDefaults(runContext, this.getDocker()) : null)
.withNamespaceFiles(this.getNamespaceFiles())
.withInputFiles(this.getInputFiles())
.withOutputFiles(runContext.render(this.getOutputFiles()).asList(String.class))