Review comments

Signed-off-by: fjtirado <ftirados@redhat.com>

Author: fjtirado

impl/container/src/main/java/io/serverlessworkflow/impl/container/executors/CommandPropertySetter.java

@@ -15,20 +15,38 @@
  */
 package io.serverlessworkflow.impl.container.executors;
 
+import static io.serverlessworkflow.impl.WorkflowUtils.isValid;
+
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import io.serverlessworkflow.api.types.Container;
-import java.util.function.Function;
+import io.serverlessworkflow.impl.TaskContext;
+import io.serverlessworkflow.impl.WorkflowContext;
+import io.serverlessworkflow.impl.WorkflowDefinition;
+import io.serverlessworkflow.impl.WorkflowModel;
+import io.serverlessworkflow.impl.WorkflowUtils;
+import io.serverlessworkflow.impl.WorkflowValueResolver;
+import java.util.Optional;
+
+class CommandPropertySetter implements ContainerPropertySetter {
 
-class CommandPropertySetter extends ContainerPropertySetter {
+  private Optional<WorkflowValueResolver<String>> command;
 
-  CommandPropertySetter(CreateContainerCmd createContainerCmd, Container configuration) {
-    super(createContainerCmd, configuration);
+  CommandPropertySetter(WorkflowDefinition definition, Container configuration) {
+    String commandName = configuration.getCommand();
+    command =
+        isValid(commandName)
+            ? Optional.of(WorkflowUtils.buildStringFilter(definition.application(), commandName))
+            : Optional.empty();
   }
 
   @Override
-  public void accept(Function<String, String> resolver) {
-    if (configuration.getCommand() != null && !configuration.getCommand().isEmpty()) {
-      createContainerCmd.withCmd("sh", "-c", configuration.getCommand());
-    }
+  public void accept(
+      CreateContainerCmd containerCmd,
+      WorkflowContext workflowContext,
+      TaskContext taskContext,
+      WorkflowModel model) {
+    command
+        .map(c -> c.apply(workflowContext, taskContext, model))
+        .ifPresent(c -> containerCmd.withCmd("sh", "-c", c));
   }
 }

impl/container/src/main/java/io/serverlessworkflow/impl/container/executors/ContainerEnvironmentPropertySetter.java

@@ -17,34 +17,43 @@
 
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import io.serverlessworkflow.api.types.Container;
-import java.util.ArrayList;
-import java.util.List;
+import io.serverlessworkflow.impl.TaskContext;
+import io.serverlessworkflow.impl.WorkflowContext;
+import io.serverlessworkflow.impl.WorkflowDefinition;
+import io.serverlessworkflow.impl.WorkflowModel;
+import io.serverlessworkflow.impl.WorkflowUtils;
+import io.serverlessworkflow.impl.WorkflowValueResolver;
 import java.util.Map;
-import java.util.function.Function;
+import java.util.Optional;
 
-class ContainerEnvironmentPropertySetter extends ContainerPropertySetter {
+class ContainerEnvironmentPropertySetter implements ContainerPropertySetter {
 
-  ContainerEnvironmentPropertySetter(
-      CreateContainerCmd createContainerCmd, Container configuration) {
-    super(createContainerCmd, configuration);
+  private final Optional<WorkflowValueResolver<Map<String, Object>>> envResolver;
+
+  ContainerEnvironmentPropertySetter(WorkflowDefinition definition, Container configuration) {
+
+    this.envResolver =
+        configuration.getEnvironment() != null
+                && configuration.getEnvironment().getAdditionalProperties() != null
+            ? Optional.of(
+                WorkflowUtils.buildMapResolver(
+                    definition.application(),
+                    null,
+                    configuration.getEnvironment().getAdditionalProperties()))
+            : Optional.empty();
   }
 
   @Override
-  public void accept(Function<String, String> resolver) {
-    if (!(configuration.getEnvironment() == null
-        || configuration.getEnvironment().getAdditionalProperties() == null)) {
-      List<String> envs = new ArrayList<>();
-      for (Map.Entry<String, Object> entry :
-          configuration.getEnvironment().getAdditionalProperties().entrySet()) {
-        String key = entry.getKey();
-        if (entry.getValue() instanceof String value) {
-          String resolvedValue = resolver.apply(value);
-          envs.add(key + "=" + resolvedValue);
-        } else {
-          throw new IllegalArgumentException("Environment variable values must be strings");
-        }
-      }
-      createContainerCmd.withEnv(envs.toArray(new String[0]));
-    }
+  public void accept(
+      CreateContainerCmd command,
+      WorkflowContext workflowContext,
+      TaskContext taskContext,
+      WorkflowModel model) {
+    envResolver
+        .map(env -> env.apply(workflowContext, taskContext, model))
+        .ifPresent(
+            envs ->
+                command.withEnv(
+                    envs.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).toList()));
   }
 }

impl/container/src/main/java/io/serverlessworkflow/impl/container/executors/ContainerPropertySetter.java

@@ -16,17 +16,14 @@
 package io.serverlessworkflow.impl.container.executors;
 
 import com.github.dockerjava.api.command.CreateContainerCmd;
-import io.serverlessworkflow.api.types.Container;
-import java.util.function.Consumer;
-import java.util.function.Function;
+import io.serverlessworkflow.impl.TaskContext;
+import io.serverlessworkflow.impl.WorkflowContext;
+import io.serverlessworkflow.impl.WorkflowModel;
 
-abstract class ContainerPropertySetter implements Consumer<Function<String, String>> {
-
-  protected final CreateContainerCmd createContainerCmd;
-  protected final Container configuration;
-
-  ContainerPropertySetter(CreateContainerCmd createContainerCmd, Container configuration) {
-    this.createContainerCmd = createContainerCmd;
-    this.configuration = configuration;
-  }
+interface ContainerPropertySetter {
+  abstract void accept(
+      CreateContainerCmd command,
+      WorkflowContext workflowContext,
+      TaskContext taskContext,
+      WorkflowModel model);
 }