Skip to content
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

Jump to bottom

fix: remove duplicated logic for container executor #5133

Merged
merged 2 commits into from
Mar 11, 2024
Merged

fix: remove duplicated logic for container executor #5133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10eee2c
fix: remove duplicated logic for container executor
vsukhin Mar 11, 2024
5fb770e
Merge branch 'develop' into vsukhin/fix/remove-duplicated-container-e…
vsukhin Mar 11, 2024
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
42 changes: 3 additions & 39 deletions pkg/executor/containerexecutor/containerexecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,43 +588,7 @@ func (c *ContainerExecutor) stopExecution(ctx context.Context, execution *testku

// NewJobOptionsFromExecutionOptions compose JobOptions based on ExecuteOptions
func NewJobOptionsFromExecutionOptions(options client.ExecuteOptions) *JobOptions {
// for args, command and image, HTTP request takes priority, then test spec, then executor
var args []string
argsMode := options.Request.ArgsMode
if options.TestSpec.ExecutionRequest != nil && argsMode == "" {
argsMode = string(options.TestSpec.ExecutionRequest.ArgsMode)
}

if argsMode == string(testkube.ArgsModeTypeAppend) || argsMode == "" {
args = options.Request.Args
if options.TestSpec.ExecutionRequest != nil && len(args) == 0 {
args = options.TestSpec.ExecutionRequest.Args
}

args = append(options.ExecutorSpec.Args, args...)
}

if argsMode == string(testkube.ArgsModeTypeOverride) || argsMode == string(testkube.ArgsModeTypeReplace) {
args = options.Request.Args
if options.TestSpec.ExecutionRequest != nil && len(args) == 0 {
args = options.TestSpec.ExecutionRequest.Args
}
}

var command []string
if len(options.ExecutorSpec.Command) != 0 {
command = options.ExecutorSpec.Command
}

if options.TestSpec.ExecutionRequest != nil &&
len(options.TestSpec.ExecutionRequest.Command) != 0 {
command = options.TestSpec.ExecutionRequest.Command
}

if len(options.Request.Command) != 0 {
command = options.Request.Command
}

// for image, HTTP request takes priority, then test spec, then executor
var image string
if options.ExecutorSpec.Image != "" {
image = options.ExecutorSpec.Image
Expand Down Expand Up @@ -683,8 +647,8 @@ func NewJobOptionsFromExecutionOptions(options client.ExecuteOptions) *JobOption
return &JobOptions{
Image: image,
ImagePullSecrets: options.ImagePullSecretNames,
Args: args,
Command: command,
Args: options.Request.Args,
Command: options.Request.Command,
WorkingDir: workingDir,
TestName: options.TestName,
Namespace: options.Namespace,
Expand Down
Loading