Fix merge breaks

kurtosis-tech · Jun 27, 2023 · ef5744d · ef5744d
1 parent 06a43a5
commit ef5744d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cli/cli/commands/service/start/start.go b/cli/cli/commands/service/start/start.go
@@ -3,6 +3,7 @@ package start
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
 	"github.com/kurtosis-tech/kurtosis/api/golang/engine/kurtosis_engine_rpc_api_bindings"
@@ -40,6 +41,10 @@ def run(plan, args):
 	useDefaultMainFile = ""
 )
 
+var (
+	noExperimentalFeature []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag
+)
+
 var ServiceStartCmd = &engine_consuming_kurtosis_command.EngineConsumingKurtosisCommand{
 	CommandStr:                command_str_consts.ServiceStartCmdStr,
 	ShortDescription:          "Restarts a stopped service",
@@ -106,7 +111,7 @@ func run(
 
 func startServiceStarlarkCommand(ctx context.Context, enclaveCtx *enclaves.EnclaveContext, serviceName services.ServiceName) error {
 	serviceNameString := fmt.Sprintf(`{"service_name": "%s"}`, serviceName)
-	runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, useDefaultMainFile, starlarkScript, serviceNameString, doNotDryRun, defaultParallelism)
+	runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, useDefaultMainFile, starlarkScript, serviceNameString, doNotDryRun, defaultParallelism, noExperimentalFeature)
 	if err != nil {
 		return stacktrace.Propagate(err, "An unexpected error occurred on Starlark for starting service")
 	}

diff --git a/cli/cli/commands/service/stop/stop.go b/cli/cli/commands/service/stop/stop.go
@@ -3,6 +3,7 @@ package stop
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
 	"github.com/kurtosis-tech/kurtosis/api/golang/engine/kurtosis_engine_rpc_api_bindings"
@@ -40,6 +41,10 @@ def run(plan, args):
 	useDefaultMainFile = ""
 )
 
+var (
+	noExperimentalFeature []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag
+)
+
 var ServiceStopCmd = &engine_consuming_kurtosis_command.EngineConsumingKurtosisCommand{
 	CommandStr:                command_str_consts.ServiceStopCmdStr,
 	ShortDescription:          "Stops a service",
@@ -106,7 +111,7 @@ func run(
 
 func stopServiceStarlarkCommand(ctx context.Context, enclaveCtx *enclaves.EnclaveContext, serviceName services.ServiceName) error {
 	serviceNameString := fmt.Sprintf(`{"service_name": "%s"}`, serviceName)
-	runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, useDefaultMainFile, starlarkScript, serviceNameString, doNotDryRun, defaultParallelism)
+	runResult, err := enclaveCtx.RunStarlarkScriptBlocking(ctx, useDefaultMainFile, starlarkScript, serviceNameString, doNotDryRun, defaultParallelism, noExperimentalFeature)
 	if err != nil {
 		return stacktrace.Propagate(err, "An unexpected error occurred on Starlark for stopping service")
 	}