feat: Add cli argument to control image download

api/golang/core/lib/binding_constructors/binding_constructors.go

@@ -41,11 +41,14 @@ func NewRunStarlarkScriptArgs(
 	experimentalFeatures []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag,
 	cloudInstanceId string,
 	cloudUserId string,
+	imageDownloadMode kurtosis_core_rpc_api_bindings.ImageDownloadMode,
 ) *kurtosis_core_rpc_api_bindings.RunStarlarkScriptArgs {
 	cloudInstanceIdCopy := new(string)
 	*cloudInstanceIdCopy = cloudInstanceId
 	cloudUserIdCopy := new(string)
 	*cloudUserIdCopy = cloudUserId
+	imageDownloadModeCopy := new(kurtosis_core_rpc_api_bindings.ImageDownloadMode)
+	*imageDownloadModeCopy = imageDownloadMode
 	parallelismCopy := new(int32)
 	*parallelismCopy = parallelism
 	return &kurtosis_core_rpc_api_bindings.RunStarlarkScriptArgs{
@@ -57,6 +60,7 @@ func NewRunStarlarkScriptArgs(
 		ExperimentalFeatures: experimentalFeatures,
 		CloudInstanceId:      cloudInstanceIdCopy,
 		CloudUserId:          cloudUserIdCopy,
+		ImageDownloadMode:    imageDownloadModeCopy,
 	}
 }
 
@@ -70,13 +74,16 @@ func NewRunStarlarkPackageArgs(
 	experimentalFeatures []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag,
 	cloudInstanceId string,
 	cloudUserId string,
+	imageDownloadMode kurtosis_core_rpc_api_bindings.ImageDownloadMode,
 ) *kurtosis_core_rpc_api_bindings.RunStarlarkPackageArgs {
 	parallelismCopy := new(int32)
 	*parallelismCopy = parallelism
 	cloudInstanceIdCopy := new(string)
 	*cloudInstanceIdCopy = cloudInstanceId
 	cloudUserIdCopy := new(string)
 	*cloudUserIdCopy = cloudUserId
+	imageDownloadModeCopy := new(kurtosis_core_rpc_api_bindings.ImageDownloadMode)
+	*imageDownloadModeCopy = imageDownloadMode
 	clonePackage := false
 	return &kurtosis_core_rpc_api_bindings.RunStarlarkPackageArgs{
 		PackageId:              packageId,
@@ -90,6 +97,7 @@ func NewRunStarlarkPackageArgs(
 		ExperimentalFeatures:   experimentalFeatures,
 		CloudInstanceId:        cloudInstanceIdCopy,
 		CloudUserId:            cloudUserIdCopy,
+		ImageDownloadMode:      imageDownloadModeCopy,
 	}
 }
 
@@ -103,13 +111,16 @@ func NewRunStarlarkRemotePackageArgs(
 	experimentalFeatures []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag,
 	cloudInstanceId string,
 	cloudUserId string,
+	imageDownloadMode kurtosis_core_rpc_api_bindings.ImageDownloadMode,
 ) *kurtosis_core_rpc_api_bindings.RunStarlarkPackageArgs {
 	parallelismCopy := new(int32)
 	*parallelismCopy = parallelism
 	cloudInstanceIdCopy := new(string)
 	*cloudInstanceIdCopy = cloudInstanceId
 	cloudUserIdCopy := new(string)
 	*cloudUserIdCopy = cloudUserId
+	imageDownloadModeCopy := new(kurtosis_core_rpc_api_bindings.ImageDownloadMode)
+	*imageDownloadModeCopy = imageDownloadMode
 	clonePackage := true
 	return &kurtosis_core_rpc_api_bindings.RunStarlarkPackageArgs{
 		PackageId:              packageId,
@@ -123,6 +134,7 @@ func NewRunStarlarkRemotePackageArgs(
 		ExperimentalFeatures:   experimentalFeatures,
 		CloudInstanceId:        cloudInstanceIdCopy,
 		CloudUserId:            cloudUserIdCopy,
+		ImageDownloadMode:      imageDownloadModeCopy,
 	}
 }
 

api/golang/core/lib/enclaves/enclave_context.go

@@ -20,6 +20,11 @@ package enclaves
 import (
 	"context"
 	"encoding/json"
+	"io"
+	"os"
+	"path"
+	"strings"
+
 	yaml_convert "github.com/ghodss/yaml"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
 	"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/binding_constructors"
@@ -31,10 +36,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
-	"io"
-	"os"
-	"path"
-	"strings"
 )
 
 type EnclaveUUID string
@@ -95,7 +96,7 @@ func (enclaveCtx *EnclaveContext) RunStarlarkScript(
 		return nil, nil, stacktrace.Propagate(err, "An error occurred when parsing YAML args for script '%v'", oldSerializedParams)
 	}
 	ctxWithCancel, cancelCtxFunc := context.WithCancel(ctx)
-	executeStartosisScriptArgs := binding_constructors.NewRunStarlarkScriptArgs(runConfig.MainFunctionName, serializedScript, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId)
+	executeStartosisScriptArgs := binding_constructors.NewRunStarlarkScriptArgs(runConfig.MainFunctionName, serializedScript, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId, runConfig.ImageDownload)
 	starlarkResponseLineChan := make(chan *kurtosis_core_rpc_api_bindings.StarlarkRunResponseLine)
 
 	stream, err := enclaveCtx.client.RunStarlarkScript(ctxWithCancel, executeStartosisScriptArgs)
@@ -147,7 +148,7 @@ func (enclaveCtx *EnclaveContext) RunStarlarkPackage(
 		return nil, nil, stacktrace.Propagate(err, "An error occurred getting Kurtosis yaml file from path '%s'", packageRootPath)
 	}
 
-	executeStartosisPackageArgs, err := enclaveCtx.assembleRunStartosisPackageArg(kurtosisYml, runConfig.RelativePathToMainFile, runConfig.MainFunctionName, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId)
+	executeStartosisPackageArgs, err := enclaveCtx.assembleRunStartosisPackageArg(kurtosisYml, runConfig.RelativePathToMainFile, runConfig.MainFunctionName, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId, runConfig.ImageDownload)
 	if err != nil {
 		return nil, nil, stacktrace.Propagate(err, "Error preparing package '%s' for execution", packageRootPath)
 	}
@@ -233,7 +234,7 @@ func (enclaveCtx *EnclaveContext) RunStarlarkRemotePackage(
 	}()
 
 	starlarkResponseLineChan := make(chan *kurtosis_core_rpc_api_bindings.StarlarkRunResponseLine)
-	executeStartosisScriptArgs := binding_constructors.NewRunStarlarkRemotePackageArgs(packageId, runConfig.RelativePathToMainFile, runConfig.MainFunctionName, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId)
+	executeStartosisScriptArgs := binding_constructors.NewRunStarlarkRemotePackageArgs(packageId, runConfig.RelativePathToMainFile, runConfig.MainFunctionName, serializedParams, runConfig.DryRun, runConfig.Parallelism, runConfig.ExperimentalFeatureFlags, runConfig.CloudInstanceId, runConfig.CloudUserId, runConfig.ImageDownload)
 
 	stream, err := enclaveCtx.client.RunStarlarkPackage(ctxWithCancel, executeStartosisScriptArgs)
 	if err != nil {
@@ -531,9 +532,10 @@ func (enclaveCtx *EnclaveContext) assembleRunStartosisPackageArg(
 	experimentalFeatures []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag,
 	cloudInstanceId string,
 	cloudUserId string,
+	imageDownloadMode kurtosis_core_rpc_api_bindings.ImageDownloadMode,
 ) (*kurtosis_core_rpc_api_bindings.RunStarlarkPackageArgs, error) {
 
-	return binding_constructors.NewRunStarlarkPackageArgs(kurtosisYaml.PackageName, relativePathToMainFile, mainFunctionName, serializedParams, dryRun, parallelism, experimentalFeatures, cloudInstanceId, cloudUserId), nil
+	return binding_constructors.NewRunStarlarkPackageArgs(kurtosisYaml.PackageName, relativePathToMainFile, mainFunctionName, serializedParams, dryRun, parallelism, experimentalFeatures, cloudInstanceId, cloudUserId, imageDownloadMode), nil
 }
 
 func (enclaveCtx *EnclaveContext) uploadStarlarkPackage(packageId string, packageRootPath string) error {

api/golang/core/lib/shared_utils/proto_default_value.go

@@ -14,3 +14,10 @@ func GetOrDefaultString(optionalValue *string, defaultValue string) string {
 	}
 	return *optionalValue
 }
+
+func GetOrDefault[T any](optionalValue *T, defaultValue T) T {
+	if optionalValue == nil {
+		return defaultValue
+	}
+	return *optionalValue
+}

api/golang/core/lib/starlark_run_config/starlark_run_config.go

@@ -10,6 +10,7 @@ const (
 	defaultParallelism            = 4
 	defaultCloudInstanceId        = ""
 	defaultCloudUserId            = ""
+	defaultImageDownload          = kurtosis_core_rpc_api_bindings.ImageDownloadMode_missing
 )
 
 var defaultExperimentalFeatureFlags = []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag(nil)
@@ -23,6 +24,7 @@ type StarlarkRunConfig struct {
 	ExperimentalFeatureFlags []kurtosis_core_rpc_api_bindings.KurtosisFeatureFlag
 	CloudInstanceId          string
 	CloudUserId              string
+	ImageDownload            kurtosis_core_rpc_api_bindings.ImageDownloadMode
 }
 
 type starlarkRunConfigOption func(*StarlarkRunConfig)
@@ -35,8 +37,9 @@ func NewRunStarlarkConfig(opts ...starlarkRunConfigOption) *StarlarkRunConfig {
 		DryRun:                   defaultDryRun,
 		Parallelism:              defaultParallelism,
 		ExperimentalFeatureFlags: defaultExperimentalFeatureFlags,
-		CloudInstanceId:          defaultCloudUserId,
-		CloudUserId:              defaultCloudInstanceId,
+		CloudInstanceId:          defaultCloudInstanceId,
+		CloudUserId:              defaultCloudUserId,
+		ImageDownload:            defaultImageDownload,
 	}
 
 	for _, opt := range opts {
@@ -93,3 +96,9 @@ func WithCloudUserId(cloudUserId string) starlarkRunConfigOption {
 		config.CloudUserId = cloudUserId
 	}
 }
+
+func WithImageDownloadMode(imageDownloadMode kurtosis_core_rpc_api_bindings.ImageDownloadMode) starlarkRunConfigOption {
+	return func(config *StarlarkRunConfig) {
+		config.ImageDownload = imageDownloadMode
+	}
+}

api/protobuf/core/api_container_service.proto

@@ -94,6 +94,11 @@ enum ServiceStatus {
   UNKNOWN = 2;
 }
 
+enum ImageDownloadMode {
+	always  = 0;
+	missing = 1;
+}
+
 message ServiceInfo {
   // UUID of the service
   string service_uuid = 1;
@@ -162,6 +167,9 @@ message RunStarlarkScriptArgs {
 
   // Defaults to empty
   optional string cloud_user_id = 8;
+
+  // Defaults to empty
+  optional ImageDownloadMode image_download_mode = 9;
 }
 
 message RunStarlarkPackageArgs {
@@ -204,6 +212,9 @@ message RunStarlarkPackageArgs {
 
   // Defaults to empty
   optional string cloud_user_id = 13;
+
+  // Defaults to empty
+  optional ImageDownloadMode image_download_mode = 14;
 }
 
 enum KurtosisFeatureFlag {

api/rust/src/api_container_api.rs

@@ -178,6 +178,9 @@ pub struct RunStarlarkScriptArgs {
     /// Defaults to empty
     #[prost(string, optional, tag = "8")]
     pub cloud_user_id: ::core::option::Option<::prost::alloc::string::String>,
+    /// Defaults to empty
+    #[prost(enumeration = "ImageDownloadMode", optional, tag = "9")]
+    pub image_download_mode: ::core::option::Option<i32>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -214,6 +217,9 @@ pub struct RunStarlarkPackageArgs {
     /// Defaults to empty
     #[prost(string, optional, tag = "13")]
     pub cloud_user_id: ::core::option::Option<::prost::alloc::string::String>,
+    /// Defaults to empty
+    #[prost(enumeration = "ImageDownloadMode", optional, tag = "14")]
+    pub image_download_mode: ::core::option::Option<i32>,
     /// Deprecated: If the package is local, it should have been uploaded with UploadStarlarkPackage prior to calling
     /// RunStarlarkPackage. If the package is remote and must be cloned within the APIC, use the standalone boolean flag
     /// clone_package below
@@ -690,6 +696,32 @@ impl ServiceStatus {
         }
     }
 }
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum ImageDownloadMode {
+    Always = 0,
+    Missing = 1,
+}
+impl ImageDownloadMode {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            ImageDownloadMode::Always => "always",
+            ImageDownloadMode::Missing => "missing",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "always" => Some(Self::Always),
+            "missing" => Some(Self::Missing),
+            _ => None,
+        }
+    }
+}
 /// User services port forwarding
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]

api/typescript/src/core/kurtosis_core_rpc_api_bindings/api_container_service_pb.d.ts

@@ -170,6 +170,11 @@ export class RunStarlarkScriptArgs extends jspb.Message {
   hasCloudUserId(): boolean;
   clearCloudUserId(): RunStarlarkScriptArgs;
 
+  getImageDownloadMode(): ImageDownloadMode;
+  setImageDownloadMode(value: ImageDownloadMode): RunStarlarkScriptArgs;
+  hasImageDownloadMode(): boolean;
+  clearImageDownloadMode(): RunStarlarkScriptArgs;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): RunStarlarkScriptArgs.AsObject;
   static toObject(includeInstance: boolean, msg: RunStarlarkScriptArgs): RunStarlarkScriptArgs.AsObject;
@@ -188,6 +193,7 @@ export namespace RunStarlarkScriptArgs {
     experimentalFeaturesList: Array<KurtosisFeatureFlag>,
     cloudInstanceId?: string,
     cloudUserId?: string,
+    imageDownloadMode?: ImageDownloadMode,
   }
 
   export enum DryRunCase { 
@@ -209,6 +215,11 @@ export namespace RunStarlarkScriptArgs {
     _CLOUD_USER_ID_NOT_SET = 0,
     CLOUD_USER_ID = 8,
   }
+
+  export enum ImageDownloadModeCase { 
+    _IMAGE_DOWNLOAD_MODE_NOT_SET = 0,
+    IMAGE_DOWNLOAD_MODE = 9,
+  }
 }
 
 export class RunStarlarkPackageArgs extends jspb.Message {
@@ -262,6 +273,11 @@ export class RunStarlarkPackageArgs extends jspb.Message {
   hasCloudUserId(): boolean;
   clearCloudUserId(): RunStarlarkPackageArgs;
 
+  getImageDownloadMode(): ImageDownloadMode;
+  setImageDownloadMode(value: ImageDownloadMode): RunStarlarkPackageArgs;
+  hasImageDownloadMode(): boolean;
+  clearImageDownloadMode(): RunStarlarkPackageArgs;
+
   getStarlarkPackageContentCase(): RunStarlarkPackageArgs.StarlarkPackageContentCase;
 
   serializeBinary(): Uint8Array;
@@ -286,6 +302,7 @@ export namespace RunStarlarkPackageArgs {
     experimentalFeaturesList: Array<KurtosisFeatureFlag>,
     cloudInstanceId?: string,
     cloudUserId?: string,
+    imageDownloadMode?: ImageDownloadMode,
   }
 
   export enum StarlarkPackageContentCase { 
@@ -318,6 +335,11 @@ export namespace RunStarlarkPackageArgs {
     _CLOUD_USER_ID_NOT_SET = 0,
     CLOUD_USER_ID = 13,
   }
+
+  export enum ImageDownloadModeCase { 
+    _IMAGE_DOWNLOAD_MODE_NOT_SET = 0,
+    IMAGE_DOWNLOAD_MODE = 14,
+  }
 }
 
 export class StarlarkRunResponseLine extends jspb.Message {
@@ -1280,6 +1302,10 @@ export enum ServiceStatus {
   RUNNING = 1,
   UNKNOWN = 2,
 }
+export enum ImageDownloadMode { 
+  ALWAYS = 0,
+  MISSING = 1,
+}
 export enum Connect { 
   CONNECT = 0,
   NO_CONNECT = 1,