Merge branch 'main' into teach-me

near · Sep 24, 2024 · bee0e74 · bee0e74
2 parents 6e4d055 + b0e2996
commit bee0e74
Show file tree

Hide file tree

Showing 12 changed files with 362 additions and 126 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-near-build/Cargo.toml b/cargo-near-build/Cargo.toml
@@ -30,6 +30,7 @@ home = { version = "0.5.9", optional = true }
 pathdiff = { version = "0.2.1", features = ["camino"], optional = true }
 unix_path = { version = "1.0.1", optional = true }
 tempfile = { version = "3.10.1", optional = true }
+shell-words = { version = "1.0.0", optional = true}
 
 [target.'cfg(target_os = "linux")'.dependencies]
 nix = { version = "0.29.0", features = ["user", "process"], optional = true }
@@ -48,6 +49,6 @@ abi_build = []
 docker = [
   "dep:url", "dep:serde", "dep:git2", 
   "dep:home", "dep:pathdiff", "dep:unix_path", 
-  "dep:tempfile", "dep:nix"
+  "dep:tempfile", "dep:nix", "dep:shell-words"
 ]
 
diff --git a/cargo-near-build/src/cargo_native/compile.rs b/cargo-near-build/src/cargo_native/compile.rs
@@ -134,7 +134,7 @@ where
         ColorPreference::Never => cmd.args(["--color", "never"]),
     };
 
-    tracing::info!("Invoking cargo: {:?}", cmd);
+    tracing::info!("Invoking cargo: {:#?}", cmd);
 
     let mut child = cmd
         // capture the stdout to return from this function as bytes

diff --git a/cargo-near-build/src/near/abi/generate/mod.rs b/cargo-near-build/src/near/abi/generate/mod.rs
@@ -16,6 +16,7 @@ pub fn procedure(
     generate_docs: bool,
     hide_warnings: bool,
     cargo_feature_args: &[&str],
+    env: &[(&str, &str)],
     color: ColorPreference,
 ) -> eyre::Result<near_abi::AbiRoot> {
     let root_node = crate_metadata
@@ -68,15 +69,19 @@ pub fn procedure(
 
     pretty_print::step("Generating ABI");
 
-    let dylib_artifact = cargo_native::compile::run::<Dylib>(
-        &crate_metadata.manifest_path,
-        cargo_args.as_slice(),
-        vec![
+    let compile_env = {
+        let compile_env = vec![
             ("CARGO_PROFILE_DEV_OPT_LEVEL", "0"),
             ("CARGO_PROFILE_DEV_DEBUG", "0"),
             ("CARGO_PROFILE_DEV_LTO", "off"),
             (env_keys::BUILD_RS_ABI_STEP_HINT, "true"),
-        ],
+        ];
+        [&compile_env, env].concat()
+    };
+    let dylib_artifact = cargo_native::compile::run::<Dylib>(
+        &crate_metadata.manifest_path,
+        cargo_args.as_slice(),
+        compile_env,
         hide_warnings,
         color,
     )?;

diff --git a/cargo-near-build/src/near/abi/mod.rs b/cargo-near-build/src/near/abi/mod.rs
@@ -38,6 +38,7 @@ pub fn build(args: abi_types::Opts) -> eyre::Result<()> {
         !args.no_doc,
         false,
         &[],
+        &[],
         color,
     )?;
     let abi_types::Result { path } = write_to_file(

diff --git a/cargo-near-build/src/near/build/mod.rs b/cargo-near-build/src/near/build/mod.rs
@@ -51,6 +51,11 @@ pub fn run(args: Opts) -> eyre::Result<CompilationArtifact> {
     let out_dir = crate_metadata.resolve_output_dir(args.out_dir.map(Into::into))?;
 
     let mut build_env = vec![("RUSTFLAGS", "-C link-arg=-s")];
+    build_env.extend(
+        args.env
+            .iter()
+            .map(|(key, value)| (key.as_ref(), value.as_ref())),
+    );
     let mut cargo_args = vec!["--target", COMPILATION_TARGET];
     let cargo_feature_args = {
         let mut feat_args = vec![];
@@ -76,14 +81,22 @@ pub fn run(args: Opts) -> eyre::Result<CompilationArtifact> {
     let (builder_version, builder_version_mismatch) =
         VersionMismatch::get_coerced_builder_version()?;
     if !args.no_abi {
-        let mut contract_abi = abi::generate::procedure(
-            &crate_metadata,
-            args.no_locked,
-            !args.no_doc,
-            true,
-            &cargo_feature_args,
-            color.clone(),
-        )?;
+        let mut contract_abi = {
+            let env = args
+                .env
+                .iter()
+                .map(|(key, value)| (key.as_ref(), value.as_ref()))
+                .collect::<Vec<_>>();
+            abi::generate::procedure(
+                &crate_metadata,
+                args.no_locked,
+                !args.no_doc,
+                true,
+                &cargo_feature_args,
+                &env,
+                color.clone(),
+            )?
+        };
 
         let embedding_binary = args.cli_description.cli_name_abi;
         contract_abi.metadata.build = Some(BuildInfo {

diff --git a/cargo-near-build/src/near/docker_build/subprocess_step.rs b/cargo-near-build/src/near/docker_build/subprocess_step.rs
@@ -46,9 +46,20 @@ pub fn run(
 
         let env = env_vars::EnvVars::new(&docker_build_meta, cloned_repo)?;
         let env_args = env.docker_args();
-        let cargo_cmd = opts
-            .get_cli_build_command_in_docker(docker_build_meta.container_build_command.clone())?;
-        println!("{} {}", "build command in container:".green(), cargo_cmd);
+        let shell_escaped_cargo_cmd = {
+            let cargo_cmd = opts.get_cli_build_command_in_docker(
+                docker_build_meta.container_build_command.clone(),
+                docker_build_meta.passed_env.clone(),
+            )?;
+            tracing::debug!("cli_build_command_in_docker {:#?}", cargo_cmd);
+            shell_words::join(cargo_cmd)
+        };
+        println!(
+            "{} {}",
+            "build command in container:".green(),
+            shell_escaped_cargo_cmd
+        );
+        println!();
 
         let docker_args = {
             let mut docker_args = vec![
@@ -74,8 +85,8 @@ pub fn run(
 
             docker_args.extend(vec![&docker_image, "/bin/bash", "-c"]);
 
-            docker_args.push(&cargo_cmd);
-            tracing::debug!("docker command : {:?}", docker_args);
+            docker_args.push(&shell_escaped_cargo_cmd);
+            tracing::debug!("docker command : {:#?}", docker_args);
             docker_args
         };