feat: integrate nature theme named to render_template and store_service

cli/cli/commands/files/rendertemplate/rendertemplate.go

@@ -35,15 +35,10 @@ const (
  kurtosisBackendCtxKey = "kurtosis-backend"
  engineClientCtxKey = "engine-client"
 
- starlarkTemplate = `
-CURRENT_TIME_STR = str(time.now().unix)
-ARTIFACT_NAME = "cli-rendered-artifact-" + CURRENT_TIME_STR
+ starlarkTemplateWithArtifactName = `
 def run(plan, args):
- name = ARTIFACT_NAME
- if args.name != "":
- name = args.name
  plan.render_templates(
- name = name,
+ name = args.name,
  config = {
  args.file_name: struct(
  template = args.template,
@@ -52,6 +47,19 @@ def run(plan, args):
  }
  )
 `
+
+ starlarkTemplateWithoutArtifactName = `
+def run(plan, args):
+ plan.render_templates(
+ config = {
+ args.file_name: struct(
+ template = args.template,
+ data = args.template_data,
+ ),
+ }
+ )
+`
+
  doNotDryRun = false
  noParallelism = 1
 )
@@ -209,11 +217,16 @@ func validateDestRelFilePathArg(ctx context.Context, flags *flags.ParsedFlags, a
 }
 
 func renderTemplateStarlarkCommand(ctx context.Context, enclaveCtx *enclaves.EnclaveContext, destRelFilepath string, templateFileContents string, templateData interface{}, artifactName string) (string, error) {
+ template := starlarkTemplateWithArtifactName
+ if artifactName == defaultName {
+ template = starlarkTemplateWithoutArtifactName
+ }
+
  templateDataBytes, err := json.Marshal(templateData)
  if err != nil {
  return "", stacktrace.Propagate(err, "An error has occurred when parsing input params to render template Starlark command")
  }
- runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, starlarkTemplate, fmt.Sprintf(`{"file_name": "%s", "template": "%s", "template_data": %s, "name": "%s"}`, destRelFilepath, templateFileContents, string(templateDataBytes), artifactName), doNotDryRun, noParallelism)
+ runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, template, fmt.Sprintf(`{"file_name": "%s", "template": "%s", "template_data": %s, "name": "%s"}`, destRelFilepath, templateFileContents, string(templateDataBytes), artifactName), doNotDryRun, noParallelism)
  if runResult.ExecutionError != nil {
  return "", stacktrace.NewError("An error occurred during Starlark script execution for rendering template: %s", runResult.ExecutionError.GetErrorMessage())
  }

cli/cli/commands/files/storeservice/storeservice.go

@@ -35,17 +35,20 @@ const (
  kurtosisBackendCtxKey = "kurtosis-backend"
  engineClientCtxKey = "engine-client"
 
- starlarkTemplate = `
-CURRENT_TIME_STR = str(time.now().unix)
-ARTIFACT_NAME = "cli-stored-artifact-" + CURRENT_TIME_STR
+ starlarkTemplateWithArtifactName = `
 def run(plan, args):
- name = ARTIFACT_NAME
- if args.name != "":
- name = args.name
  plan.store_service_files(
- name = name,
+ src = args.src,
+ name = args.name,
+ service_name = args.service_name,
+ )
+`
+
+ starlarkTemplateWithoutArtifactName = `
+def run(plan, args):
+ plan.store_service_files(
+ src = args.src,
  service_name = args.service_name,
- src = args.src
  )
 `
  noParallelism = 1
@@ -146,7 +149,12 @@ func run(
 }
 
 func storeServiceFileStarlarkCommand(ctx context.Context, enclaveCtx *enclaves.EnclaveContext, serviceName services.ServiceName, filePath string, enclaveIdentifier string, artifactName string) (*enclaves.StarlarkRunResult, error) {
- runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, starlarkTemplate, fmt.Sprintf(`{"service_name": "%s", "src": "%s", "name": "%s"}`, serviceName, filePath, artifactName), false, noParallelism)
+ template := starlarkTemplateWithArtifactName
+ if artifactName == defaultName {
+ template = starlarkTemplateWithoutArtifactName
+ }
+
+ runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, template, fmt.Sprintf(`{"service_name": "%s", "src": "%s", "name": "%s"}`, serviceName, filePath, artifactName), false, noParallelism)
  if err != nil {
  return nil, stacktrace.Propagate(
  err,

core/server/api_container/server/startosis_engine/kurtosis_instruction/store_service_files/store_service_files.go

@@ -121,6 +121,6 @@ func (builtin *StoreServiceFilesCapabilities) Execute(ctx context.Context, _ *bu
  if err != nil {
  return "", stacktrace.Propagate(err, "Failed to copy file '%v' from service '%v", builtin.src, builtin.serviceName)
  }
- instructionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", builtin.artifactName, artifactUuid)
+ instructionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", builtin.artifactName, artifactUuid)
  return instructionResult, nil
 }

core/server/api_container/server/startosis_engine/kurtosis_instruction/upload_files/upload_files.go

@@ -120,6 +120,6 @@ func (builtin *UploadFilesCapabilities) Execute(_ context.Context, _ *builtin_ar
  if err != nil {
  return "", stacktrace.Propagate(err, "An error occurred while uploading the compressed contents\n'%v'", compressedData)
  }
- instructionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", builtin.artifactName, filesArtifactUuid)
+ instructionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", builtin.artifactName, filesArtifactUuid)
  return instructionResult, nil
 }

core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/test_engine/store_service_files_framework_test.go

@@ -48,6 +48,6 @@ func (t *storeServiceFilesTestCase) GetStarlarkCode() string {
 func (t *storeServiceFilesTestCase) Assert(interpretationResult starlark.Value, executionResult *string) {
  require.Equal(t, starlark.String(TestArtifactName), interpretationResult)
 
- expectedExecutionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", TestArtifactName, TestArtifactUuid)
+ expectedExecutionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", TestArtifactName, TestArtifactUuid)
  require.Equal(t, expectedExecutionResult, *executionResult)
 }

core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/test_engine/store_service_files_without_name_framework_test.go

@@ -53,6 +53,6 @@ func (t *storeServiceFilesWithoutNameTestCase) GetStarlarkCode() string {
 func (t *storeServiceFilesWithoutNameTestCase) Assert(interpretationResult starlark.Value, executionResult *string) {
  require.Equal(t, starlark.String(mockedFileArtifactName), interpretationResult)
 
- expectedExecutionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", mockedFileArtifactName, TestArtifactUuid)
+ expectedExecutionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", mockedFileArtifactName, TestArtifactUuid)
  require.Equal(t, expectedExecutionResult, *executionResult)
 }

core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/test_engine/upload_files_framework_test.go

@@ -49,6 +49,6 @@ func (t uploadFilesTestCase) GetStarlarkCode() string {
 func (t *uploadFilesTestCase) Assert(interpretationResult starlark.Value, executionResult *string) {
  require.Equal(t, starlark.String(TestArtifactName), interpretationResult)
 
- expectedExecutionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", TestArtifactName, TestArtifactUuid)
+ expectedExecutionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", TestArtifactName, TestArtifactUuid)
  require.Equal(t, expectedExecutionResult, *executionResult)
 }

core/server/api_container/server/startosis_engine/kurtosis_starlark_framework/test_engine/upload_files_without_name_framework_test.go

@@ -54,6 +54,6 @@ func (t uploadFilesWithoutNameTestCase) GetStarlarkCode() string {
 func (t *uploadFilesWithoutNameTestCase) Assert(interpretationResult starlark.Value, executionResult *string) {
  require.Equal(t, starlark.String(mockedFileArtifactName), interpretationResult)
 
- expectedExecutionResult := fmt.Sprintf("Files  with artifact name '%s' uploaded with artifact UUID '%s'", mockedFileArtifactName, TestArtifactUuid)
+ expectedExecutionResult := fmt.Sprintf("Files with artifact name '%s' uploaded with artifact UUID '%s'", mockedFileArtifactName, TestArtifactUuid)
  require.Equal(t, expectedExecutionResult, *executionResult)
 }

internal_testsuites/golang/testsuite/startosis_test/startosis_test.go

@@ -116,7 +116,7 @@ Adding service example-datastore-server-1.
 Service 'example-datastore-server-1' added with service UUID '[a-z-0-9]+'
 Service example-datastore-server-1 deployed successfully.
 Command returned with exit code '0' with no output
-Files  with artifact name 'stored-file' uploaded with artifact UUID '[a-f0-9]{32}'
+Files with artifact name 'stored-file' uploaded with artifact UUID '[a-f0-9]{32}'
 Stored file at stored-file
 Templates artifact name 'rendered-file' rendered with artifact UUID '[a-f0-9]{32}'
 Rendered file to rendered-file

internal_testsuites/golang/testsuite/startosis_upload_files_test/startosis_upload_files_test.go

@@ -70,7 +70,7 @@ func TestStartosis(t *testing.T) {
  require.Nil(t, runResult.ExecutionError, "Unexpected execution error")
 
  expectedScriptOutput := `Adding service example-datastore-server-1.
-Files  with artifact name 'test-artifact' uploaded with artifact UUID '[a-f0-9]{32}'
+Files with artifact name 'test-artifact' uploaded with artifact UUID '[a-f0-9]{32}'
 Uploaded test-artifact
 Service 'example-datastore-server-1' added with service UUID '[a-z-0-9]+'
 `