-
Notifications
You must be signed in to change notification settings - Fork 49
Add initial RunContainer Task support #942
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.
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
Open
treblereel
wants to merge
7
commits into
serverlessworkflow:main
Choose a base branch
from
treblereel:ContainerTask
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,094
−0
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cdc2557
Add initial RunContainer Task support
treblereel a8f5dd5
image pull before run
treblereel 45e6fe2
refactoring + tests
treblereel ec25d5b
Review comments
fjtirado 8bd5bd2
Disable test if docker is not
fjtirado 7933645
Merge pull request #3 from fjtirado/container_review_comments
treblereel 31f820c
Merge branch 'main' into ContainerTask
fjtirado File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>io.serverlessworkflow</groupId> | ||
| <artifactId>serverlessworkflow-impl</artifactId> | ||
| <version>8.0.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>serverlessworkflow-impl-container</artifactId> | ||
| <name>Serverless Workflow :: Impl :: OpenAPI</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.serverlessworkflow</groupId> | ||
| <artifactId>serverlessworkflow-impl-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.serverlessworkflow</groupId> | ||
| <artifactId>serverlessworkflow-types</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.docker-java</groupId> | ||
| <artifactId>docker-java-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.docker-java</groupId> | ||
| <artifactId>docker-java-transport-httpclient5</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> | ||
52 changes: 52 additions & 0 deletions
52
...r/src/main/java/io/serverlessworkflow/impl/container/executors/CommandPropertySetter.java
This file contains hidden or 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,52 @@ | ||
| /* | ||
| * Copyright 2020-Present The Serverless Workflow Specification Authors | ||
| * | ||
| * 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. | ||
| */ | ||
| 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 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 { | ||
|
|
||
| private Optional<WorkflowValueResolver<String>> command; | ||
|
|
||
| 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( | ||
| CreateContainerCmd containerCmd, | ||
| WorkflowContext workflowContext, | ||
| TaskContext taskContext, | ||
| WorkflowModel model) { | ||
| command | ||
| .map(c -> c.apply(workflowContext, taskContext, model)) | ||
| .ifPresent(c -> containerCmd.withCmd("sh", "-c", c)); | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
...va/io/serverlessworkflow/impl/container/executors/ContainerEnvironmentPropertySetter.java
This file contains hidden or 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,59 @@ | ||
| /* | ||
| * Copyright 2020-Present The Serverless Workflow Specification Authors | ||
| * | ||
| * 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. | ||
| */ | ||
| package io.serverlessworkflow.impl.container.executors; | ||
|
|
||
| import com.github.dockerjava.api.command.CreateContainerCmd; | ||
| import io.serverlessworkflow.api.types.Container; | ||
| 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.Optional; | ||
|
|
||
| class ContainerEnvironmentPropertySetter implements ContainerPropertySetter { | ||
|
|
||
| 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( | ||
| 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())); | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
...src/main/java/io/serverlessworkflow/impl/container/executors/ContainerPropertySetter.java
This file contains hidden or 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,29 @@ | ||
| /* | ||
| * Copyright 2020-Present The Serverless Workflow Specification Authors | ||
| * | ||
| * 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. | ||
| */ | ||
| package io.serverlessworkflow.impl.container.executors; | ||
|
|
||
| import com.github.dockerjava.api.command.CreateContainerCmd; | ||
| import io.serverlessworkflow.impl.TaskContext; | ||
| import io.serverlessworkflow.impl.WorkflowContext; | ||
| import io.serverlessworkflow.impl.WorkflowModel; | ||
|
|
||
| interface ContainerPropertySetter { | ||
| abstract void accept( | ||
| CreateContainerCmd command, | ||
| WorkflowContext workflowContext, | ||
| TaskContext taskContext, | ||
| WorkflowModel model); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.