Support path option on net up kubernetes

Author: ndr-ds

linera-service/src/cli_wrappers/local_kubernetes_net.rs

@@ -13,7 +13,6 @@ use linera_base::{
     data_types::Amount,
 };
 use linera_client::client_options::ResourceControlPolicyConfig;
-use tempfile::{tempdir, TempDir};
 use tokio::process::Command;
 #[cfg(with_testing)]
 use {
@@ -71,6 +70,7 @@ pub struct LocalKubernetesNetConfig {
     pub docker_image_name: String,
     pub build_mode: BuildMode,
     pub policy_config: ResourceControlPolicyConfig,
+    pub path_provider: PathProvider,
 }
 
 /// A wrapper of [`LocalKubernetesNetConfig`] to create a shared local Kubernetes network
@@ -84,7 +84,6 @@ pub struct LocalKubernetesNet {
     network: Network,
     testing_prng_seed: Option<u64>,
     next_client_id: usize,
-    tmp_dir: Arc<TempDir>,
     binaries: BuildArg,
     no_build: bool,
     docker_image_name: String,
@@ -93,6 +92,7 @@ pub struct LocalKubernetesNet {
     kind_clusters: Vec<KindCluster>,
     num_initial_validators: usize,
     num_shards: usize,
+    path_provider: PathProvider,
 }
 
 #[cfg(with_testing)]
@@ -115,6 +115,7 @@ impl SharedLocalKubernetesNetTestingConfig {
                 binaries = BuildArg::Directory(binaries_dir);
             }
         }
+        let path_provider = PathProvider::create_temporary_directory().unwrap();
         Self(LocalKubernetesNetConfig {
             network,
             testing_prng_seed: Some(37),
@@ -127,6 +128,7 @@ impl SharedLocalKubernetesNetTestingConfig {
             docker_image_name: String::from("linera:latest"),
             build_mode: BuildMode::Release,
             policy_config: ResourceControlPolicyConfig::Testnet,
+            path_provider,
         })
     }
 }
@@ -159,6 +161,7 @@ impl LineraNetConfig for LocalKubernetesNetConfig {
             clusters,
             self.num_initial_validators,
             self.num_shards,
+            self.path_provider,
         )?;
 
         let client = net.make_client().await;
@@ -275,11 +278,8 @@ impl LineraNet for LocalKubernetesNet {
     }
 
     async fn make_client(&mut self) -> ClientWrapper {
-        let path_provider = PathProvider::TemporaryDirectory {
-            tmp_dir: self.tmp_dir.clone(),
-        };
         let client = ClientWrapper::new(
-            path_provider,
+            self.path_provider.clone(),
             self.network,
             self.testing_prng_seed,
             self.next_client_id,
@@ -338,12 +338,12 @@ impl LocalKubernetesNet {
         kind_clusters: Vec<KindCluster>,
         num_initial_validators: usize,
         num_shards: usize,
+        path_provider: PathProvider,
     ) -> Result<Self> {
         Ok(Self {
             network,
             testing_prng_seed,
             next_client_id: 0,
-            tmp_dir: Arc::new(tempdir()?),
             binaries,
             no_build,
             docker_image_name,
@@ -352,19 +352,23 @@ impl LocalKubernetesNet {
             kind_clusters,
             num_initial_validators,
             num_shards,
+            path_provider,
         })
     }
 
     async fn command_for_binary(&self, name: &'static str) -> Result<Command> {
         let path = resolve_binary(name, env!("CARGO_PKG_NAME")).await?;
         let mut command = Command::new(path);
-        command.current_dir(self.tmp_dir.path());
+        command.current_dir(self.path_provider.path());
         Ok(command)
     }
 
     fn configuration_string(&self, server_number: usize) -> Result<String> {
         let n = server_number;
-        let path = self.tmp_dir.path().join(format!("validator_{n}.toml"));
+        let path = self
+            .path_provider
+            .path()
+            .join(format!("validator_{n}.toml"));
         let port = 19100 + server_number;
         let internal_port = 20100;
         let metrics_port = 21100;
@@ -442,13 +446,11 @@ impl LocalKubernetesNet {
             .join("kubernetes")
             .join("linera-validator")
             .join("working");
-        fs_err::copy(
-            self.tmp_dir.path().join("genesis.json"),
-            base_dir.join("genesis.json"),
-        )?;
+        let path = self.path_provider.path();
+        fs_err::copy(path.join("genesis.json"), base_dir.join("genesis.json"))?;
 
         let kubectl_instance_clone = self.kubectl_instance.clone();
-        let tmp_dir_path_clone = self.tmp_dir.path().to_path_buf();
+        let tmp_dir_path_clone = path.to_path_buf();
         let num_shards = self.num_shards;
 
         let mut validators_initialization_futures = Vec::new();

linera-service/src/linera/main.rs

@@ -1996,6 +1996,7 @@ async fn run(options: &ClientOptions) -> Result<i32, Error> {
                 no_build,
                 docker_image_name,
                 build_mode,
+                path,
                 with_faucet,
                 faucet_chain,
                 faucet_port,
@@ -2017,6 +2018,7 @@ async fn run(options: &ClientOptions) -> Result<i32, Error> {
                     *faucet_chain,
                     *faucet_port,
                     *faucet_amount,
+                    path,
                 )
                 .boxed()
                 .await?;

linera-service/src/linera/net_up_utils.rs

@@ -119,6 +119,7 @@ pub async fn handle_net_up_kubernetes(
     faucet_chain: Option<u32>,
     faucet_port: NonZeroU16,
     faucet_amount: Amount,
+    path: &Option<String>,
 ) -> anyhow::Result<()> {
     if num_initial_validators < 1 {
         panic!("The local test network must have at least one validator.");
@@ -136,6 +137,7 @@ pub async fn handle_net_up_kubernetes(
     let shutdown_notifier = CancellationToken::new();
     tokio::spawn(listen_for_shutdown_signals(shutdown_notifier.clone()));
 
+    let path_provider = PathProvider::new(path)?;
     let config = LocalKubernetesNetConfig {
         network: Network::Grpc,
         testing_prng_seed,
@@ -148,6 +150,7 @@ pub async fn handle_net_up_kubernetes(
         docker_image_name,
         build_mode,
         policy_config,
+        path_provider,
     };
     let (mut net, client) = config.instantiate().await?;
     let faucet_service = print_messages_and_create_faucet(