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

feat: add optional names to tasks #2477

Merged
merged 4 commits into from
Jun 7, 2024
Merged

feat: add optional names to tasks #2477

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93028a5
add optional names to tasks
tedim52 Jun 6, 2024
3fe8dc3
fix else stmt
tedim52 Jun 6, 2024
815129e
create shared get task name func
tedim52 Jun 7, 2024
3800469
remove old task name code
tedim52 Jun 7, 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
17 changes: 15 additions & 2 deletions core/server/api_container/server/startosis_engine/kurtosis_instruction/tasks/run_python.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ func NewRunPythonService(
Name: RunPythonBuiltinName,

Arguments: []*builtin_argument.BuiltinArgument{
{
Name: TaskNameArgName,
IsOptional: true,
ZeroValueProvider: builtin_argument.ZeroValueProvider[starlark.String],
},
{
Name: RunArgName,
IsOptional: false,
Expand Down Expand Up @@ -163,8 +168,16 @@ type RunPythonCapabilities struct {
}

func (builtin *RunPythonCapabilities) Interpret(locatorOfModuleInWhichThisBuiltinIsBeingCalled string, arguments *builtin_argument.ArgumentValuesSet) (starlark.Value, *startosis_errors.InterpretationError) {
randomUuid := uuid.NewRandom()
builtin.name = fmt.Sprintf("task-%v", randomUuid.String())
if arguments.IsSet(TaskNameArgName) {
taskName, err := builtin_argument.ExtractArgumentValue[starlark.String](arguments, TaskNameArgName)
if err != nil {
return nil, startosis_errors.WrapWithInterpretationError(err, "Unable to extract value for '%s' argument", TaskNameArgName)
}
builtin.name = taskName.GoString()
} else {
randomUuid := uuid.NewRandom()
builtin.name = fmt.Sprintf("task-%v", randomUuid.String())
}

pythonScript, err := builtin_argument.ExtractArgumentValue[starlark.String](arguments, RunArgName)
if err != nil {
Expand Down
22 changes: 18 additions & 4 deletions core/server/api_container/server/startosis_engine/kurtosis_instruction/tasks/run_sh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ func NewRunShService(
Name: RunShBuiltinName,

Arguments: []*builtin_argument.BuiltinArgument{
{
Name: TaskNameArgName,
IsOptional: true,
ZeroValueProvider: builtin_argument.ZeroValueProvider[starlark.String],
},
{
Name: RunArgName,
IsOptional: false,
Expand Down Expand Up @@ -141,6 +146,17 @@ type RunShCapabilities struct {
}

func (builtin *RunShCapabilities) Interpret(locatorOfModuleInWhichThisBuiltinIsBeingCalled string, arguments *builtin_argument.ArgumentValuesSet) (starlark.Value, *startosis_errors.InterpretationError) {
if arguments.IsSet(TaskNameArgName) {
tedim52 marked this conversation as resolved.
Show resolved Hide resolved
taskName, err := builtin_argument.ExtractArgumentValue[starlark.String](arguments, TaskNameArgName)
if err != nil {
return nil, startosis_errors.WrapWithInterpretationError(err, "Unable to extract value for '%s' argument", TaskNameArgName)
}
builtin.name = taskName.GoString()
} else {
randomUuid := uuid.NewRandom()
builtin.name = fmt.Sprintf("task-%v", randomUuid.String())
}

runCommand, err := builtin_argument.ExtractArgumentValue[starlark.String](arguments, RunArgName)
if err != nil {
return nil, startosis_errors.WrapWithInterpretationError(err, "Unable to extract value for '%s' argument", RunArgName)
Expand Down Expand Up @@ -225,8 +241,6 @@ func (builtin *RunShCapabilities) Interpret(locatorOfModuleInWhichThisBuiltinIsB
return nil, startosis_errors.NewInterpretationError("An error occurred while generating UUID for future reference for %v instruction", RunShBuiltinName)
}
builtin.resultUuid = resultUuid
randomUuid := uuid.NewRandom()
builtin.name = fmt.Sprintf("task-%v", randomUuid.String())

defaultDescription := runningShScriptPrefix
if len(builtin.run) < shScriptPrintCharLimit {
Expand All @@ -253,7 +267,7 @@ func (builtin *RunShCapabilities) Validate(_ *builtin_argument.ArgumentValuesSet
// Make task as its own entity instead of currently shown under services
func (builtin *RunShCapabilities) Execute(ctx context.Context, _ *builtin_argument.ArgumentValuesSet) (string, error) {
// swap env vars with their runtime value
serviceConfigWithReplacedEnvVars, err := repacaeMagicStringsInEnvVars(builtin.runtimeValueStore, builtin.serviceConfig)
serviceConfigWithReplacedEnvVars, err := replaceMagicStringsInEnvVars(builtin.runtimeValueStore, builtin.serviceConfig)
if err != nil {
return "", stacktrace.Propagate(err, "An error occurred replacing magic strings in env vars.")
}
Expand Down Expand Up @@ -343,7 +357,7 @@ func getCommandToRun(builtin *RunShCapabilities) (string, error) {
return maybeSubCommandWithRuntimeValues, nil
}

func repacaeMagicStringsInEnvVars(runtimeValueStore *runtime_value_store.RuntimeValueStore, serviceConfig *service.ServiceConfig) (
func replaceMagicStringsInEnvVars(runtimeValueStore *runtime_value_store.RuntimeValueStore, serviceConfig *service.ServiceConfig) (
*service.ServiceConfig,
error) {
var envVars map[string]string
Expand Down
1 change: 1 addition & 0 deletions core/server/api_container/server/startosis_engine/kurtosis_instruction/tasks/tasks_shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
// shared constants
const (
ImageNameArgName = "image"
TaskNameArgName = "name"
RunArgName = "run"
StoreFilesArgName = "store"
WaitArgName = "wait"
Expand Down
Loading