fixes to localnet purge

Author: jstuczyn

tools/internal/localnet-orchestrator/src/cli/purge.rs

@@ -4,6 +4,7 @@
 use crate::cli::CommonArgs;
 use crate::orchestrator::LocalnetOrchestrator;
 use crate::orchestrator::setup::purge;
+use clap::ArgAction;
 use std::path::PathBuf;
 use tracing::debug;
 
@@ -13,11 +14,11 @@ pub(crate) struct Args {
     common: CommonArgs,
 
     /// Remove any built docker and container images
-    #[clap(long, default_value_t = true)]
+    #[clap(long, action = ArgAction::Set, default_value_t = true)]
     remove_images: bool,
 
     /// Remove any cached build data
-    #[clap(long, default_value_t = true)]
+    #[clap(long, action = ArgAction::Set, default_value_t = true)]
     remove_cache: bool,
 
     /// Custom path to root of the monorepo in case this binary has been executed from a different location.

tools/internal/localnet-orchestrator/src/orchestrator/setup/purge.rs

@@ -1,13 +1,13 @@
 // Copyright 2025 - Nym Technologies SA <[email protected]>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::constants::LOCALNET_NYXD_IMAGE_NAME;
 use crate::helpers::monorepo_root_path;
 use crate::orchestrator::LocalnetOrchestrator;
 use crate::orchestrator::container_helpers::{
     default_nym_binaries_image_tag, remove_container_image,
 };
 use crate::orchestrator::context::LocalnetContext;
+use anyhow::Context;
 use std::path::PathBuf;
 
 struct LocalnetPurge {
@@ -41,12 +41,16 @@ impl LocalnetOrchestrator {
     ) -> anyhow::Result<()> {
         ctx.begin_next_step("removing all built images", "🔥");
         if !ctx.data.remove_images {
-            ctx.println("\t NOT ENABLED - SKIPPING")
+            ctx.println("\t NOT ENABLED - SKIPPING");
+            return Ok(());
         }
 
         let nym_binaries_tag = default_nym_binaries_image_tag(&ctx.data.monorepo_root)?;
 
-        for tag in [nym_binaries_tag, LOCALNET_NYXD_IMAGE_NAME.to_string()] {
+        // TODO: we need to dynamically determine tag for this
+        // LOCALNET_NYXD_IMAGE_NAME.to_string()
+
+        for tag in [nym_binaries_tag] {
             ctx.execute_cmd_with_stdout("docker", ["image", "rm", &tag])
                 .await?;
             remove_container_image(ctx, &tag).await?;
@@ -58,7 +62,8 @@ impl LocalnetOrchestrator {
     fn remove_build_cache(&self, ctx: &mut LocalnetContext<LocalnetPurge>) -> anyhow::Result<()> {
         ctx.begin_next_step("removing build cache", "🔥");
         if !ctx.data.remove_cache {
-            ctx.println("\t NOT ENABLED - SKIPPING")
+            ctx.println("\t NOT ENABLED - SKIPPING");
+            return Ok(());
         }
 
         self.storage.data_cache().clear()
@@ -70,17 +75,18 @@ impl LocalnetOrchestrator {
     ) -> anyhow::Result<()> {
         ctx.begin_next_step("removing storage data", "🔥");
 
-        std::fs::remove_dir_all(self.storage.localnet_directory())?;
+        std::fs::remove_dir_all(self.storage.localnet_directory())
+            .context("missing main storage directory")?;
         let storage_db = self.storage.into_orchestrator_storage();
         let db_path = storage_db.stop().await?;
-        std::fs::remove_dir_all(db_path)?;
+        std::fs::remove_file(db_path).context("missing database path")?;
 
         Ok(())
     }
 
     pub(crate) async fn purge_localnet(self, config: Config) -> anyhow::Result<()> {
         let purge = LocalnetPurge::new(config)?;
-        let mut ctx = LocalnetContext::new(purge, 4, "\npurging localnet");
+        let mut ctx = LocalnetContext::new(purge, 3, "\npurging localnet");
 
         // 1. stop the localnet
         self.stop_localnet().await?;

tools/internal/localnet-orchestrator/src/serde_helpers/linux.rs

@@ -1,7 +1,6 @@
 // Copyright 2025 - Nym Technologies SA <[email protected]>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::serde_helpers::PlaceholderCommonContainerInformation;
 use anyhow::Context;
 use anyhow::bail;
 use serde::{Deserialize, Serialize};
@@ -84,6 +83,7 @@ impl TryFrom<ContainersList> for super::ContainersList {
             containers: value
                 .0
                 .into_iter()
+                .filter(|c| c.names.contains("localnet"))
                 .map(TryInto::try_into)
                 .collect::<anyhow::Result<Vec<_>>>()?,
         })
@@ -103,11 +103,11 @@ pub struct ContainerListContainer {
     pub status: String,
 }
 
-impl TryFrom<ContainerListContainer> for PlaceholderCommonContainerInformation {
+impl TryFrom<ContainerListContainer> for super::CommonContainerInformation {
     type Error = anyhow::Error;
 
     fn try_from(value: ContainerListContainer) -> Result<Self, Self::Error> {
-        Ok(PlaceholderCommonContainerInformation {
+        Ok(super::CommonContainerInformation {
             name: value.names,
             ip_address: None,
             status: value.status.to_lowercase(),
@@ -159,30 +159,37 @@ pub struct ContainerNetworkInformation {
     pub mac_address: String,
 }
 
-impl TryFrom<ContainerInformation> for PlaceholderCommonContainerInformation {
+impl TryFrom<ContainerInformation> for super::CommonContainerInformation {
     type Error = anyhow::Error;
 
     fn try_from(value: ContainerInformation) -> Result<Self, Self::Error> {
-        if value.network_settings.networks.is_empty() {
-            bail!("no attached networks")
-        }
+        let status = value.state.status.to_lowercase();
+
+        let ip_address = if status != "running" && status != "up" {
+            if value.network_settings.networks.is_empty() {
+                bail!("no attached networks")
+            }
 
-        // find first network with non-empty ip address
-        let Some(network) = value
-            .network_settings
-            .networks
-            .iter()
-            .find(|n| !n.1.ip_address.is_empty())
-            .map(|n| n.1)
-        else {
-            bail!("no valid network")
+            // find first network with non-empty ip address
+            let Some(network) = value
+                .network_settings
+                .networks
+                .iter()
+                .find(|n| !n.1.ip_address.is_empty())
+                .map(|n| n.1)
+            else {
+                bail!("no valid network")
+            };
+            Some(network.ip_address.parse().context("invalid ip address")?)
+        } else {
+            None
         };
 
-        Ok(PlaceholderCommonContainerInformation {
+        Ok(super::CommonContainerInformation {
             name: value.name,
             image: value.image,
-            ip_address: Some(network.ip_address.parse().context("invalid ip address")?),
-            status: value.state.status.to_lowercase(),
+            ip_address,
+            status,
         })
     }
 }

tools/internal/localnet-orchestrator/src/serde_helpers/macos.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::constants::CONTAINER_NETWORK_NAME;
-use crate::serde_helpers::PlaceholderCommonContainerInformation;
 use anyhow::{Context, bail};
 use serde::{Deserialize, Serialize};
 use std::net::IpAddr;
@@ -18,6 +17,7 @@ impl TryFrom<ContainersList> for super::ContainersList {
             containers: value
                 .0
                 .into_iter()
+                .filter(|c| c.configuration.id.contains("localnet"))
                 .map(TryInto::try_into)
                 .collect::<anyhow::Result<Vec<_>>>()?,
         })
@@ -135,15 +135,26 @@ pub struct ContainerNetwork {
     pub address: String, // represented in cidr location
 }
 
-impl TryFrom<ContainerInformation> for PlaceholderCommonContainerInformation {
+impl TryFrom<ContainerInformation> for super::CommonContainerInformation {
     type Error = anyhow::Error;
 
+    #[track_caller]
     fn try_from(value: ContainerInformation) -> Result<Self, Self::Error> {
-        Ok(PlaceholderCommonContainerInformation {
-            ip_address: Some(value.container_ip()?),
+        let status = value.status.to_lowercase();
+        let ip_address = if status != "running" && status != "up" {
+            Some(value.container_ip().context(format!(
+                "invalid container {} ({})",
+                value.configuration.id, value.configuration.image.reference
+            ))?)
+        } else {
+            None
+        };
+
+        Ok(super::CommonContainerInformation {
+            ip_address,
             name: value.configuration.id,
             image: value.configuration.image.reference,
-            status: value.status.to_lowercase(),
+            status,
         })
     }
 }

tools/internal/localnet-orchestrator/src/serde_helpers/mod.rs

@@ -12,7 +12,7 @@ pub(crate) mod linux;
 
 #[derive(Debug)]
 pub struct ContainersList {
-    pub containers: Vec<PlaceholderCommonContainerInformation>,
+    pub containers: Vec<CommonContainerInformation>,
 }
 
 impl ContainersList {
@@ -25,7 +25,7 @@ impl ContainersList {
 
 #[derive(Debug)]
 pub struct ContainerInspect {
-    pub info: Option<PlaceholderCommonContainerInformation>,
+    pub info: Option<CommonContainerInformation>,
 }
 
 impl ContainerInspect {
@@ -50,7 +50,7 @@ impl ContainerInspect {
 }
 
 #[derive(Debug)]
-pub struct PlaceholderCommonContainerInformation {
+pub struct CommonContainerInformation {
     pub name: String,
     pub ip_address: Option<IpAddr>,
     pub status: String,