fix build variant remove_dir_all and use crate::common::fs

twoliter build variant produces an error if the tools directory does not
exist. This fixes the bug and also uses crate::common::fs for better
error messages.

Author: webern

tests/projects/project1/Twoliter.toml

@@ -2,9 +2,9 @@ schema-version = 1
 release-version = "1.0.0"
 
 [sdk]
-registry = "twoliter.alpha"
-name = "bottlerocket-sdk"
-version = "latest"
+registry = "877643295804.dkr.ecr.us-west-2.amazonaws.com"
+name = "twoliter-alpha-sdk"
+version = "1.18.0"
 
 [toolchain]
 registry = "public.ecr.aws/bottlerocket"

twoliter/src/cmd/build.rs

@@ -1,14 +1,14 @@
 use crate::cargo_make::CargoMake;
+use crate::common::fs;
+use crate::common::fs::{remove_dir_all, remove_file};
 use crate::docker::DockerContainer;
 use crate::project;
 use crate::tools::install_tools;
 use anyhow::{Context, Result};
 use clap::Parser;
 use log::debug;
-use std::fs;
 use std::path::{Path, PathBuf};
 use tempfile::TempDir;
-use tokio::fs::{remove_dir_all, remove_file};
 
 #[derive(Debug, Parser)]
 pub(crate) enum BuildCommand {
@@ -43,15 +43,15 @@ impl BuildVariant {
         let project = project::load_or_find_project(self.project_path.clone()).await?;
         let token = project.token();
         let toolsdir = project.project_dir().join("build/tools");
-        tokio::fs::remove_dir_all(&toolsdir).await?;
-        tokio::fs::create_dir_all(&toolsdir).await?;
+        let _ = fs::remove_dir_all(&toolsdir).await;
+        fs::create_dir_all(&toolsdir).await?;
         install_tools(&toolsdir).await?;
         let makefile_path = toolsdir.join("Makefile.toml");
         // A temporary directory in the `build` directory
         let build_temp_dir = TempDir::new_in(project.project_dir())
             .context("Unable to create a tempdir for Twoliter's build")?;
         let packages_dir = build_temp_dir.path().join("sdk_rpms");
-        fs::create_dir_all(&packages_dir)?;
+        fs::create_dir_all(&packages_dir).await?;
 
         let sdk_container = DockerContainer::new(
             format!("sdk-{}", token),
@@ -70,12 +70,18 @@ impl BuildVariant {
             .await?;
 
         let rpms_dir = project.project_dir().join("build").join("rpms");
-        fs::create_dir_all(&rpms_dir)?;
+        fs::create_dir_all(&rpms_dir).await?;
         debug!("Moving rpms to build dir");
-        for maybe_file in fs::read_dir(packages_dir.join("rpms"))? {
-            let file = maybe_file?;
-            debug!("Moving '{}'", file.path().display());
-            fs::rename(file.path(), rpms_dir.join(file.file_name()))?;
+        let rpms = packages_dir.join("rpms");
+        let mut read_dir = tokio::fs::read_dir(&rpms)
+            .await
+            .context(format!("Unable to read dir '{}'", rpms.display()))?;
+        while let Some(entry) = read_dir.next_entry().await.context(format!(
+            "Error while reading entries in dir '{}'",
+            rpms.display()
+        ))? {
+            debug!("Moving '{}'", entry.path().display());
+            fs::rename(entry.path(), rpms_dir.join(entry.file_name())).await?;
         }
 
         let mut created_files = Vec::new();
@@ -84,7 +90,7 @@ impl BuildVariant {
         if !sbkeys_dir.is_dir() {
             // Create a sbkeys directory in the main project
             debug!("sbkeys dir not found. Creating a temporary directory");
-            fs::create_dir_all(&sbkeys_dir)?;
+            fs::create_dir_all(&sbkeys_dir).await?;
             sdk_container
                 .cp_out(
                     Path::new("twoliter/alpha/sbkeys/generate-local-sbkeys"),
@@ -99,6 +105,7 @@ impl BuildVariant {
         if !models_dir.is_dir() {
             debug!("models source dir not found. Creating a temporary directory");
             fs::create_dir_all(&models_dir.join("src/variant"))
+                .await
                 .context("Unable to create models source directory")?;
             created_files.push(models_dir)
         }

twoliter/src/common.rs

@@ -148,7 +148,7 @@ pub(crate) mod fs {
 
     pub(crate) async fn remove_file(path: impl AsRef<Path>) -> Result<()> {
         fs::remove_file(path.as_ref()).await.context(format!(
-            "Unable to XXSOMETHINGXX '{}'",
+            "Unable to remove file '{}'",
             path.as_ref().display()
         ))
     }